skipped createStateSets for dummyDerivatives

OpenModelica · Jun 12, 2015 · 9300fd4 · 9300fd4
1 parent 8d92eff
commit 9300fd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Compiler/BackEnd/DynamicOptimization.mo b/Compiler/BackEnd/DynamicOptimization.mo
@@ -91,9 +91,10 @@ algorithm
 
    if not inOptimicaFlag then
     Flags.setConfigEnum(Flags.GRAMMAR, Flags.OPTIMICA);
-    Flags.setConfigString(Flags.INDEX_REDUCTION_METHOD, "dummyDerivatives");
    end if;
 
+    Flags.setConfigString(Flags.INDEX_REDUCTION_METHOD, "dummyDerivatives");
+
     (mayer,lagrange,startTimeE,finalTimeE) := match(inClassAttr)
                         local Option<DAE.Exp> mayer_, lagrange_, startTimeE_, finalTimeE_;
                         case({DAE.OPTIMIZATION_ATTRS(objetiveE=mayer_, objectiveIntegrandE=lagrange_,startTimeE=startTimeE_,finalTimeE=finalTimeE_)}) then(mayer_,lagrange_,startTimeE_,finalTimeE_);

diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -4577,8 +4577,16 @@ protected function createStateSets "author: Frenkel TUD 2012
 protected
   Boolean flag;
 algorithm
+  if Flags.getConfigString(Flags.INDEX_REDUCTION_METHOD) == "dummyDerivatives" then
+    outDAE := inDAE;
+    oEquations := iEquations;
+    ouniqueEqIndex := iuniqueEqIndex;
+    otempvars := itempvars;
+    numStateSets := 0;
+  else
   (outDAE, (oEquations, ouniqueEqIndex, otempvars, numStateSets)) :=
     BackendDAEUtil.mapEqSystemAndFold(inDAE, createStateSetsSystem, (iEquations, iuniqueEqIndex, itempvars, 0));
+  end if;
   // BackendDump.printBackendDAE(outDAE);
 end createStateSets;