From facf06a1b5ee8b58804861cb532eb25856e5b725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Tue, 17 Feb 2015 12:57:30 +0100 Subject: [PATCH] Removed options_ and oo_ globals from *all* generated dynamic model routines (with block option) and adapted some routines to reflect this change. --- DynamicModel.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DynamicModel.cc b/DynamicModel.cc index 0875b49d..8130feee 100644 --- a/DynamicModel.cc +++ b/DynamicModel.cc @@ -1788,8 +1788,7 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri int Nb_SGE = 0; bool open_par = false; - mDynamicModelFile << "function [varargout] = " << dynamic_basename << "(varargin)\n"; - mDynamicModelFile << " global oo_ options_ M_ ;\n"; + mDynamicModelFile << "function [varargout] = " << dynamic_basename << "(options_, M_, oo_, varargin)\n"; mDynamicModelFile << " g2=[];g3=[];\n"; //Temporary variables declaration OK = true; @@ -1804,7 +1803,7 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri (*it)->writeOutput(tmp_output, oMatlabStaticModelSparse, temporary_terms); } if (tmp_output.str().length() > 0) - mDynamicModelFile << " global " << tmp_output.str() << " M_ ;\n"; + mDynamicModelFile << " global " << tmp_output.str() << ";\n"; mDynamicModelFile << " T_init=zeros(1,options_.periods+M_.maximum_lag+M_.maximum_lead);\n"; tmp_output.str(""); @@ -2076,6 +2075,7 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri mDynamicModelFile << " end;\n"; open_par = false; mDynamicModelFile << " oo_.endo_simul = y';\n"; + mDynamicModelFile << " varargout{1} = oo_;\n"; mDynamicModelFile << "return;\n"; mDynamicModelFile << "end" << endl;