From 5e4ef6324fb0ab0a6d0790fc58ee400ec4aae4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Mon, 30 Mar 2020 12:44:01 +0200 Subject: [PATCH] Block decomposition without bytecode: fix call to solve_one_boundary Ref. dynare#1717 (cherry picked from commit ad48697abe1fb9393cabadb513ed9b5692768333) --- src/DynamicModel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc index f6c02b5f..f1466355 100644 --- a/src/DynamicModel.cc +++ b/src/DynamicModel.cc @@ -2178,7 +2178,7 @@ DynamicModel::writeSparseDynamicMFile(const string &basename) const << " y = solve_one_boundary('" << basename << ".block.dynamic_" << block + 1 << "'" << ", y, x, params, steady_state, y_index, " << nze << ", options_.periods, " << blocks_linear[block] - << ", blck_num, y_kmin, options_.simul.maxit, options_.solve_tolf, options_.slowc, " << cutoff << ", options_.stack_solve_algo, 1, 1, 0);" << endl + << ", blck_num, y_kmin, options_.simul.maxit, options_.solve_tolf, options_.slowc, " << cutoff << ", options_.stack_solve_algo, 1, 1, 0, M_, options_, oo_);" << endl << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);" << endl << " if any(isnan(tmp) | isinf(tmp))" << endl << " disp(['Inf or Nan value during the resolution of block " << block <<"']);" << endl @@ -2209,7 +2209,7 @@ DynamicModel::writeSparseDynamicMFile(const string &basename) const << " y = solve_one_boundary('" << basename << ".block.dynamic_" << block + 1 << "'" <<", y, x, params, steady_state, y_index, " << nze <<", options_.periods, " << blocks_linear[block] - <<", blck_num, y_kmin, options_.simul.maxit, options_.solve_tolf, options_.slowc, " << cutoff << ", options_.stack_solve_algo, 1, 1, 0);" << endl + <<", blck_num, y_kmin, options_.simul.maxit, options_.solve_tolf, options_.slowc, " << cutoff << ", options_.stack_solve_algo, 1, 1, 0, M_, options_, oo_);" << endl << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);" << endl << " if any(isnan(tmp) | isinf(tmp))" << endl << " disp(['Inf or Nan value during the resolution of block " << block <<"']);" << endl -- GitLab