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

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
time-shift
stepan 2009-10-31 07:55:10 +00:00
parent a2c2865dc2
commit b998047499
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
preprocessor/DynamicModel.cc
View File

@ -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