[DAEmode] added removed equations

Belonging to [master]: - OpenModelica/OMCompiler#2244
OpenModelica · Mar 1, 2018 · 24e74bf · 24e74bf
1 parent f06fb14
commit 24e74bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Compiler/SimCode/SimCodeMain.mo b/Compiler/SimCode/SimCodeMain.mo
@@ -1085,7 +1085,7 @@ protected
   Option<SimCode.JacobianMatrix> daeModeSP;
   Option<SimCode.DaeModeData> daeModeData;
   SimCode.DaeModeConfig daeModeConf;
-  list<SimCode.SimEqSystem> daeEquations;
+  list<SimCode.SimEqSystem> daeEquations, removedEquations;
   list<SimCodeVar.SimVar> residualVars, algebraicStateVars, auxiliaryVars;
   list<SimCode.StateSet> stateSets;
 
@@ -1153,6 +1153,7 @@ algorithm
     parameterEquations := listReverse(parameterEquations);
     if debug then ExecStat.execStat("simCode: createParameterEquations"); end if;
 
+    (uniqueEqIndex, removedEquations) := BackendEquation.traverseEquationArray(BackendDAEUtil.collapseRemovedEqs(inBackendDAE), SimCodeUtil.traversedlowEqToSimEqSystem, (uniqueEqIndex, {}));
     discreteModelVars := BackendDAEUtil.foldEqSystem(inBackendDAE, SimCodeUtil.extractDiscreteModelVars, {});
 
     //prepare DAEmode stuff
@@ -1257,7 +1258,7 @@ algorithm
                               minValueEquations,
                               maxValueEquations,
                               parameterEquations,
-                              {},
+                              removedEquations,
                               {},
                               {},
                               jacobianEquations,

diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -5369,7 +5369,7 @@ algorithm
   end matchcontinue;
 end createAlgorithmAndEquationAsserts;
 
-protected function traversedlowEqToSimEqSystem
+public function traversedlowEqToSimEqSystem
   input BackendDAE.Equation inEq;
   input tuple<Integer, list<SimCode.SimEqSystem>> inTpl;
   output BackendDAE.Equation outEq;