Split up the equations in the info.xml so it is possible to see which…

… equations are initial git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18080 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 10, 2013 · 44d6c1a · 44d6c1a
1 parent 047694b
commit 44d6c1a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/Compiler/BackEnd/SimCodeUtil.mo b/Compiler/BackEnd/SimCodeUtil.mo
@@ -1581,12 +1581,13 @@ algorithm
       highestSimEqIndex = uniqueEqIndex;
       modelInfo = addTempVars(tempvars, modelInfo);
 
+      ((uniqueEqIndex, removedEquations)) = BackendEquation.traverseBackendDAEEqns(removedEqs, traversedlowEqToSimEqSystem, (uniqueEqIndex, {}));
+
       // Assertions and crap
       // create parameter equations
       ((uniqueEqIndex, startValueEquations)) = BackendDAEUtil.foldEqSystem(dlow, createStartValueEquations, (uniqueEqIndex, {}));
       ((uniqueEqIndex, parameterEquations)) = BackendDAEUtil.foldEqSystem(dlow, createVarNominalAssertFromVars, (uniqueEqIndex, {}));
       (uniqueEqIndex, parameterEquations) = createParameterEquations(shared, uniqueEqIndex, parameterEquations, useSymbolicInitialization);
-      ((uniqueEqIndex, removedEquations)) = BackendEquation.traverseBackendDAEEqns(removedEqs, traversedlowEqToSimEqSystem, (uniqueEqIndex, {}));
 
       ((uniqueEqIndex, algorithmAndEquationAsserts)) = BackendDAEUtil.foldEqSystem(dlow, createAlgorithmAndEquationAsserts, (uniqueEqIndex, {}));
       discreteModelVars = BackendDAEUtil.foldEqSystem(dlow, extractDiscreteModelVars, {});

diff --git a/Compiler/Template/SimCodeDump.tpl b/Compiler/Template/SimCodeDump.tpl
@@ -17,7 +17,7 @@ template dumpSimCodeToC(SimCode code, Boolean withOperations)
   match code
   case sc as SIMCODE(modelInfo=mi as MODELINFO(vars=vars as SIMVARS(__))) then
   let res =
-  'data->modelData.modelDataXml.infoXMLData = "<%Util.escapeModelicaStringToCString(dumpSimCodeBase(code,withOperations))%>";'
+  'data->modelData.modelDataXml.infoXMLData = <% strtok(dumpSimCodeBase(code,withOperations),"\n") |> str => '"<%Util.escapeModelicaStringToCString(str)%>\n"' ; separator = "\n" %>;'
   let() = textFile(res,'<%fileNamePrefix%>_info.c')
   '<%fileNamePrefix%>_info'
 end dumpSimCodeToC;
@@ -51,21 +51,31 @@ template dumpSimCodeBase(SimCode code, Boolean withOperations)
     <%dumpVars(vars.extObjVars,withOperations)%>
     <%dumpVars(vars.constVars,withOperations)%>
   </variables>
-  <equations>
-    <%dumpEqs(SimCodeUtil.sortEqSystems(
-        listAppend(collectAllJacobianEquations(jacobianMatrixes),
-        listAppend(residualEquations,
-        listAppend(inlineEquations,
-        listAppend(startValueEquations,
-        listAppend(parameterEquations,
-        listAppend(initialEquations,
-        listAppend(algorithmAndEquationAsserts,
-        allEquations)))))))),withOperations)%>
+  <jacobian-equations>
+    <%dumpEqs(collectAllJacobianEquations(jacobianMatrixes),withOperations)%>
+  </jacobian-equations>
+  <initial-equations size="<%listLength(initialEquations)%>">
+    <%dumpEqs(SimCodeUtil.sortEqSystems(initialEquations),withOperations)%>
+  </initial-equations>
+  <residual-equations size="<%listLength(residualEquations)%>">
+    <%dumpEqs(residualEquations,withOperations)%>
+  </residual-equations>
+  <equations size="<%intAdd(listLength(inlineEquations),listLength(allEquations))%>">
+    <%dumpEqs(SimCodeUtil.sortEqSystems(listAppend(inlineEquations,allEquations)),withOperations)%>
   </equations>
-  <literals>
+  <start-equations size="<%listLength(startValueEquations)%>">
+    <%dumpEqs(startValueEquations,withOperations)%>
+  </start-equations>
+  <parameter-equations size="<%listLength(parameterEquations)%>">
+    <%dumpEqs(parameterEquations,withOperations)%>
+  </parameter-equations>
+  <assertions size="<%listLength(algorithmAndEquationAsserts)%>">
+    <%dumpEqs(algorithmAndEquationAsserts,withOperations)%>
+  </assertions>
+  <literals size="<%listLength(literals)%>">
     <% literals |> exp => '<exp><%printExpStrEscaped(exp)%></exp>' ; separator="\n" %>
   </literals>
-  <functions>
+  <functions size="<%listLength(mi.functions)%>">
     <% mi.functions |> func => match func
       case FUNCTION(__)
       case EXTERNAL_FUNCTION(__)

diff --git a/Compiler/Template/SimCodeTV.mo b/Compiler/Template/SimCodeTV.mo
@@ -894,6 +894,12 @@ package System
   function os
     output String str;
   end os;
+
+  function strtok
+    input String s1;
+    input String s2;
+    output list<String> tokens;
+  end strtok;
 end System;