- update equations in linear systems when duplicating tasks

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21658 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Volker Waurich

Compiler/BackEnd/HpcOmScheduler.mo

@@ -2561,7 +2561,7 @@ protected function createTDSduplicateTasks2"sets the information about the new t
 protected
   String crefAppend;
   Integer threadIdx,compIdx,simVarIdx,simVarIdx2,simEqSysIdx,simEqSysIdx2,simEqSysIdx3,numVars,numEqs,numInitEqs,taskIdx,lsIdx,nlsIdx,mIdx;
-  list<Integer> comps,simVarSysIdcs,simVarSysIdcs2,simEqSysIdcs,simEqSysIdcs2,simEqSysIdcsInit,thread,clTasks,origPredTasks,clPredTasks,duplPredTasks,pos;
+  list<Integer> comps,simVarSysIdcs,simVarSysIdcs2,simEqSysIdcs,simEqSysIdcs2,systSimEqSysIdcs2,simEqSysIdcsInit,thread,clTasks,origPredTasks,clPredTasks,duplPredTasks,pos;
   list<list<Integer>> simEqIdxLst,simVarIdxLst;
   array<list<Integer>> inComps;
   BackendVarTransform.VariableReplacements repl;
@@ -2576,7 +2576,7 @@ protected
   list<list<DAE.ComponentRef>> crefLst;
   list<DAE.Exp> crefsDuplExp;
   list<SimCode.SimVar> simVarLst,simVarDupl,algVars;
-  list<SimCode.SimEqSystem> simEqSysts,simEqSystsDupl,initEqs;
+  list<SimCode.SimEqSystem> simEqSysts,simEqSystsDupl,systemSimEqSys,systemSimEqSysDupl,initEqs;
   list<list<SimCode.SimEqSystem>> odes;
 algorithm
   HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps) := iTaskGraphMeta;
@@ -2587,26 +2587,23 @@ algorithm
   //print("node to duplicate "+&intString(node)+&"\n");
   comps := arrayGet(inComps,node);
   comps := listReverse(comps);
-  //print("comps :"+&intListString(comps)+&"\n");
-  //print("task :"+&intString(taskIdx)+&"\n");
+  print("comps :"+&intListString(comps)+&"\n");
+  print("task :"+&intString(taskIdx)+&"\n");
   simEqIdxLst := List.map1(comps,Util.arrayGetIndexFirst,sccSimEqMappingIn);
   simEqSysIdcs := List.flatten(simEqIdxLst);
-  //print("simEqSysIdcs :"+&intListString(simEqSysIdcs)+&"\n");
-
+  print("simEqSysIdcs :"+&intListString(simEqSysIdcs)+&"\n");
+  
   crefLst := List.map1(simEqSysIdcs,SimCodeUtil.getAssignedCrefsOfSimEq,simCodeIn);
   crefs := List.flatten(crefLst);
-  //print("crefs :\n"+&stringDelimitList(List.map(crefs,ComponentReference.debugPrintComponentRefTypeStr),"\n")+&"\n");
-
+  print("crefs :\n"+&stringDelimitList(List.map(crefs,ComponentReference.debugPrintComponentRefTypeStr),"\n")+&"\n");
   simVarLst := List.map1(crefs,SimCodeUtil.get,ht);
-  simEqSysts := List.map1(simEqSysIdcs,SimCodeUtil.getSimEqSysForIndex,List.flatten(odes));
 
   // build the new crefs, new simVars
   numVars := listLength(simVarLst);
   simVarSysIdcs2 := List.intRange2(simVarIdx,simVarIdx+numVars-1);
   crefAppend := "_thr"+&intString(threadIdx);
-  //crefsDupl := List.map1(crefs,ComponentReference.joinArrayCrefs,DAE.CREF_IDENT(crefAppend,DAE.T_UNKNOWN_DEFAULT,{}));
   crefsDupl := List.map1r(crefs,ComponentReference.appendStringLastIdent,crefAppend);
-  //print("crefs new :\n"+&stringDelimitList(List.map(crefsDupl,ComponentReference.debugPrintComponentRefTypeStr),"\n")+&"\n");
+  print("crefs new :\n"+&stringDelimitList(List.map(crefsDupl,ComponentReference.debugPrintComponentRefTypeStr),"\n")+&"\n");
   crefsDuplExp := List.map(crefsDupl,Expression.crefExp);
   simVarDupl := List.threadMap(crefsDupl,simVarLst,SimCodeUtil.replaceSimVarName);
   simVarDupl := List.threadMap(simVarSysIdcs2,simVarDupl,SimCodeUtil.replaceSimVarIndex);
