fixed the generation of the ode taskgraph (for torn systems and compl…

…ex equations) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16500 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 27, 2013 · 445c5d1 · 445c5d1
1 parent cf7ee50
commit 445c5d1
Show file tree

Hide file tree

Showing 2 changed files with 413 additions and 241 deletions.
diff --git a/Compiler/BackEnd/HpcOmSimCode.mo b/Compiler/BackEnd/HpcOmSimCode.mo
@@ -130,15 +130,14 @@ algorithm
 
       //Create TaskGraph
       HpcOmTaskGraph.createTaskGraph(inBackendDAE,filenamePrefix);
-
+      
       uniqueEqIndex = 1;
       ifcpp = stringEqual(Config.simCodeTarget(), "Cpp");
       // Debug.fcall(Flags.FAILTRACE, print, "is that Cpp? : " +& Dump.printBoolStr(ifcpp) +& "\n");
       cname = Absyn.pathStringNoQual(class_);
 
       // generate initDAE before replacing pre(alias)!
       initDAE = Initialization.solveInitialSystem(dlow);
-
       // replace pre(alias) in time-equations
       dlow = BackendDAEOptimize.simplifyTimeIndepFuncCalls(dlow);
 
@@ -147,7 +146,6 @@ algorithm
 
       // check if the Sytems has states
       dlow = BackendDAEUtil.addDummyStateIfNeeded(dlow);
-
       BackendDAE.DAE(systs, shared as BackendDAE.SHARED(removedEqs=removedEqs, 
                                                         constraints=constrsarr, 
                                                         classAttrs=clsattrsarra, 
@@ -187,7 +185,8 @@ algorithm
 
       // equation generation for euler, dassl2, rungekutta
       (uniqueEqIndex, odeEquations, algebraicEquations, allEquations, tempvars) = SimCodeUtil.createEquationsForSystems(systs, shared, uniqueEqIndex, {}, {}, {}, tempvars);
-      print("from "+&intString(listLength(allEquations))+&" we have "+&intString(listLength(List.flatten(odeEquations)))+& " ode eqs and "+&intString(listLength(List.flatten(algebraicEquations)))+&" algebraic eqs\n");
+      //print("from "+&intString(listLength(allEquations))+&" we have "+&intString(listLength(List.flatten(odeEquations)))+& " ode eqs and "+&intString(listLength(List.flatten(algebraicEquations)))+&" algebraic eqs\n");
+      //HpcOmTaskGraph.createTaskGraphODE(odeEquations,dlow,filenamePrefix);
 //      modelInfo = SimCodeUtil.addTempVars(tempvars, modelInfo);
 //
 //      // Assertions and crap