[DAEmode] Fix sorting of parameter equations

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

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -7380,7 +7380,7 @@ algorithm
   fail();
 end getOptimizesDAEModeSystem;
 
-protected function sortGlobalKnownVarsInDAE "
+public function sortGlobalKnownVarsInDAE "
 author: ptaeuber
 This function sorts the globalKnownVars"
   input output BackendDAE.BackendDAE backendDAE;

diff --git a/Compiler/BackEnd/DAEMode.mo b/Compiler/BackEnd/DAEMode.mo
@@ -136,6 +136,9 @@ algorithm
     // use preOpt instead
     simDAE := BackendDAEUtil.postOptimizeDAE(simDAE, postOptModules, matchingAlgorithm, daeHandler);
 
+    // sort the globalKnownVars
+    simDAE := BackendDAEUtil.sortGlobalKnownVarsInDAE(simDAE);
+
     // debug dump
     if Flags.isSet(Flags.DUMP_INDX_DAE) then
       BackendDump.dumpBackendDAE(simDAE, "dumpindxdae");

diff --git a/Compiler/SimCode/SimCodeMain.mo b/Compiler/SimCode/SimCodeMain.mo
@@ -1070,6 +1070,7 @@ protected
   Integer nStates;
   Integer numberofEqns, numStateSets, numberofLinearSys, numberofNonLinearSys,
   numberofMixedSys, numberOfJacobians, numberofFixedParameters;
+  Boolean tmpB;
 
   list<DAE.ComponentRef> discreteModelVars;
   list<BackendDAE.TimeEvent> timeEvents;
@@ -1150,7 +1151,6 @@ algorithm
     ((uniqueEqIndex, parameterEquations)) := BackendDAEUtil.foldEqSystem(inBackendDAE, SimCodeUtil.createVarNominalAssertFromVars, (uniqueEqIndex, {}));
     if debug then ExecStat.execStat("simCode: createVarNominalAssertFromVars"); end if;
     (uniqueEqIndex, parameterEquations, _) := SimCodeUtil.createParameterEquations(uniqueEqIndex, parameterEquations, inBackendDAE.shared.globalKnownVars);
-    parameterEquations := listReverse(parameterEquations);
     if debug then ExecStat.execStat("simCode: createParameterEquations"); end if;
 
     (uniqueEqIndex, removedEquations) := BackendEquation.traverseEquationArray(BackendDAEUtil.collapseRemovedEqs(inBackendDAE), SimCodeUtil.traversedlowEqToSimEqSystem, (uniqueEqIndex, {}));
@@ -1173,9 +1173,11 @@ algorithm
     emptyBDAE := BackendDAE.DAE(BackendDAEUtil.createEqSystem(
                                   Util.getOption(inBackendDAE.shared.daeModeData.modelVars))::{},
                                 inBackendDAE.shared);
-    // disable start value calculation, since it fails for some reason
-    Flags.enableDebug(Flags.NO_START_CALC);
+    // disable start value calculation, it's only helpful in case of algebraic loops
+    // and they are not present in DAEmode
+    tmpB := Flags.set(Flags.NO_START_CALC, true);
     modelInfo := SimCodeUtil.createModelInfo(className, p, emptyBDAE, inInitDAE, functions, {}, numStateSets, fileDir, 0, tempVars);
+    Flags.set(Flags.NO_START_CALC, tmpB);
 
     //create hash table
     crefToSimVarHT := SimCodeUtil.createCrefToSimVarHT(modelInfo);