- bug fix for linearization(modelname with underscore instaed of dot)

 - bug fix added uniqueEqIndex for symbolic jacobian for *_info.xml


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16492 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Willi Braun

Compiler/BackEnd/SimCodeUtil.mo

@@ -1595,7 +1595,7 @@ algorithm
       SymbolicJacs = listAppend(SymbolicJacsStateSelect, SymbolicJacs);
 
       // generate jacobian or linear model matrices
-      LinearMatrices = createJacobianLinearCode(symJacs, modelInfo, uniqueEqIndex);
+      (LinearMatrices,uniqueEqIndex) = createJacobianLinearCode(symJacs, modelInfo, uniqueEqIndex);
       LinearMatrices = jacG::LinearMatrices;
 
       (_, numberofLinearSys, numberofNonLinearSys, numberofMixedSys, LinearMatrices) = countandIndexAlgebraicLoops({}, numberofLinearSys, numberofNonLinearSys, numberofMixedSys, LinearMatrices);
@@ -4895,28 +4895,29 @@ end createSymbolicSimulationJacobian;
 protected function createJacobianLinearCode
   input BackendDAE.SymbolicJacobians inSymjacs;
   input SimCode.ModelInfo inModelInfo;
-  input Integer uniqueEqIndex;
+  input Integer iuniqueEqIndex;
   output list<SimCode.JacobianMatrix> res;
+  output Integer ouniqueEqIndex;
 algorithm
-  res := matchcontinue (inSymjacs, inModelInfo, uniqueEqIndex)
+  (res,ouniqueEqIndex) := matchcontinue (inSymjacs, inModelInfo, iuniqueEqIndex)
     local 
     case (_, _, _)
       equation
         System.realtimeTick(CevalScript.RT_CLOCK_EXECSTAT_JACOBIANS);
         // b = Flags.disableDebug(Flags.EXEC_STAT);
         // The jacobian code requires single systems;
         // I did not rewrite it to take advantage of any parallelism in the code
-        (res, _) = createSymbolicJacobianssSimCode(inSymjacs, inModelInfo, uniqueEqIndex, {"A", "B", "C", "D"});
+        (res, ouniqueEqIndex) = createSymbolicJacobianssSimCode(inSymjacs, inModelInfo, iuniqueEqIndex, {"A", "B", "C", "D"});
         // if optModule is not activated add dummy matrices
         res = addLinearizationMatrixes(res);
         // _ = Flags.set(Flags.EXEC_STAT, b);
         Debug.execStat("generated analytical Jacobians SimCode. : ", CevalScript.RT_CLOCK_EXECSTAT_JACOBIANS);
         _ = System.realtimeTock(CevalScript.RT_CLOCK_EXECSTAT_JACOBIANS);
-      then res;
+      then (res,ouniqueEqIndex);
     else
       equation
         res = {({}, {}, "A", ({}, ({}, {})), {}, 0), ({}, {}, "B", ({}, ({}, {})), {}, 0), ({}, {}, "C", ({}, ({}, {})), {}, 0), ({}, {}, "D", ({}, ({}, {})), {}, 0)};
-      then res;
+      then (res,iuniqueEqIndex);
   end matchcontinue;
 end createJacobianLinearCode;
 

Compiler/Template/CodegenC.tpl

@@ -2002,7 +2002,7 @@ template functionlinearmodel(ModelInfo modelInfo) "template functionlinearmodel
     //string def_proctedpart("\n  Real x[<%varInfo.numStateVars%>](start=x0);\n  Real u[<%varInfo.numInVars%>](start=u0); \n  output Real y[<%varInfo.numOutVars%>]; \n");
     <<
     const char *linear_model_frame =
-      "model linear_<%dotPath(name)%>\n  parameter Integer n = <%varInfo.numStateVars%>; // states \n  parameter Integer k = <%varInfo.numInVars%>; // top-level inputs \n  parameter Integer l = <%varInfo.numOutVars%>; // top-level outputs \n"
+      "model linear_<%underscorePath(name)%>\n  parameter Integer n = <%varInfo.numStateVars%>; // states \n  parameter Integer k = <%varInfo.numInVars%>; // top-level inputs \n  parameter Integer l = <%varInfo.numOutVars%>; // top-level outputs \n"
       "  parameter Real x0[<%varInfo.numStateVars%>] = {%s};\n"
       "  parameter Real u0[<%varInfo.numInVars%>] = {%s};\n"
       <%matrixA%>
@@ -2013,7 +2013,7 @@ template functionlinearmodel(ModelInfo modelInfo) "template functionlinearmodel
       <%vectorU%>
       <%vectorY%>
       "\n  <%getVarName(vars.stateVars, "x", varInfo.numStateVars )%>  <% getVarName(vars.inputVars, "u", varInfo.numInVars) %>  <%getVarName(vars.outputVars, "y", varInfo.numOutVars) %>\n"
-      "equation\n  der(x) = A * x + B * u;\n  y = C * x + D * u;\nend linear_<%dotPath(name)%>;\n"
+      "equation\n  der(x) = A * x + B * u;\n  y = C * x + D * u;\nend linear_<%underscorePath(name)%>;\n"
     ;
     >>
   end match