From a966f0e9172f1da8d25d0e4127c95faf6deefad5 Mon Sep 17 00:00:00 2001 From: stepan Date: Sat, 31 Oct 2009 07:55:10 +0000 Subject: [PATCH] Merge branch 'master' of git@vandrezanne.net:/home/git/repositories/dynare Conflicts: preprocessor/DynamicModel.cc git-svn-id: https://www.dynare.org/svn/dynare/trunk@3108 ac1d8469-bf42-47a9-8791-bf33cf982152 --- DynamicModel.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DynamicModel.cc b/DynamicModel.cc index 3b274be7..eb4e6688 100644 --- a/DynamicModel.cc +++ b/DynamicModel.cc @@ -1195,7 +1195,7 @@ DynamicModel::writeDynamicMFile(const string &dynamic_basename) const cerr << "Error: Can't open file " << filename << " for writing" << endl; exit(EXIT_FAILURE); } - mDynamicModelFile << "function [residual, g1, g2, g3] = " << dynamic_basename << "(y, x, params, it_)" << endl + mDynamicModelFile << "function [residual, G1, g2, g3] = " << dynamic_basename << "(y, x, params, it_)" << endl << "%" << endl << "% Status : Computes dynamic model for Dynare" << endl << "%" << endl @@ -1207,6 +1207,8 @@ DynamicModel::writeDynamicMFile(const string &dynamic_basename) const writeDynamicModel(mDynamicModelFile, false); + mDynamicModelFile << "G1 = g1;" << endl; + mDynamicModelFile.close(); } @@ -1915,7 +1917,9 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll) const << model_output.str() // Writing initialization instruction for matrix g1 << "if nargout >= 2," << endl - << " g1 = zeros(" << nrows << ", " << dynJacobianColsNbr << ");" << endl + << " if isempty(g1)" << endl// Test if g1 isn't initialized. + << " g1 = zeros(" << nrows << ", " << dynJacobianColsNbr << ");" << endl + << " end" << endl << endl << "%" << endl << "% Jacobian matrix" << endl