@@ -2617,14 +2614,20 @@ algorithm
   ht := List.fold(simVarDupl,SimCodeUtil.addSimVarToHashTable,ht);
   repl := BackendVarTransform.addReplacements(replIn,crefs,crefsDuplExp,NONE());
   //BackendVarTransform.dumpReplacements(repl);
+  simEqSysts := List.map1(simEqSysIdcs,SimCodeUtil.getSimEqSysForIndex,List.flatten(odes));
   numEqs := listLength(simEqSysts);
   simEqSysIdcs2 := List.intRange2(simEqSysIdx,simEqSysIdx+numEqs-1);
-  //print("simEqSysIdcs2 :"+&intListString(simEqSysIdcs2)+&"\n");
+  print("simEqSysIdcs2 :"+&intListString(simEqSysIdcs2)+&"\n");
   (simEqSystsDupl,_) := List.map1_2(simEqSysts,replaceExpsInSimEqSystem,repl);// replace the exps and crefs
   (simEqSystsDupl,(lsIdx,nlsIdx,mIdx)) := List.mapFold(simEqSystsDupl,replaceSystemIndex,(lsIdx,nlsIdx,mIdx));// udpate the indeces of th systems
   simEqSystsDupl := List.threadMap(simEqSystsDupl,simEqSysIdcs2,SimCodeUtil.replaceSimEqSysIndex);
-  //print("the simEqSystsDupl "+&SimCodeUtil.dumpSimEqSystemLst(simEqSystsDupl)+&"\n");
+  print("the simEqSystsDupl "+&SimCodeUtil.dumpSimEqSystemLst(simEqSystsDupl)+&"\n");
   simEqSysIdx2 := simEqSysIdx + numEqs;
+  
+  //duplicate the equations inside a system of equations
+  (simEqSystsDupl,simEqSysIdx2) := TDS_duplicateSystemOfEquations(simEqSystsDupl,simEqSysIdx2,repl,{});
+  print("the simEqSystsDupl after EqSys "+&SimCodeUtil.dumpSimEqSystemLst(simEqSystsDupl)+&"\n");
+
   // update sccSimEqmapping for the duplicated
   duplSccSimEqMapOut := listAppend(List.map(simEqSysIdcs2,List.create),duplSccSimEqMapIn);
   simCode := List.fold1(simEqSystsDupl,SimCodeUtil.addSimEqSysToODEquations,1,simCode);
@@ -2677,6 +2680,50 @@ algorithm
   replOut := repl;
 end createTDSduplicateTasks2;
 
