diff --git a/src/ExprNode.cc b/src/ExprNode.cc index cbcfefcd..bae2b2fa 100644 --- a/src/ExprNode.cc +++ b/src/ExprNode.cc @@ -980,7 +980,7 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type, case SymbolType::modelLocalVariable: if (output_type == ExprNodeOutputType::matlabDynamicModelSparse || output_type == ExprNodeOutputType::matlabStaticModelSparse - || output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator || output_type == ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator + || output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator || output_type == ExprNodeOutputType::CDynamicSteadyStateOperator) { output << "("; @@ -1027,7 +1027,6 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type, break; case ExprNodeOutputType::juliaDynamicSteadyStateOperator: case ExprNodeOutputType::matlabDynamicSteadyStateOperator: - case ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator: output << "steady_state" << LEFT_ARRAY_SUBSCRIPT(output_type) << tsid + 1 << RIGHT_ARRAY_SUBSCRIPT(output_type); break; case ExprNodeOutputType::CDynamicSteadyStateOperator: @@ -2745,6 +2744,7 @@ UnaryOpNode::writeOutput(ostream &output, ExprNodeOutputType output_type, switch (output_type) { case ExprNodeOutputType::matlabDynamicModel: + case ExprNodeOutputType::matlabDynamicModelSparse: new_output_type = ExprNodeOutputType::matlabDynamicSteadyStateOperator; break; case ExprNodeOutputType::latexDynamicModel: @@ -2756,9 +2756,6 @@ UnaryOpNode::writeOutput(ostream &output, ExprNodeOutputType output_type, case ExprNodeOutputType::juliaDynamicModel: new_output_type = ExprNodeOutputType::juliaDynamicSteadyStateOperator; break; - case ExprNodeOutputType::matlabDynamicModelSparse: - new_output_type = ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator; - break; default: new_output_type = output_type; break; diff --git a/src/ExprNode.hh b/src/ExprNode.hh index 29080f9b..4e9d1067 100644 --- a/src/ExprNode.hh +++ b/src/ExprNode.hh @@ -94,7 +94,6 @@ enum class ExprNodeOutputType latexDynamicModel, //!< LaTeX code, dynamic model latexDynamicSteadyStateOperator, //!< LaTeX code, dynamic model, inside a steady state operator matlabDynamicSteadyStateOperator, //!< Matlab code, dynamic model, inside a steady state operator - matlabDynamicSparseSteadyStateOperator, //!< Matlab code, dynamic block decomposed model, inside a steady state operator CDynamicSteadyStateOperator, //!< C code, dynamic model, inside a steady state operator juliaDynamicSteadyStateOperator, //!< Julia code, dynamic model, inside a steady state operator steadyStateFile, //!< Matlab code, in the generated steady state file @@ -112,7 +111,6 @@ isMatlabOutput(ExprNodeOutputType output_type) || output_type == ExprNodeOutputType::matlabStaticModelSparse || output_type == ExprNodeOutputType::matlabDynamicModelSparse || output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator - || output_type == ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator || output_type == ExprNodeOutputType::steadyStateFile || output_type == ExprNodeOutputType::matlabDseries || output_type == ExprNodeOutputType::epilogueFile;