diff --git a/preprocessor/StaticModel.cc b/preprocessor/StaticModel.cc index 48f17dff7..73cab19f6 100644 --- a/preprocessor/StaticModel.cc +++ b/preprocessor/StaticModel.cc @@ -1617,7 +1617,7 @@ StaticModel::writeStaticFile(const string &basename, bool block, bool bytecode, writeStaticJuliaFile(basename); else writeStaticMFile(basename); - writeAuxVarRecursiveDefinitions(basename); + writeAuxVarRecursiveDefinitions(basename, julia); } void @@ -1977,10 +1977,11 @@ StaticModel::writeAuxVarInitval(ostream &output, ExprNodeOutputType output_type) } } -void StaticModel::writeAuxVarRecursiveDefinitions(const string &basename) const +void StaticModel::writeAuxVarRecursiveDefinitions(const string &basename, const bool julia) const { string func_name = basename + "_set_auxiliary_variables"; - string filename = func_name + ".m"; + string filename = julia ? func_name + ".jl" : func_name + ".m"; + string comment = julia ? "#" : "%"; ofstream output; output.open(filename.c_str(), ios::out | ios::binary); @@ -1991,11 +1992,11 @@ void StaticModel::writeAuxVarRecursiveDefinitions(const string &basename) const } output << "function y = " << func_name + "(y, x, params)" << endl - << "%" << endl - << "% Status : Computes static model for Dynare" << endl - << "%" << endl - << "% Warning : this file is generated automatically by Dynare" << endl - << "% from model file (.mod)" << endl + << comment << endl + << comment << " Status : Computes static model for Dynare" << endl + << comment << endl + << comment << " Warning : this file is generated automatically by Dynare" << endl + << comment << " from model file (.mod)" << endl << endl; deriv_node_temp_terms_t tef_terms; diff --git a/preprocessor/StaticModel.hh b/preprocessor/StaticModel.hh index 2881cf663..90a3aebb7 100644 --- a/preprocessor/StaticModel.hh +++ b/preprocessor/StaticModel.hh @@ -182,8 +182,8 @@ public: //! Writes initializations in oo_.steady_state or steady state file for the auxiliary variables void writeAuxVarInitval(ostream &output, ExprNodeOutputType output_type) const; - //! Writes definition of the auxiliary variables in a M file - void writeAuxVarRecursiveDefinitions(const string &basename) const; + //! Writes definition of the auxiliary variables in a .m or .jl file + void writeAuxVarRecursiveDefinitions(const string &basename, const bool julia) const; virtual int getDerivID(int symb_id, int lag) const throw (UnknownDerivIDException); virtual void addAllParamDerivId(set &deriv_id_set); diff --git a/tests/julia/rbc/clean b/tests/julia/rbc/clean index 77af1eab4..a48414dc7 100755 --- a/tests/julia/rbc/clean +++ b/tests/julia/rbc/clean @@ -5,4 +5,4 @@ rm -f rbcDynamic.jl rm -f rbcSteadyState2.jl rm -rf rbc rm -f rbcStatic.jl -rm -f rbc_set_auxiliary_variables.m +rm -f rbc_set_auxiliary_variables.jl