diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc index 7a48b406d3af3351c23c2589b4abb66c99547d52..45a406f1d6ecb197030b786f48435ef2db9729cb 100644 --- a/src/DynamicModel.cc +++ b/src/DynamicModel.cc @@ -1615,7 +1615,7 @@ DynamicModel::writeBlockDriverOutput(ostream &output, const string &basename, } void -DynamicModel::writeDriverOutput(ostream &output, const string &basename, bool block_decomposition, bool estimation_present, bool compute_xrefs) const +DynamicModel::writeDriverOutput(ostream &output, const string &basename, bool estimation_present, bool compute_xrefs) const { /* Writing initialisation for M_.lead_lag_incidence matrix M_.lead_lag_incidence is a matrix with as many columns as there are @@ -1744,7 +1744,7 @@ DynamicModel::writeDriverOutput(ostream &output, const string &basename, bool bl } // Write the block structure of the model - if (block_decomposition) + if (block_decomposed) writeBlockDriverOutput(output, basename, state_var, estimation_present); output << "M_.state_var = ["; diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh index 588684abf27b5ae0e7305c621ed187dbe7beb92f..8bdca37458efc0fedd187f4df1f09fcf37e9a03e 100644 --- a/src/DynamicModel.hh +++ b/src/DynamicModel.hh @@ -327,7 +327,7 @@ public: void computingPass(int derivsOrder, int paramsDerivsOrder, const eval_context_t &eval_context, bool no_tmp_terms, bool block, bool use_dll); //! Writes information about the dynamic model to the driver file - void writeDriverOutput(ostream &output, const string &basename, bool block, bool estimation_present, bool compute_xrefs) const; + void writeDriverOutput(ostream &output, const string &basename, bool estimation_present, bool compute_xrefs) const; //! Write JSON AST void writeJsonAST(ostream &output) const; diff --git a/src/ModFile.cc b/src/ModFile.cc index 66f84197bd7a28789f3e0e9f6dab489b74c9aa49..84c3f7bf634fac67b94f4a8274d0e36924eb69bc 100644 --- a/src/ModFile.cc +++ b/src/ModFile.cc @@ -967,9 +967,9 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global, if (dynamic_model.equation_number() > 0) { - dynamic_model.writeDriverOutput(mOutputFile, basename, block, mod_file_struct.estimation_present, compute_xrefs); + dynamic_model.writeDriverOutput(mOutputFile, basename, mod_file_struct.estimation_present, compute_xrefs); if (!no_static) - static_model.writeDriverOutput(mOutputFile, block); + static_model.writeDriverOutput(mOutputFile); } if (onlymodel || gui) diff --git a/src/StaticModel.cc b/src/StaticModel.cc index d9ed5c3da7462ac90cd6fda0119f74d4d0c8ff4b..c005f124cd1b29b15e86f69713a1e816bf564f79 100644 --- a/src/StaticModel.cc +++ b/src/StaticModel.cc @@ -791,14 +791,14 @@ StaticModel::writeStaticBlockCFile(const string &basename, vector<filesystem::pa } void -StaticModel::writeDriverOutput(ostream &output, bool block) const +StaticModel::writeDriverOutput(ostream &output) const { output << "M_.static_tmp_nbr = ["; for (const auto &temporary_terms_derivative : temporary_terms_derivatives) output << temporary_terms_derivative.size() << "; "; output << "];" << endl; - if (block) + if (block_decomposed) writeBlockDriverOutput(output); writeDriverSparseIndicesHelper<false>(output); diff --git a/src/StaticModel.hh b/src/StaticModel.hh index f973af3e9580270e7330d4908bca9f84c2122ae3..e50dc69610b11a6e0425baefc17f8a7d2f1b64a6 100644 --- a/src/StaticModel.hh +++ b/src/StaticModel.hh @@ -127,7 +127,7 @@ public: explicit StaticModel(const DynamicModel &m); //! Writes information about the static model to the driver file - void writeDriverOutput(ostream &output, bool block) const; + void writeDriverOutput(ostream &output) const; //! Execute computations (variable sorting + derivation + block decomposition) /*!