Expand equations marked inlineAfterIndexReduction

This seems to be required for the multibody models. The sorting+matching
should probably have been modified rather than making it depend on
removeSimpleEquations. This is a quick fix.

Author: sjoelund

Compiler/BackEnd/RemoveSimpleEquations.mo

@@ -1149,13 +1149,23 @@ protected
   list<Integer> ds;
   list<list<DAE.Subscript>> subslst;
   list<DAE.Exp> elst1, elst2;
+  Boolean hasInlineAfterIndexReduction, expandLhs, expandRhs;
 algorithm
   dims := Expression.arrayDimension(ty);
   ds := Expression.dimensionsSizes(dims);
   subslst := List.map(ds, Expression.dimensionSizeSubscripts);
   subslst := Expression.rangesToSubscripts(subslst);
-  (elst1,true) := List.mapFold(subslst, function Expression.applyExpSubscriptsFoldCheckSimplify(exp=lhs), false);
-  (elst2,true) := List.mapFold(subslst, function Expression.applyExpSubscriptsFoldCheckSimplify(exp=rhs), false) "Do not expand equation if it doesn't help with anything... Like x=f(...); => x[1]=f()[1], ..., x[n]=f()[n]";
+  (,hasInlineAfterIndexReduction) := Expression.traverseExpTopDown(lhs, Expression.findCallIsInlineAfterIndexReduction, false);
+  (,hasInlineAfterIndexReduction) := Expression.traverseExpTopDown(rhs, Expression.findCallIsInlineAfterIndexReduction, hasInlineAfterIndexReduction);
+  (elst1,expandLhs) := List.mapFold(subslst, function Expression.applyExpSubscriptsFoldCheckSimplify(exp=lhs), false);
+  (elst2,expandRhs) := List.mapFold(subslst, function Expression.applyExpSubscriptsFoldCheckSimplify(exp=rhs), false);
+  if not hasInlineAfterIndexReduction then
+    // If inlining after index reduction or i, we need to expand equations to pass sorting+matching
+    // Note: We *should* be looking for the derivative annotation here, but it's not available directly
+    //       and better would be if sorting+matching could expand/split equations when necessary
+    true := expandLhs and expandRhs "Do not expand equation if it doesn't help with anything... Like x=f(...); => x[1]=f()[1], ..., x[n]=f()[n]";
+  else
+  end if;
   outTpl := List.threadFold2(elst1, elst2, simpleEquationAcausal, eqnAttributes, true, inTpl);
 end simpleArrayEquationAcausal;
 

Compiler/FrontEnd/Expression.mo

@@ -13117,5 +13117,19 @@ algorithm
   end match;
 end isInvariantExpNoTraverse;
 
+public function findCallIsInlineAfterIndexReduction
+  input output DAE.Exp e;
+  output Boolean cont;
+  input output Boolean res;
+algorithm
+  if not res then
+    res := match e
+      case DAE.CALL(attr=DAE.CALL_ATTR(inlineType=DAE.AFTER_INDEX_RED_INLINE())) then true;
+      else false;
+    end match;
+  end if;
+  cont := not res;
+end findCallIsInlineAfterIndexReduction;
+
 annotation(__OpenModelica_Interface="frontend");
 end Expression;