solveSimplEquation change order

OpenModelica · Mar 21, 2016 · f71b978 · f71b978
1 parent 230aa3e
commit f71b978
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -7223,7 +7223,6 @@ protected function allPostOptimizationModules
     (BackendDAEOptimize.addedScaledVars_inputs, "addScaledVars_inputs"),
     (RemoveSimpleEquations.removeSimpleEquations, "removeSimpleEquations"),
     (BackendDAEOptimize.simplifyComplexFunction, "simplifyComplexFunction"),
-    (ExpressionSolve.solveSimpleEquations, "solveSimpleEquations"),
     (BackendDAEOptimize.symEuler, "symEuler"),
     (ResolveLoops.reshuffling_post, "reshufflePost"),
     (DynamicOptimization.reduceDynamicOptimization, "reduceDynamicOptimization"), // before tearing
@@ -7240,6 +7239,7 @@ protected function allPostOptimizationModules
     (SymbolicJacobian.detectSparsePatternODE, "detectJacobianSparsePattern"),
     (SymbolicJacobian.generateSymbolicJacobianPast, "generateSymbolicJacobian"),
     (SymbolicJacobian.generateSymbolicLinearizationPast, "generateSymbolicLinearization"),
+    (ExpressionSolve.solveSimpleEquations, "solveSimpleEquations"),
     (BackendDAEOptimize.removeConstants, "removeConstants"),
     (BackendDAEOptimize.simplifyTimeIndepFuncCalls, "simplifyTimeIndepFuncCalls"),
     (BackendDAEOptimize.simplifyAllExpressions, "simplifyAllExpressions"),

diff --git a/Compiler/BackEnd/SymbolicJacobian.mo b/Compiler/BackEnd/SymbolicJacobian.mo
@@ -1798,9 +1798,9 @@ algorithm
                                                                     "wrapFunctionCalls",
                                                                     "inlineArrayEqn",
                                                                     "constantLinearSystem",
-                                                                    "solveSimpleEquations",
                                                                     "tearingSystem",
                                                                     "calculateStrongComponentJacobians",
+                                                                    "solveSimpleEquations",
                                                                     "removeConstants",
                                                                     "simplifyTimeIndepFuncCalls"});
           _ = Flags.set(Flags.EXEC_STAT, b);

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -803,12 +803,12 @@ constant ConfigFlag POST_OPT_MODULES = CONFIG_FLAG(16, "postOptModules",
     "simplifysemiLinear",
     "removeSimpleEquations",
     "simplifyComplexFunction",
-    "solveSimpleEquations",
     "tearingSystem",
     "inputDerivativesUsed",
     "calculateStrongComponentJacobians",
     "calculateStateSetsJacobians",
     "detectJacobianSparsePattern",
+    "solveSimpleEquations",
     "removeConstants",
     "simplifyTimeIndepFuncCalls",
     "simplifyAllExpressions"