Changeset 8ede334 in OpenModelica

Timestamp:

2024-06-21T15:43:54+02:00 (6 days ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

02772939, 0422d67a, 0483724a, 1c2530e, 1f65e83e, 3d6a6ba, 3f030e1, 4d1e92c4, 75f0f503, 7e886b6d, 954e35ae, 95ab1834, 9d197a6, adb4b27, c0d0c458, e61cdc26, e762ba3, f2ee82ff, f6e5801b, facded5b

Parents:

537f41e

git-author:

kabdelhak <38032125+kabdelhak@…> (06/21/24 15:43:54)

git-committer:

GitHub <noreply@…> (06/21/24 15:43:54)

Message:

[NB] add array compression after simplify to remove DUMMY equations (#12624)

• dumping updates

Location:

OMCompiler/Compiler/NBackEnd/Classes

Files:

• NBEquation.mo (modified) (3 diffs)
• NBackendDAE.mo (modified) (1 diff)

OMCompiler/Compiler/NBackEnd/Classes/NBEquation.mo

@@ -702 +702 @@
         case IF_EQUATION()     then str + IfEquationBody.toString(eq.body, str + "[----] ", "[-IF-] " + s + EquationAttributes.toString(eq.attr, " "));
         case FOR_EQUATION()    then str + forEquationToString(eq.iter, eq.body, "", str + "[----] ", "[FOR-] " + s + EquationAttributes.toString(eq.attr, " "));
-        case WHEN_EQUATION()   then str + WhenEquationBody.toString(eq.body, str + "[----] ", "[WHEN] " + s + EquationAttributes.toString(eq.attr, " ") + "\n[----] ");
+        case WHEN_EQUATION()   then str + WhenEquationBody.toString(eq.body, str + "[----] ", "[WHEN] " + s + EquationAttributes.toString(eq.attr, " ") + "\n");
         case AUX_EQUATION()    then str + "[AUX-] " + s + "Auxiliary equation for " + Variable.toString(Pointer.access(eq.auxiliary));
         case DUMMY_EQUATION()  then str + "[DUMY] (0) Dummy equation.";
@@ -2524 +2524 @@
       WhenEquationBody elseWhen;
     algorithm
-      str := elseStr + "when " + Expression.toString(body.condition) + " then \n";
+      str := elseStr;
+      if not selfCall then
+        str := str + indent;
+      end if;
+      str := str + "when " + Expression.toString(body.condition) + " then \n";
       for stmt in body.when_stmts loop
         str := str + WhenStatement.toString(stmt, indent + "  ") + "\n";
@@ -3688 +3692 @@
           eqn := ExpandableArray.get(i, equations.eqArr);
           () := match Pointer.access(eqn)
+            local
+              list<Equation> body;
+            // todo: add for IF and WHEN
             case Equation.DUMMY_EQUATION() then ();
+            case Equation.FOR_EQUATION(body = body) guard(List.all(body, Equation.isDummy)) then ();
             else algorithm
               eqns := eqn :: eqns;

OMCompiler/Compiler/NBackEnd/Classes/NBackendDAE.mo

@@ -336 +336 @@
     input output BackendDAE bdae;
   algorithm
-    // no output needed, all pointers
-    () := match bdae
-      local
-        EquationPointers equations;
-      case MAIN(eqData = BEquation.EQ_DATA_SIM(equations = equations)) algorithm
-        _ := EquationPointers.map(equations, function Equation.simplify(name = getInstanceName(), indent = ""));
-      then ();
-      else ();
+    bdae := match bdae
+      local
+        EqData eqData;
+      case MAIN(eqData = eqData as BEquation.EQ_DATA_SIM()) algorithm
+        eqData.equations := EquationPointers.map(eqData.equations, function Equation.simplify(name = getInstanceName(), indent = ""));
+        bdae.eqData := EqData.compress(eqData);
+      then bdae;
+      else bdae;
     end match;
   end simplify;