Merge pull request #3 from vruge/master

fixed symEuler
OpenModelica · May 6, 2015 · e2edb49 · e2edb49
2 parents 506ac54 + 9bc4e2e
commit e2edb49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -4128,7 +4128,7 @@ ToDo: remove me
  input BackendDAE.BackendDAE inDAE;
  output BackendDAE.BackendDAE outDAE;
 algorithm
- outDAE := if Flags.getConfigBool(Flags.SYM_EULER) then symEulerWork(inDAE, false) else inDAE;
+ outDAE := if Flags.getConfigBool(Flags.SYM_EULER) then symEulerWork(BackendDAEUtil.copyBackendDAE(inDAE), false) else inDAE;
 
 end symEulerInit;
 
@@ -4148,7 +4148,7 @@ algorithm
   // make dt
   cref := ComponentReference.makeCrefIdent("$TMP$OMC$DT", DAE.T_REAL_DEFAULT, {});
   tmpv := BackendVariable.makeVar(cref);
-  tmpv := BackendVariable.setVarKind(tmpv, BackendDAE.PARAM());
+  //tmpv := BackendVariable.setVarKind(tmpv, BackendDAE.PARAM());
   tmpv := BackendVariable.setBindExp(tmpv, SOME(DAE.RCONST(0.0)));
   shared := BackendVariable.addKnVarDAE(tmpv, shared);
 
@@ -4230,6 +4230,7 @@ algorithm
   for cr in crlst loop
     cref := ComponentReference.crefPrefixDer(cr);
     v := BackendVariable.makeVar(cref);
+    v := BackendVariable.setBindExp(v, SOME(DAE.RCONST(0.0)));
     outShared := BackendVariable.addKnVarDAE(v, outShared);
   end for;
 end symEulerDerVars;

diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -110,7 +110,7 @@ protected
 algorithm
   try
     // inline all when equations, if active with body else with lhs=pre(lhs)
-    dae := inlineWhenForInitialization(inDAE);
+    dae := inlineWhenForInitialization(BackendDAEOptimize.symEulerInit(inDAE));
     // fcall2(Flags.DUMP_INITIAL_SYSTEM, BackendDump.dumpBackendDAE, dae, "inlineWhenForInitialization");
 
     (initVars, outPrimaryParameters, outAllPrimaryParameters) := selectInitializationVariablesDAE(dae);
@@ -201,7 +201,7 @@ algorithm
     initdae := BackendDAEUtil.mapEqSystem(initdae, solveInitialSystemEqSystem);
 
     // transform and optimize DAE
-    pastOptModules := BackendDAEUtil.getPostOptModules(SOME({"constantLinearSystem", "symEulerInit", "tearingSystem", "calculateStrongComponentJacobians", "solveSimpleEquations"}));
+    pastOptModules := BackendDAEUtil.getPostOptModules(SOME({"constantLinearSystem", "tearingSystem", "calculateStrongComponentJacobians", "solveSimpleEquations"}));
     matchingAlgorithm := BackendDAEUtil.getMatchingAlgorithm(NONE());
     daeHandler := BackendDAEUtil.getIndexReductionMethod(NONE());