diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc index 416d5abb34df6f28e057f7978d5311fa81a42a9f..71782a1e27bb425e504213f8a5e84e808dbcbfd5 100644 --- a/src/DynamicModel.cc +++ b/src/DynamicModel.cc @@ -2820,7 +2820,7 @@ DynamicModel::writeBlockDriverOutput(ostream &output, const string &basename, co } void -DynamicModel::writeOutput(ostream &output, const string &basename, bool block_decomposition, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const +DynamicModel::writeDriverOutput(ostream &output, const string &basename, bool block_decomposition, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const { /* Writing initialisation for M_.lead_lag_incidence matrix M_.lead_lag_incidence is a matrix with as many columns as there are diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh index 885cbbcf80ffb2e33f692b9635bc4033e3c1d474..d8345b70f7bd7a8b2bc8e5a5f5cbd1e233b3c291 100644 --- a/src/DynamicModel.hh +++ b/src/DynamicModel.hh @@ -290,8 +290,8 @@ public: */ void computingPass(bool jacobianExo, int derivsOrder, int paramsDerivsOrder, const eval_context_t &eval_context, bool no_tmp_terms, bool block, bool use_dll, bool bytecode, bool linear_decomposition); - //! Writes model initialization and lead/lag incidence matrix to output - void writeOutput(ostream &output, const string &basename, bool block, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const; + //! Writes information about the dynamic model to the driver file + void writeDriverOutput(ostream &output, const string &basename, bool block, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const; //! Write JSON AST void writeJsonAST(ostream &output) const; diff --git a/src/ModFile.cc b/src/ModFile.cc index e36d473dd67198fb755e90a597ef23b1bc620eb6..eeff5fc4f06472495f2e3633638b54ba16094537 100644 --- a/src/ModFile.cc +++ b/src/ModFile.cc @@ -1021,10 +1021,10 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo if (dynamic_model.equation_number() > 0) { if (linear_decomposition) - non_linear_equations_dynamic_model.writeOutput(mOutputFile, basename, block, true, use_dll, mod_file_struct.estimation_present, compute_xrefs, false); - dynamic_model.writeOutput(mOutputFile, basename, block, false, use_dll, mod_file_struct.estimation_present, compute_xrefs, false); + non_linear_equations_dynamic_model.writeDriverOutput(mOutputFile, basename, block, true, use_dll, mod_file_struct.estimation_present, compute_xrefs, false); + dynamic_model.writeDriverOutput(mOutputFile, basename, block, false, use_dll, mod_file_struct.estimation_present, compute_xrefs, false); if (!no_static) - static_model.writeOutput(mOutputFile, block); + static_model.writeDriverOutput(mOutputFile, block); } if (onlymodel || gui) @@ -1252,8 +1252,8 @@ ModFile::writeExternalFilesJulia(const string &basename) const if (dynamic_model.equation_number() > 0) { - dynamic_model.writeOutput(jlOutputFile, basename, false, false, false, - mod_file_struct.estimation_present, false, true); + dynamic_model.writeDriverOutput(jlOutputFile, basename, false, false, false, + mod_file_struct.estimation_present, false, true); if (!no_static) { static_model.writeStaticFile(basename, false, false, false, "", {}, {}, true); diff --git a/src/StaticModel.cc b/src/StaticModel.cc index 02c81bcda540eed65a19c61edc534c3499fbe090..a1d5de10d55a9c1a89158a70a06fbfce6ff2d3f9 100644 --- a/src/StaticModel.cc +++ b/src/StaticModel.cc @@ -1795,7 +1795,7 @@ StaticModel::writeStaticBlockMFile(const string &basename) const } void -StaticModel::writeOutput(ostream &output, bool block) const +StaticModel::writeDriverOutput(ostream &output, bool block) const { output << "M_.static_tmp_nbr = ["; for (const auto &temporary_terms_derivative : temporary_terms_derivatives) diff --git a/src/StaticModel.hh b/src/StaticModel.hh index db347c7940decbfa2da9f0837ba1fac48eb47065..3ebf93a9928904aed8e390a359de0ebb8587c23f 100644 --- a/src/StaticModel.hh +++ b/src/StaticModel.hh @@ -122,8 +122,8 @@ public: //! Creates the static version of a dynamic model explicit StaticModel(const DynamicModel &m); - //! Writes information on block decomposition when relevant - void writeOutput(ostream &output, bool block) const; + //! Writes information about the static model to the driver file + void writeDriverOutput(ostream &output, bool block) const; //! Execute computations (variable sorting + derivation) /*!