Changeset e62a382 in OpenModelica

Timestamp:

2020-10-21T18:53:49+02:00 (4 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

maintenance/v1.16

Children:

82316a99

Parents:

c850391

git-author:

Karim Abdelhak <karim.abdelhak@…> (10/08/20 13:27:03)

git-committer:

Adrian Pop <adrian.pop@…> (10/21/20 18:53:49)

Message:

[BE] remove empty initial equations

• filter the initial equations for equations that do not have initial unknowns and remove them
• needed for data reconciliation since there might be initial equations for state derivatives of states that got removed during data recon

Location:

OMCompiler/Compiler/BackEnd

Files:

• BackendEquation.mo (modified) (1 diff)
• Initialization.mo (modified) (2 diffs)

OMCompiler/Compiler/BackEnd/BackendEquation.mo

@@ -3237 +3237 @@
 end createResidualExp;
 
+public function hasAnyUnknown
+  input BackendDAE.Equation eqn;
+  input BackendDAE.Variables vars;
+  output Boolean b;
+algorithm
+  b := not listEmpty(equationVars(eqn, vars));
+end hasAnyUnknown;
+
 annotation(__OpenModelica_Interface="backend");
 end BackendEquation;

OMCompiler/Compiler/BackEnd/Initialization.mo

@@ -1169 +1169 @@
   DoubleEnded.MutableList<BackendDAE.Var> dumpVars;
   DoubleEnded.MutableList<BackendDAE.Equation> removedEqns;
+  list<BackendDAE.Equation> filtered_initial_eqs;
 algorithm
   // filter empty systems
@@ -1178 +1179 @@
       eqs := syst::eqs;
     else
-      DoubleEnded.push_list_back(removedEqns, BackendEquation.equationList(syst.orderedEqs));
+      filtered_initial_eqs := list(eqn for eqn guard(BackendEquation.hasAnyUnknown(eqn, inInitVars)) in BackendEquation.equationList(syst.orderedEqs));
+      DoubleEnded.push_list_back(removedEqns, filtered_initial_eqs);
       DoubleEnded.push_list_back(removedEqns, BackendEquation.equationList(syst.removedEqs));
     end if;