- BackendDAEOptimize.mo

  - use not "a = der(b), a not state" case for simpleEquation because this leads to problems in the removed equations
Example model Modelica.Mechanics.Translational.Examples.Damper :
5 : $DER.mass1.v := $DER.$DER.mass1.s
6 : mass1.a := $DER.mass1.v
- update test because of this

- ExpressionSimplify.mo
  - add case for asub with more than one subscribt, simplify the expression from ASUB
- simulate-msl31-examples.mos
  - update comments from some models, now all models generates compileable code, only EnginveV6 should is not testes because compiling of 107 MB files are very time intensive


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

Compiler/BackendDAEOptimize.mo

@@ -606,13 +606,6 @@ algorithm
       true = RTOpts.eliminationLevel() > 1;
       true = Expression.isConst(e);
       then (e1,DAE.UNARY(DAE.UMINUS_ARR(t),e),src);
-
-      // a = der(b), a not state;
-      case (BackendDAE.EQUATION(e1 as DAE.CREF(componentRef = _),e2 as  DAE.CALL(path = Absyn.IDENT(name = "der"),expLst={DAE.CREF(componentRef = _)}),src),swap)
-        equation
-          true = RTOpts.eliminationLevel() > 0;
-          true = RTOpts.eliminationLevel() <> 3;
-        then (e1,e2,src);        
   end matchcontinue;
 end simpleEquation;
 

Compiler/ExpressionSimplify.mo

@@ -221,6 +221,13 @@ algorithm
         e = simplifyAsub(e, sub) "For arbitrary vector operations, e.g (a+b-c)[1] => a[1]+b[1]-c[1]" ;
       then
         e;
+
+    // all other asubs
+    case DAE.ASUB(exp = e,sub = exps)
+      equation
+        e1 = simplify1(e);
+      then
+        DAE.ASUB(e1,exps);
 
     // unary operations
     case ((exp as DAE.UNARY(operator = op,exp = e1)))