+protected function TDS_duplicateSystemOfEquations
+  input list<SimCode.SimEqSystem> simEqsIn;
+  input Integer simEqSysIdxIn;
+  input BackendVarTransform.VariableReplacements repl;
+  input list<SimCode.SimEqSystem> simEqsFold;
+  output list<SimCode.SimEqSystem> simEqsOut;
+  output Integer simEqSysIdxOut;
+algorithm
+  (simEqsOut,simEqSysIdxOut) := matchcontinue(simEqsIn,simEqSysIdxIn,repl,simEqsFold)
+    local
+      Integer simEqSysIdx, index, numEqs;
+      Boolean partOfMixed;
+      list<Integer> systSimEqSysIdcs2;
+      SimCode.SimEqSystem simEqSys;
+      list<SimCode.SimEqSystem> rest,duplicated,residual;
+      list<SimCode.SimVar> vars;
+      list<DAE.Exp> beqs;
+      list<tuple<Integer, Integer, SimCode.SimEqSystem>> simJac;
+      Option<SimCode.JacobianMatrix> jacobianMatrix;
+      list<DAE.ElementSource> sources;
+      Integer indexLinearSystem;
+   case({},_,_,_)
+     then (listReverse(simEqsFold),simEqSysIdxIn);
+   case((simEqSys as SimCode.SES_LINEAR(index=index,partOfMixed=partOfMixed,vars=vars,beqs=beqs,simJac=simJac,jacobianMatrix=jacobianMatrix, residual=residual,sources=sources,indexLinearSystem=indexLinearSystem))::rest,_,_,_)
+     equation
+       //print("the systemSimEqSys "+&SimCodeUtil.dumpSimEqSystemLst(residual)+&"\n");
+       numEqs = listLength(residual);
+       systSimEqSysIdcs2 = Util.if_(intEq(numEqs,0),{},List.intRange2(simEqSysIdxIn,simEqSysIdxIn+numEqs-1));
+       //print("systSimEqSysIdcs2 :"+&intListString(systSimEqSysIdcs2)+&"\n");
+       (duplicated,_) = List.map1_2(residual,replaceExpsInSimEqSystem,repl);// replace the exps and crefs
+       duplicated = List.threadMap(duplicated,systSimEqSysIdcs2,SimCodeUtil.replaceSimEqSysIndex);
+       //print("the systemSimEqSysDupl "+&SimCodeUtil.dumpSimEqSystemLst(duplicated)+&"\n");
+       simEqSys = SimCode.SES_LINEAR(index,partOfMixed,vars,beqs,simJac,duplicated,jacobianMatrix,sources,indexLinearSystem);
+       simEqSysIdx = simEqSysIdxIn + numEqs;
+       (duplicated,simEqSysIdx)  = TDS_duplicateSystemOfEquations(rest,simEqSysIdx,repl,simEqSys::simEqsFold);
+     then (duplicated,simEqSysIdx);
+   else
+     equation
+       simEqSys::rest = simEqsIn;
+       (duplicated,simEqSysIdx)  = TDS_duplicateSystemOfEquations(rest,simEqSysIdxIn,repl,simEqSys::simEqsFold);
+     then (duplicated,simEqSysIdx);
+  end matchcontinue;
+end TDS_duplicateSystemOfEquations;
+
 protected function makeSEScrefAssignment
   input DAE.ComponentRef lhs;
   input DAE.ComponentRef rhs;

Compiler/BackEnd/HpcOmSimCodeMain.mo

@@ -318,6 +318,11 @@ algorithm
       numProc = Flags.getConfigInt(Flags.NUM_PROC);
       (numProc,_) = setNumProc(numProc,cpCostsWoC,taskGraphDataOde);//in case n-flag is not set
       (schedule,simCode,taskGraphScheduled,taskGraphDataScheduled,sccSimEqMapping) = createSchedule(taskGraphSimplified,taskGraphDataSimplified,sccSimEqMapping,filenamePrefix,numProc,simCode,scheduledTasks);
+
+      SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
+          parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
+          discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _, _, _, crefToSimVarHT, backendMapping) = simCode;
+
       //(schedule,numProc) = repeatScheduleWithOtherNumProc(taskGraphSimplified,taskGraphDataSimplified,sccSimEqMapping,filenamePrefix,cpCostsWoC,schedule,numProc,numFixed);
       numProc = Flags.getConfigInt(Flags.NUM_PROC);
       criticalPathInfo = HpcOmScheduler.analyseScheduledTaskGraph(schedule,numProc,taskGraphScheduled,taskGraphDataScheduled);

Compiler/BackEnd/SimCodeUtil.mo

@@ -7522,7 +7522,7 @@ algorithm
       SimCode.SimEqSystem cont;
       list<DAE.ComponentRef> crefs,conds;
       list<DAE.Statement> stmts;
-      list<SimCode.SimEqSystem> elsebranch,discEqs,eqs;
+      list<SimCode.SimEqSystem> elsebranch,discEqs,eqs,residual;
       list<SimCode.SimVar> vars,discVars;
       list<DAE.Exp> beqs;
       list<tuple<DAE.Exp,list<SimCode.SimEqSystem>>> ifbranches;
@@ -7558,9 +7558,10 @@ algorithm
         s = intString(idx) +&": "+& List.fold(sLst,stringAppend,"");
     then (s);
 
-    case(SimCode.SES_LINEAR(index=idx,partOfMixed=_,indexLinearSystem=idxLS,beqs = beqs))
+    case(SimCode.SES_LINEAR(index=idx,partOfMixed=_,indexLinearSystem=idxLS,beqs = beqs, residual=residual))
       equation
