Revert "[SimCode] update daeMode (#728)" (#732)

This reverts commit c67fe97.
OpenModelica · Feb 14, 2020 · a136b96 · a136b96
1 parent aacd21e
commit a136b96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/OMCompiler/Compiler/BackEnd/DAEMode.mo b/OMCompiler/Compiler/BackEnd/DAEMode.mo
@@ -80,7 +80,6 @@ public function getEqSystemDAEmode "Run the equation system pipeline."
   input Option<list<String>> strPostOptModules = NONE();
   output BackendDAE.BackendDAE outDAEmode;
   output BackendDAE.BackendDAE outInitDAE;
-  output Option<BackendDAE.BackendDAE> outInitDAE_lambda0_option;
   output list<BackendDAE.Equation> outRemovedInitialEquationLst;
  protected
   BackendDAE.BackendDAE dae, simDAE;
@@ -125,7 +124,7 @@ algorithm
     end if;
 
     // generate system for initialization
-    (outInitDAE, outInitDAE_lambda0_option, outRemovedInitialEquationLst, globalKnownVars, dae) := Initialization.solveInitialSystem(dae);
+    (outInitDAE, _, outRemovedInitialEquationLst, globalKnownVars, dae) := Initialization.solveInitialSystem(dae);
 
     // use function tree from initDAE further for simDAE
     simDAE := BackendDAEUtil.setFunctionTree(dae, BackendDAEUtil.getFunctions(outInitDAE.shared));

diff --git a/OMCompiler/Compiler/SimCode/SimCodeMain.mo b/OMCompiler/Compiler/SimCode/SimCodeMain.mo
@@ -1028,7 +1028,6 @@ algorithm
       Real timeSimCode, timeTemplates, timeBackend, timeFrontend;
       BackendDAE.BackendDAE initDAE;
       list<BackendDAE.Equation> removedInitialEquationLst;
-      Option<BackendDAE.BackendDAE> initDAE_lambda0_option;
       Real fsize;
       Absyn.ComponentRef classNameCref;
 
@@ -1075,7 +1074,7 @@ algorithm
       end if;
 
       //BackendDump.printBackendDAE(dlow);
-      (bdae, initDAE, initDAE_lambda0_option, removedInitialEquationLst) := DAEMode.getEqSystemDAEmode(dlow,inFileNamePrefix);
+      (bdae, initDAE, removedInitialEquationLst) := DAEMode.getEqSystemDAEmode(dlow,inFileNamePrefix);
       ExecStat.execStat("Backend");
 
       timeBackend := System.realtimeTock(ClockIndexes.RT_CLOCK_BACKEND);
@@ -1087,7 +1086,7 @@ algorithm
         ExecStat.execStat("Serialize solved system");
       end if;
 
-      (libs, file_dir, timeSimCode, timeTemplates) := generateModelCodeDAE(bdae, initDAE, initDAE_lambda0_option, removedInitialEquationLst, SymbolTable.getAbsyn(), className, filenameprefix, inSimSettingsOpt, args);
+      (libs, file_dir, timeSimCode, timeTemplates) := generateModelCodeDAE(bdae, initDAE, removedInitialEquationLst, SymbolTable.getAbsyn(), className, filenameprefix, inSimSettingsOpt, args);
       timeSimCode := System.realtimeTock(ClockIndexes.RT_CLOCK_SIMCODE);
       timeTemplates := System.realtimeTock(ClockIndexes.RT_CLOCK_TEMPLATES);
 
@@ -1120,7 +1119,6 @@ protected function generateModelCodeDAE
   and call the template target generator. "
   input BackendDAE.BackendDAE inBackendDAE;
   input BackendDAE.BackendDAE inInitDAE;
-  input Option<BackendDAE.BackendDAE> initDAE_lambda0_option;
   input list<BackendDAE.Equation> inRemovedInitialEquationLst;
   input Absyn.Program p;
   input Absyn.Path className;
@@ -1144,7 +1142,6 @@ protected
   Integer numCheckpoints;
   list<SimCodeVar.SimVar> tempVars = {};
   BackendDAE.BackendDAE emptyBDAE;
-  BackendDAE.BackendDAE initDAE_lambda0;
 
   SimCode.ModelInfo modelInfo;
   SimCode.ExtObjInfo extObjInfo;
@@ -1179,7 +1176,7 @@ protected
   tuple<Option<BackendDAE.SymbolicJacobian>, BackendDAE.SparsePattern, BackendDAE.SparseColoring> daeModeJac;
   SimCode.JacobianMatrix symDAESparsPattern;
   list<SimCode.JacobianMatrix> symJacs, SymbolicJacs, SymbolicJacsNLS, SymbolicJacsTemp, SymbolicJacsStateSelect;
-  list<SimCode.SimEqSystem> initialEquations, initialEquations_lambda0, removedInitialEquations, jacobianEquations;
+  list<SimCode.SimEqSystem> initialEquations, removedInitialEquations, jacobianEquations;
   list<SimCodeVar.SimVar> jacobianSimvars, seedVars;
   list<SimCode.SimEqSystem> startValueEquations;        // --> updateBoundStartValues
   list<SimCode.SimEqSystem> maxValueEquations;          // --> updateBoundMaxValues
@@ -1219,14 +1216,6 @@ algorithm
     (initialEquations, uniqueEqIndex, tempVars) := SimCodeUtil.createInitialEquations(inInitDAE, uniqueEqIndex, tempVars);
     //initialEquations := listReverse(initialEquations);
 
-    // generate equations for initDAE_lambda0
-    if isSome(initDAE_lambda0_option) then
-      SOME(initDAE_lambda0) := initDAE_lambda0_option;
-      (initialEquations_lambda0, uniqueEqIndex, tempVars) := SimCodeUtil.createInitialEquations_lambda0(initDAE_lambda0, uniqueEqIndex, tempVars);
-    else
-      initialEquations_lambda0 := {};
-    end if;
-
     // generate equations for removed initial equations
     (removedInitialEquations, uniqueEqIndex, tempVars) := SimCodeUtil.createNonlinearResidualEquations(inRemovedInitialEquationLst, uniqueEqIndex, tempVars, inBackendDAE.shared.functionTree);
     //removedInitialEquations := listReverse(removedInitialEquations);
@@ -1354,7 +1343,7 @@ algorithm
                               {},
                               {},
                               initialEquations,
-                              initialEquations_lambda0,
+                              {},
                               removedInitialEquations,
                               startValueEquations,
                               nominalValueEquations,