stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Block decomposition: remove useless “y” output for static/dynamic files of solved blocks

time-shift
Sébastien Villemot 2020-06-16 10:38:47 +02:00
parent d3c3df3ecb
commit e72bce1a67
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab/lnsrch1_wrapper_one_boundary.m
View File

@ -42,4 +42,4 @@ function r = lnsrch1_wrapper_one_boundary(ya, y_index, fname, y, x, params, stea
%reshape the input arguments of the dynamic function
y(it_, :) = ya;
[r, y, T, g1]=feval(fname, y, x, params, steady_state, T, it_, false);
[r, T, g1]=feval(fname, y, x, params, steady_state, T, it_, false);

2
matlab/lnsrch1_wrapper_two_boundaries.m
View File

@ -47,5 +47,5 @@ function ra = lnsrch1_wrapper_two_boundaries(ya, fname, y, y_index, x, ...
%reshape the input arguments of the dynamic function
y(y_kmin+1:y_kmin+periods, y_index) = reshape(ya',length(y_index),periods)';
[r, y, T, g1, b]=feval(fname, y, x, params, steady_state, T, periods, false, y_kmin, y_size);
[r, T, g1, b]=feval(fname, y, x, params, steady_state, T, periods, false, y_kmin, y_size);
ra = reshape(r(:, y_kmin+1:periods+y_kmin),periods*y_size, 1);

12
matlab/solve_one_boundary.m
View File

@ -92,9 +92,9 @@ for it_=start:incr:finish
g1=spalloc( Blck_size, Blck_size, nze);
while ~(cvg==1 || iter>maxit_)
if is_dynamic
[r, y, T, g1] = feval(fname, y, x, params, steady_state, T, it_, false);
[r, T, g1] = feval(fname, y, x, params, steady_state, T, it_, false);
else
[r, y, T, g1] = feval(fname, y, x, params, T);
[r, T, g1] = feval(fname, y, x, params, T);
end
if ~isreal(r)
max_res=(-(max(max(abs(r))))^2)^0.5;
@ -205,7 +205,7 @@ for it_=start:incr:finish
'lnsrch1_wrapper_one_boundary',nn, ...
y_index_eq, options.solve_tolx, y_index_eq, fname, y, x, params, steady_state, T, it_);
%% Recompute temporary terms, since they are not given as output of lnsrch1
[~, ~, T] = feval(fname, y, x, params, steady_state, T, it_, false);
[~, T] = feval(fname, y, x, params, steady_state, T, it_, false);
dx = ya' - y(it_, :);
y(it_,:) = ya';
elseif (is_dynamic && (stack_solve_algo==1 || stack_solve_algo==0)) || (~is_dynamic && options.solve_algo==6)
@ -262,10 +262,10 @@ for it_=start:incr:finish
y(y_index_eq) = phat;
end
if is_dynamic
[r, y, T, g1] = feval(fname, y, x, params, ...
steady_state, T, it_, false);
[r, T, g1] = feval(fname, y, x, params, ...
steady_state, T, it_, false);
else
[r, y, T, g1] = feval(fname, y, x, params, T);
[r, T, g1] = feval(fname, y, x, params, T);
end
if max(abs(r))>=options.solve_tolf
[dx,flag1] = bicgstab(g1,-r,1e-7,Blck_size,L1,U1);

2
matlab/solve_two_boundaries.m
View File

@ -82,7 +82,7 @@ Jacobian_Size=Blck_size*(y_kmin+y_kmax_l +periods);
g1=spalloc( Blck_size*periods, Jacobian_Size, nze*periods);
reduced = 0;
while ~(cvg==1 || iter>maxit_)
[r, y, T, g1, b]=feval(fname, y, x, params, steady_state, T, periods, false, y_kmin, Blck_size);
[r, T, g1, b]=feval(fname, y, x, params, steady_state, T, periods, false, y_kmin, Blck_size);
preconditioner = 2;
g1a=g1(:, y_kmin*Blck_size+1:(periods+y_kmin)*Blck_size);
term1 = g1(:, 1:y_kmin_l*Blck_size)*reshape(y(1+y_kmin-y_kmin_l:y_kmin,y_index)',1,y_kmin_l*Blck_size)';

2
preprocessor

@ -1 +1 @@
Subproject commit ad583adcd4fc3463910708c86ea4bdc0b70a0826
Subproject commit 849697937579eb432cbf507e1b6e5f0493e26091