-        s = intString(idx) +&": "+& " (LINEAR) index:"+&intString(idxLS)+&" size :"+&intString(listLength(beqs))+&"\n";
+        s = intString(idx) +&": "+& " (LINEAR) index:"+&intString(idxLS)+&"\n";
+        s = s+&"\t"+&stringDelimitList(List.map(residual,dumpSimEqSystem),"\n\t");
     then (s);
 
     case(SimCode.SES_NONLINEAR(index=idx,indexNonLinearSystem=idxNLS,jacobianMatrix=_,linearTearing=_,eqs=eqs, crefs=crefs))
@@ -7586,12 +7587,12 @@ public function dumpSimCode
   input SimCode.SimCode simCode;
 protected
   Integer nls,nnls,nms,ninite,ninita,ninitr,ne;
-  list<SimCode.SimEqSystem> allEquations,jacobianEquations,equationsForZeroCrossings,algorithmAndEquationAsserts,initialEquations;
+  list<SimCode.SimEqSystem> allEquations,jacobianEquations,equationsForZeroCrossings,algorithmAndEquationAsserts,initialEquations,residualEquations;
   SimCode.ModelInfo modelInfo;
   SimCode.VarInfo varInfo;
   list<list<SimCode.SimEqSystem>> odeEquations, algebraicEquations;
 algorithm
-  SimCode.SIMCODE(modelInfo = modelInfo,allEquations = allEquations, odeEquations=odeEquations, algebraicEquations=algebraicEquations, algorithmAndEquationAsserts=algorithmAndEquationAsserts,
+  SimCode.SIMCODE(modelInfo = modelInfo,allEquations = allEquations, odeEquations=odeEquations, algebraicEquations=algebraicEquations,residualEquations=residualEquations, algorithmAndEquationAsserts=algorithmAndEquationAsserts,
   equationsForZeroCrossings=equationsForZeroCrossings, jacobianEquations=jacobianEquations,initialEquations=initialEquations) := simCode;
   SimCode.MODELINFO(varInfo=varInfo) := modelInfo;
   SimCode.VARINFO(numInitialEquations=ninite,numInitialAlgorithms=ninita,numInitialResiduals=ninitr,numEquations=ne,numLinearSystems=nls,numNonLinearSystems=nnls,numMixedSystems=nms) := varInfo;
@@ -7601,6 +7602,8 @@ algorithm
   print(stringDelimitList(List.map(odeEquations,dumpSimEqSystemLst),"\n--------------\n")+&"\n");
   print("algebraicEquations: \n-----------------------\n");
   print(stringDelimitList(List.map(algebraicEquations,dumpSimEqSystemLst),"\n")+&"\n");
+  print("residualEquations: \n-----------------------\n");
+  print(dumpSimEqSystemLst(residualEquations)+&"\n");
   print("initialEquations: ("+&intString(ninite)+&"+"+&intString(ninita)+&"="+&intString(ninitr)+&")\n-----------------------\n");
   print(dumpSimEqSystemLst(initialEquations)+&"\n");
   print("algorithmAndEquationAsserts: \n-----------------------\n");
@@ -12972,8 +12975,9 @@ algorithm
   crefsOut := match(simEqSys)
     local
       DAE.ComponentRef cref;
-      list<DAE.ComponentRef> crefs;
+      list<DAE.ComponentRef> crefs,crefs2;
       list<SimCode.SimVar> simVars;
+      list<SimCode.SimEqSystem> residual;
     case(SimCode.SES_RESIDUAL(index=_,exp=_,source=_))
       equation
         print("implement SES_RESIDUAL in SimCodeUtil.getSimEqSystemCrefsLHS!\n");
@@ -12992,9 +12996,11 @@ algorithm
       equation
         print("implement SES_ALGORITHM in SimCodeUtil.getSimEqSystemCrefsLHS!\n");
     then {};
-    case(SimCode.SES_LINEAR(index=_,partOfMixed=_,vars=simVars,beqs=_,sources=_,simJac=_,indexLinearSystem=_))
+    case(SimCode.SES_LINEAR(index=_,partOfMixed=_,vars=simVars,beqs=_,sources=_,simJac=_,indexLinearSystem=_,residual=residual))
       equation
+        crefs2 = List.flatten(List.map(residual,getSimEqSystemCrefsLHS));
         crefs = List.map(simVars,varName);
+        crefs = listAppend(crefs,crefs2);
     then crefs;
     case(SimCode.SES_NONLINEAR(index=_,eqs=_,crefs=crefs,indexNonLinearSystem=_,jacobianMatrix=_,linearTearing=_))
       equation