Simplify counting number of real variables

OpenModelica · Nov 8, 2016 · 1b514e3 · 1b514e3
1 parent d487be4
commit 1b514e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -12893,5 +12893,12 @@ algorithm
   files := DoubleEndedList.toListAndClear(delst);
 end getFunctionIndex;
 
+public function nVariablesReal
+  input SimCode.VarInfo varInfo;
+  output Integer n;
+algorithm
+  n := 2*varInfo.numStateVars+varInfo.numAlgVars+varInfo.numDiscreteReal+varInfo.numOptimizeConstraints+varInfo.numOptimizeFinalConstraints;
+end nVariablesReal;
+
 annotation(__OpenModelica_Interface="backend");
 end SimCodeUtil;
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -1214,7 +1214,7 @@ template populateModelInfo(ModelInfo modelInfo, String fileNamePrefix, String gu
     %>
 
     data->modelData->nStates = <%varInfo.numStateVars%>;
-    data->modelData->nVariablesReal = 2*<%varInfo.numStateVars%>+<%varInfo.numAlgVars%>+<%varInfo.numDiscreteReal%>+<%varInfo.numOptimizeConstraints%> + <%varInfo.numOptimizeFinalConstraints%>;
+    data->modelData->nVariablesReal = <%nVariablesReal(varInfo)%>;
     data->modelData->nDiscreteReal = <%varInfo.numDiscreteReal%>;
     data->modelData->nVariablesInteger = <%varInfo.numIntAlgVars%>;
     data->modelData->nVariablesBoolean = <%varInfo.numBoolAlgVars%>;

diff --git a/Compiler/Template/SimCodeTV.mo b/Compiler/Template/SimCodeTV.mo
@@ -922,6 +922,11 @@ package SimCodeUtil
     input String suffix;
     output String newName;
   end addFunctionIndex;
+
+  function nVariablesReal
+    input SimCode.VarInfo varInfo;
+    output Integer n;
+  end nVariablesReal;
 end SimCodeUtil;
 
 package SimCodeFunctionUtil