diff --git a/StaticModel.cc b/StaticModel.cc index f3a5d866159b0f5435c215108a306ce52b7ce34c..898b48e3a6372802d2c2881f45c5a24ba615d51f 100644 --- a/StaticModel.cc +++ b/StaticModel.cc @@ -2122,12 +2122,6 @@ void StaticModel::writeSetAuxiliaryVariables(const string &basename, const bool << comment << " from model file (.mod)" << endl << endl; - deriv_node_temp_terms_t tef_terms; - temporary_terms_t temporary_terms; - for (int i = 0; i < (int) aux_equations.size(); i++) - if (dynamic_cast<ExprNode *>(aux_equations[i])->containsExternalFunction()) - dynamic_cast<ExprNode *>(aux_equations[i])->writeExternalFunctionOutput(output, oMatlabStaticModel, - temporary_terms, tef_terms); writeAuxVarRecursiveDefinitions(output, oMatlabStaticModel); } @@ -2135,9 +2129,14 @@ void StaticModel::writeAuxVarRecursiveDefinitions(ostream &output, ExprNodeOutputType output_type) const { deriv_node_temp_terms_t tef_terms; + temporary_terms_t temporary_terms; + for (int i = 0; i < (int) aux_equations.size(); i++) + if (dynamic_cast<ExprNode *>(aux_equations[i])->containsExternalFunction()) + dynamic_cast<ExprNode *>(aux_equations[i])->writeExternalFunctionOutput(output, oMatlabStaticModel, + temporary_terms, tef_terms); for (int i = 0; i < (int) aux_equations.size(); i++) { - dynamic_cast<ExprNode *>(aux_equations[i]->substituteStaticAuxiliaryDefinition())->writeOutput(output, output_type); + dynamic_cast<ExprNode *>(aux_equations[i]->substituteStaticAuxiliaryDefinition())->writeOutput(output, output_type, temporary_terms, tef_terms); output << ";" << endl; } }