actived solveSimpleEquations for simulation

OpenModelica · Mar 20, 2016 · 473cb9c · 473cb9c
1 parent c6caa77
commit 473cb9c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -7165,6 +7165,7 @@ 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
@@ -7182,7 +7183,6 @@ protected function allPostOptimizationModules
     (SymbolicJacobian.generateSymbolicJacobianPast, "generateSymbolicJacobian"),
     (SymbolicJacobian.generateSymbolicLinearizationPast, "generateSymbolicLinearization"),
     (BackendDAEOptimize.removeConstants, "removeConstants"),
-    (ExpressionSolve.solveSimpleEquations, "solveSimpleEquations"),
     (BackendDAEOptimize.simplifyTimeIndepFuncCalls, "simplifyTimeIndepFuncCalls"),
     (BackendDAEOptimize.simplifyAllExpressions, "simplifyAllExpressions"),
     (BackendDAEOptimize.hets, "hets"),

diff --git a/Compiler/BackEnd/ExpressionSolve.mo b/Compiler/BackEnd/ExpressionSolve.mo
@@ -1065,7 +1065,6 @@ end preprocessingSolve5;
 protected function unifyFunCalls
 "
 e.g.
- smooth() -> if
  semiLinear() -> if
  author: Vitalij Ruge
 "
@@ -1089,15 +1088,15 @@ protected function unifyFunCallsWork
    local
      DAE.Exp e, e1,e2,e3, X;
      DAE.Type tp;
-
+/*
    case(DAE.CALL(path = Absyn.IDENT(name = "smooth"), expLst = {_, e}),X)
      guard expHasCref(e, X)
      then (e, true, iT);
 
    case(DAE.CALL(path = Absyn.IDENT(name = "noEvent"), expLst = {e}),X)
      guard expHasCref(e, X)
      then (e, true, iT);
-
+*/
    case(DAE.CALL(path = Absyn.IDENT(name = "semiLinear"),expLst = {e1, e2, e3}),_)
      guard not Expression.isZero(e1)
        equation
@@ -1247,11 +1246,11 @@ algorithm
     case (DAE.CALL(path = Absyn.IDENT(name = "semiLinear"),expLst = {DAE.RCONST(real = 0.0), e1, e2}),DAE.RCONST(real = 0.0),_)
        then (e1,e2,true);
     // smooth(i,f(a)) = rhs -> f(a) = rhs
-    case (DAE.CALL(path = Absyn.IDENT(name = "smooth"),expLst = {_, e2}),_,_)
-       then (e2, inExp2, true);
+    //case (DAE.CALL(path = Absyn.IDENT(name = "smooth"),expLst = {_, e2}),_,_)
+    //   then (e2, inExp2, true);
     // noEvent(f(a)) = rhs -> f(a) = rhs
-    case (DAE.CALL(path = Absyn.IDENT(name = "noEvent"),expLst = {e2}),_,_)
-       then (e2, inExp2, true);
+    //case (DAE.CALL(path = Absyn.IDENT(name = "noEvent"),expLst = {e2}),_,_)
+    //   then (e2, inExp2, true);
 
     else (inExp1, inExp2, false);
   end matchcontinue;

diff --git a/Compiler/BackEnd/SymbolicJacobian.mo b/Compiler/BackEnd/SymbolicJacobian.mo
@@ -1795,13 +1795,14 @@ algorithm
                                                                     "evalFunc"},
                                                                    NONE(),
                                                                    NONE(),
-                                                                   {"wrapFunctionCalls",
+                                                                   {
+                                                                    "wrapFunctionCalls",
                                                                     "inlineArrayEqn",
                                                                     "constantLinearSystem",
+                                                                    "solveSimpleEquations",
                                                                     "tearingSystem",
                                                                     "calculateStrongComponentJacobians",
                                                                     "removeConstants",
-                                                                    "solveSimpleEquations",
                                                                     "simplifyTimeIndepFuncCalls"});
           _ = Flags.set(Flags.EXEC_STAT, b);
           if Flags.isSet(Flags.JAC_DUMP) then

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -803,6 +803,7 @@ constant ConfigFlag POST_OPT_MODULES = CONFIG_FLAG(16, "postOptModules",
     "simplifysemiLinear",
     "removeSimpleEquations",
     "simplifyComplexFunction",
+    "solveSimpleEquations",
     "tearingSystem",
     "inputDerivativesUsed",
     "calculateStrongComponentJacobians",