diff --git a/matlab/ep/extended_path.m b/matlab/ep/extended_path.m
index f85dd4c148d60153ddde3ce28095e4343470f499..1cab219ab76e8c48de01063e2ee1b12577a2fb1c 100644
--- a/matlab/ep/extended_path.m
+++ b/matlab/ep/extended_path.m
@@ -152,7 +152,7 @@ while (t<sample_size)
end
end
% Test if periods is big enough.
- if ~increase_periods && max(max(abs(tmp(idx,end-options_.ep.lp:end)./tmp(idx,end-options_.ep.lp-1:end-1)-1)))<options_.dynatol
+ if ~increase_periods && max(max(abs(tmp(idx,end-options_.ep.lp:end)./tmp(idx,end-options_.ep.lp-1:end-1)-1)))<options_.dynatol.x
break
else
options_.periods = options_.periods + options_.ep.step;
@@ -183,7 +183,7 @@ while (t<sample_size)
info.time = info.time+ctime;
if info.convergence
maxdiff = max(max(abs(tmp(:,2:options_.ep.fp)-tmp_old(:,2:options_.ep.fp))));
- if maxdiff<options_.dynatol
+ if maxdiff<options_.dynatol.x
options_.periods = options_.ep.periods;
options_.minimal_solving_period = options_.periods;
oo_.exo_simul = oo_.exo_simul(1:(options_.periods+2),:);
diff --git a/matlab/ep/homotopic_steps.m b/matlab/ep/homotopic_steps.m
index c36dc73047262e6e81875367a60c9d65381e62a1..814f01ffa5a7c7fb76338223aa459fb898b0cb97 100644
--- a/matlab/ep/homotopic_steps.m
+++ b/matlab/ep/homotopic_steps.m
@@ -64,7 +64,7 @@ if homotopy_1
weight = weight-step_length;
step_length=step_length/10;
weight = weight+step_length;
- if 10*step_length<options_.dynatol
+ if 10*step_length<options_.dynatol.x
homotopy_1 = 0;
homotopy_2 = 0;
break
@@ -153,7 +153,7 @@ if homotopy_2
disp('I am reducing the step length!')
end
step_length=step_length/10;
- if 10*step_length<options_.dynatol
+ if 10*step_length<options_.dynatol.x
homotopy_1 = 0;
homotopy_2 = 0;
break
diff --git a/matlab/evaluate_steady_state.m b/matlab/evaluate_steady_state.m
index 0035f438dba087e2c460146bcca10aa3d4e562b6..2eb829a4645d62c2a880d663e20bb8372e61d7f2 100644
--- a/matlab/evaluate_steady_state.m
+++ b/matlab/evaluate_steady_state.m
@@ -74,7 +74,7 @@ function [ys,params,info] = evaluate_steady_state(ys_init,M,options,oo,steadysta
info(2) = check; % to be improved
return;
end
- if max(abs(residuals)) > options.dynatol
+ if max(abs(residuals)) > options.dynatol.f
info(1) = 19;
info(2) = residuals'*residuals;
return
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index eda5909fb1d74576d40b49f4fa181d4ba678ebcd..460a25710f0217fca1c09795d500fb2a3b838f78 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -38,7 +38,8 @@ options_.console_mode = 0;
options_.terminal_condition = 0;
options_.rplottype = 0;
options_.smpl = 0;
-options_.dynatol = 0.00001;
+options_.dynatol.f = 1e-5;
+options_.dynatol.x = 1e-5;
options_.maxit_ = 10;
options_.slowc = 1;
options_.timing = 0;
diff --git a/matlab/model_diagnostics.m b/matlab/model_diagnostics.m
index bb58d7cdebf1a05d28840ff9743eeee51c106fe3..6fd14494fcea779546cdfc55694459bae4d5e101 100644
--- a/matlab/model_diagnostics.m
+++ b/matlab/model_diagnostics.m
@@ -98,7 +98,7 @@ else
if options_.linear == 0
% nonlinear models
if max(abs(feval(fh,dr.ys,[oo_.exo_steady_state; ...
- oo_.exo_det_steady_state], M_.params))) > options_.dynatol
+ oo_.exo_det_steady_state], M_.params))) > options_.dynatol.f
[ys,check1] = dynare_solve(fh,dr.ys,1,...
[oo_.exo_steady_state; ...
oo_.exo_det_steady_state], ...
diff --git a/matlab/partial_information/PCL_resol.m b/matlab/partial_information/PCL_resol.m
index 4c3ac93b149d3307222152b257c518616423740b..96028e2ea80237087f1538fb6c2be341a5e381fa 100644
--- a/matlab/partial_information/PCL_resol.m
+++ b/matlab/partial_information/PCL_resol.m
@@ -89,7 +89,7 @@ else
if options_.linear == 0
% nonlinear models
if max(abs(feval(fh,dr.ys,[oo_.exo_steady_state; ...
- oo_.exo_det_steady_state], M_.params))) > options_.dynatol
+ oo_.exo_det_steady_state], M_.params))) > options_.dynatol.f
[dr.ys,check1] = dynare_solve(fh,dr.ys,options_.jacobian_flag,...
[oo_.exo_steady_state; ...
oo_.exo_det_steady_state], M_.params);
diff --git a/matlab/perfect_foresight_simulation.m b/matlab/perfect_foresight_simulation.m
index 2b2b4c4a3eb84b47533e9784df1d66ed02ae3ec8..2e95573aca81806b64a990566988df5aef4c272c 100644
--- a/matlab/perfect_foresight_simulation.m
+++ b/matlab/perfect_foresight_simulation.m
@@ -159,7 +159,7 @@ for iter = 1:options_.maxit_
last_line = iter;
break
end
- if err < options_.dynatol
+ if err < options_.dynatol.f
stop = 1;
info.time = etime(clock,h1);
info.error = err;
diff --git a/matlab/resid.m b/matlab/resid.m
index 91273bb838e07f81eec2ba4098bb98220ba6bda7..75148e3586c5d8aca4441389f5561bfd0898981f 100644
--- a/matlab/resid.m
+++ b/matlab/resid.m
@@ -101,7 +101,7 @@ if nargout == 0
disp('Residuals of the static equations:')
disp(' ')
for i=1:M_.orig_endo_nbr
- if abs(z(i)) < options_.dynatol/100
+ if abs(z(i)) < options_.dynatol.f/100
tmp = 0;
else
tmp = z(i);
diff --git a/matlab/sim1.m b/matlab/sim1.m
index c18b9acc8123c2bba3a30a0f5e440f93db316662..b8e27bc4ed7066f12aa4025147418b7c62ba22ae 100644
--- a/matlab/sim1.m
+++ b/matlab/sim1.m
@@ -102,7 +102,7 @@ for iter = 1:options_.maxit_
disp([num2str(iter) ' - err = ' num2str(err)]) ;
disp([' Time of iteration :' num2str(etime(clock,h2))]) ;
- if err < options_.dynatol
+ if err < options_.dynatol.f
stop = 1 ;
fprintf('\n') ;
disp([' Total time of simulation :' num2str(etime(clock,h1))]) ;
diff --git a/matlab/simk.m b/matlab/simk.m
index b890e88025fac18fe5f3fe256d34ece06a89e7de..d800016946ef75a07d03f6a8b9f9b5925110320c 100644
--- a/matlab/simk.m
+++ b/matlab/simk.m
@@ -318,7 +318,7 @@ for iter = 1:options_.maxit_
if options_.timing
disp ([' Back substitution : ' num2str(hbacsup)]) ;
end
- if err < options_.dynatol
+ if err < options_.dynatol.f
h1 = etime(clock,h1) ;
fprintf ('\n') ;
disp ([' Total time of simulation : ' num2str(h1)]) ;
diff --git a/mex/sources/bytecode/bytecode.cc b/mex/sources/bytecode/bytecode.cc
index 6f240dd5556e5af3ff757727f4ab4e62553c1cc0..a022d7d0b45d49a44f935c1db81408607bb9e9d8 100644
--- a/mex/sources/bytecode/bytecode.cc
+++ b/mex/sources/bytecode/bytecode.cc
@@ -302,7 +302,8 @@ main(int nrhs, const char *prhs[])
else
{
solve_algo = stack_solve_algo;
- solve_tolf = *(mxGetPr(mxGetFieldByNumber(options_, 0, mxGetFieldNumber(options_, "dynatol"))));
+ mxArray *dynatol = mxGetFieldByNumber(options_, 0, mxGetFieldNumber(options_, "dynatol"));
+ solve_tolf= *mxGetPr((mxGetFieldByNumber(dynatol, 0, mxGetFieldNumber(dynatol, "f"))));
}
mxArray *mxa = mxGetFieldByNumber(M_, 0, mxGetFieldNumber(M_, "fname"));
diff --git a/mex/sources/bytecode/testing/simulate_debug.m b/mex/sources/bytecode/testing/simulate_debug.m
index a220b484f2e705520e94312ec780c0af277a102b..396a558e05db9605230f84e3885c959bdc6bc8db 100644
--- a/mex/sources/bytecode/testing/simulate_debug.m
+++ b/mex/sources/bytecode/testing/simulate_debug.m
@@ -7,7 +7,7 @@ end;
fprintf(fid,'%d\n',options_.maxit_);
fprintf(fid,'%6.20f\n',options_.slowc);
fprintf(fid,'%6.20f\n',options_.markowitz);
-fprintf(fid,'%6.20f\n',options_.dynatol);
+fprintf(fid,'%6.20f\n',options_.dynatol.f);
fprintf(fid,'%d\n',options_.minimal_solving_periods);
fclose(fid);
diff --git a/tests/block_bytecode/ireland.mod b/tests/block_bytecode/ireland.mod
index 3c81fdab370bdc287cf778ac5a840530d5421b81..b36f2452cc6bafca3b8c5b0f35c25cbc45521bb6 100644
--- a/tests/block_bytecode/ireland.mod
+++ b/tests/block_bytecode/ireland.mod
@@ -59,12 +59,12 @@ k=k+0.000001;
end;
-options_.dynatol=1e-12;
+options_.dynatol.f=1e-12;
options_.maxit_=5;
options_.slowc=1;
steady(solve_algo=2);
-options_.dynatol=4e-5;
+options_.dynatol.f=4e-5;
shocks;
var e;
diff --git a/tests/run_test_matlab.m b/tests/run_test_matlab.m
index 116a4cdaf6bf4a8e0629014e5d4b6ac340c0622e..48cd788f02c94a547060372f31442fc87aa7e13b 100644
--- a/tests/run_test_matlab.m
+++ b/tests/run_test_matlab.m
@@ -119,7 +119,7 @@ for blockFlag = 0:1
% Test against the reference simulation path
load('test.mat','y_ref');
diff = oo_.endo_simul - y_ref;
- if(abs(diff) > options_.dynatol)
+ if(abs(diff) > options_.dynatol.x)
failedBlock{size(failedBlock,2)+1} = ['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(solve_algos(i)) ', ' num2str(default_stack_solve_algo) ')'];
exception = MException('ERROR: simulation path differs from the reference path');
printMakeCheckMatlabErrMsg(['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(solve_algos(i)) ', ' num2str(default_stack_solve_algo) ')'], exception);
@@ -145,7 +145,7 @@ for blockFlag = 0:1
% Test against the reference simulation path
load('test.mat','y_ref');
diff = oo_.endo_simul - y_ref;
- if(abs(diff) > options_.dynatol)
+ if(abs(diff) > options_.dynatol.x)
failedBlock{size(failedBlock,2)+1} = ['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(default_solve_algo) ', ' num2str(stack_solve_algos(i)) ')'];
exception = MException('ERROR: simulation path difers from the reference path');
printMakeCheckMatlabErrMsg(['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(default_solve_algo) ', ' num2str(stack_solve_algos(i)) ')'], exception);
diff --git a/tests/run_test_octave.m b/tests/run_test_octave.m
index 2574cc90c1b2cee50b8fb72bac43ed18da6255d0..082edf664e9293782189c49abe5dd3d797185284 100644
--- a/tests/run_test_octave.m
+++ b/tests/run_test_octave.m
@@ -113,7 +113,7 @@ for blockFlag = 0:1
## Test against the reference simulation path
load('test.mat','y_ref');
diff = oo_.endo_simul - y_ref;
- if(abs(diff) > options_.dynatol)
+ if(abs(diff) > options_.dynatol.x)
failedBlock{size(failedBlock,2)+1} = ['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(solve_algos(i)) ', ' num2str(default_stack_solve_algo) ')'];
differr.message = ["ERROR: simulation path differs from the reference path" ];
printMakeCheckOctaveErrMsg(['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(solve_algos(i)) ', ' num2str(default_stack_solve_algo) ')'], differr);
@@ -137,7 +137,7 @@ for blockFlag = 0:1
## Test against the reference simulation path
load('test.mat','y_ref');
diff = oo_.endo_simul - y_ref;
- if(abs(diff) > options_.dynatol)
+ if(abs(diff) > options_.dynatol.x)
failedBlock{size(failedBlock,2)+1} = ['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(default_solve_algo) ', ' num2str(stack_solve_algos(i)) ')'];
differr.message = ["ERROR: simulation path differs from the reference path" ];
printMakeCheckOctaveErrMsg(['block_bytecode/run_ls2003.m(' num2str(blockFlag) ', ' num2str(bytecodeFlag) ', ' num2str(default_solve_algo) ', ' num2str(stack_solve_algos(i)) ')'], differr);