Changeset aafc860 in OpenModelica

Timestamp:

2021-01-22T13:11:18+01:00 (3 years ago)

Author:

Andreas <38031952+AnHeuermann@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

c2c52350

Parents:

9220249b

git-author:

AnHeuermann <andreas.heuermann@…> (01/21/21 16:17:59)

git-committer:

Andreas <38031952+AnHeuermann@…> (01/22/21 13:11:18)

Message:

Adding initEquations_lambda0 to DAE

Location:

OMCompiler/Compiler

Files:

• BackEnd/DAEMode.mo (modified) (2 diffs)
• SimCode/SimCodeMain.mo (modified) (9 diffs)

OMCompiler/Compiler/BackEnd/DAEMode.mo

@@ -81 +81 @@
   output BackendDAE.BackendDAE outDAEmode;
   output BackendDAE.BackendDAE outInitDAE;
+  output Option<BackendDAE.BackendDAE> outInitDAE_lambda0_option;
   output list<BackendDAE.Equation> outRemovedInitialEquationLst;
  protected
@@ -125 +126 @@
 
     // generate system for initialization
-    (outInitDAE, _, outRemovedInitialEquationLst, globalKnownVars, dae) := Initialization.solveInitialSystem(dae);
+    (outInitDAE, outInitDAE_lambda0_option, outRemovedInitialEquationLst, globalKnownVars, dae) := Initialization.solveInitialSystem(dae);
 
     // use function tree from initDAE further for simDAE

OMCompiler/Compiler/SimCode/SimCodeMain.mo

@@ -1108 +1108 @@
       BackendDAE.BackendDAE initDAE;
       list<BackendDAE.Equation> removedInitialEquationLst;
+      Option<BackendDAE.BackendDAE> initDAE_lambda0_option;
       Real fsize;
       Absyn.ComponentRef classNameCref;
@@ -1154 +1155 @@
 
       //BackendDump.printBackendDAE(dlow);
-      (bdae, initDAE, removedInitialEquationLst) := DAEMode.getEqSystemDAEmode(dlow,inFileNamePrefix);
+      (bdae, initDAE, initDAE_lambda0_option, removedInitialEquationLst) := DAEMode.getEqSystemDAEmode(dlow, inFileNamePrefix);
       ExecStat.execStat("Backend");
 
@@ -1166 +1167 @@
       end if;
 
-      (libs, file_dir, timeSimCode, timeTemplates) := generateModelCodeDAE(bdae, initDAE, removedInitialEquationLst, SymbolTable.getAbsyn(), className, filenameprefix, inSimSettingsOpt, args);
+      (libs, file_dir, timeSimCode, timeTemplates) := generateModelCodeDAE(bdae, initDAE, initDAE_lambda0_option, removedInitialEquationLst, SymbolTable.getAbsyn(), className, filenameprefix, inSimSettingsOpt, args);
       timeSimCode := System.realtimeTock(ClockIndexes.RT_CLOCK_SIMCODE);
       timeTemplates := System.realtimeTock(ClockIndexes.RT_CLOCK_TEMPLATES);
@@ -1199 +1200 @@
   input BackendDAE.BackendDAE inBackendDAE;
   input BackendDAE.BackendDAE inInitDAE;
+  input Option<BackendDAE.BackendDAE> initDAE_lambda0_option;
   input list<BackendDAE.Equation> inRemovedInitialEquationLst;
   input Absyn.Program p;
@@ -1222 +1224 @@
   list<SimCodeVar.SimVar> tempVars = {};
   BackendDAE.BackendDAE emptyBDAE;
+  BackendDAE.BackendDAE initDAE_lambda0;
 
   SimCode.ModelInfo modelInfo;
@@ -1256 +1259 @@
   SimCode.JacobianMatrix symDAESparsPattern;
   list<SimCode.JacobianMatrix> symJacs, SymbolicJacs, SymbolicJacsNLS, SymbolicJacsTemp, SymbolicJacsStateSelect;
-  list<SimCode.SimEqSystem> initialEquations, removedInitialEquations, jacobianEquations;
+  list<SimCode.SimEqSystem> initialEquations;
+  list<SimCode.SimEqSystem> initialEquations_lambda0;
+  list<SimCode.SimEqSystem> removedInitialEquations, jacobianEquations;
   list<SimCodeVar.SimVar> jacobianSimvars, seedVars;
   list<SimCode.SimEqSystem> startValueEquations;        // --> updateBoundStartValues
@@ -1294 +1299 @@
     // generate equations for initDAE
     (initialEquations, uniqueEqIndex, tempVars) := SimCodeUtil.createInitialEquations(inInitDAE, uniqueEqIndex, tempVars);
-    //initialEquations := listReverse(initialEquations);
+
+    // generate equations for initDAE_lambda0
+    if isSome(initDAE_lambda0_option) then
+      SOME(initDAE_lambda0) := initDAE_lambda0_option;
+      (initialEquations_lambda0, uniqueEqIndex, tempVars) := SimCodeUtil.createInitialEquations_lambda0(initDAE_lambda0, uniqueEqIndex, tempVars);
+    else
+      initialEquations_lambda0 := {};
+    end if;
 
     // generate equations for removed initial equations
@@ -1339 +1351 @@
     (initialEquations, modelInfo, SymbolicJacsTemp) := SimCodeUtil.addAlgebraicLoopsModelInfo(initialEquations, modelInfo);
     SymbolicJacsNLS := listAppend(SymbolicJacsTemp, SymbolicJacsNLS);
+    (initialEquations_lambda0, modelInfo, SymbolicJacsTemp) := SimCodeUtil.addAlgebraicLoopsModelInfo(initialEquations_lambda0, modelInfo);
+    SymbolicJacsNLS := listAppend(SymbolicJacsTemp, SymbolicJacsNLS);
     (parameterEquations, modelInfo, SymbolicJacsTemp) := SimCodeUtil.addAlgebraicLoopsModelInfo(parameterEquations, modelInfo);
     SymbolicJacsNLS := listAppend(SymbolicJacsTemp, SymbolicJacsNLS);
@@ -1423 +1437 @@
       clockedPartitions           = {},
       initialEquations            = initialEquations,
-      initialEquations_lambda0    = {},
+      initialEquations_lambda0    = initialEquations_lambda0,
       removedInitialEquations     = removedInitialEquations,
       startValueEquations         = startValueEquations,