Changeset cb7cfd1 in OpenModelica

Timestamp:

2014-05-28T18:27:34+02:00 (10 years ago)

Author:

Volker Waurich <volker3189@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, 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:

f7ed18b9

Parents:

e8156127

Message:

-reverted 20880 since one model fails, will check this on monday

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

File:

• Compiler/BackEnd/InlineArrayEquations.mo (modified) (2 diffs)

Compiler/BackEnd/InlineArrayEquations.mo

@@ -47 +47 @@
 protected import Expression;
 protected import ExpressionDump;
-protected import ExpressionSimplify;
 protected import Flags;
 protected import List;
@@ -171 +170 @@
       ((e1_1, (_, _))) = BackendDAEUtil.extendArrExp((lhs, (NONE(), false)));
       ((e2_1, (_, _))) = BackendDAEUtil.extendArrExp((rhs, (NONE(), false)));
-      ea1 = Expression.flattenArrayExpToList(e1_1);
-      ea2 = Expression.flattenArrayExpToList(e2_1);
-      ((_, eqns)) = List.threadFold4(ea1, ea2, generateScalarArrayEqns2, source, differentiated, eqKind, DAE.EQUALITY_EXPS(lhs, rhs), (1, inAccEqnLst));
-    then (eqns, true);
-
-    case (BackendDAE.ARRAY_EQUATION(left=lhs,right=rhs, source=source, differentiated=differentiated, kind=eqKind), _) equation
-      ((e1_1, (_, _))) = BackendDAEUtil.extendArrExp((lhs, (NONE(), false)));
-      ((e2_1, (_, _))) = BackendDAEUtil.extendArrExp((rhs, (NONE(), false)));
-      (e1_1,_) = ExpressionSimplify.simplify(e1_1);
-      (e2_1,_) = ExpressionSimplify.simplify(e2_1);
-      true = Expression.isArray(e1_1) or Expression.isMatrix(e1_1);
-      true = Expression.isArray(e2_1) or Expression.isMatrix(e2_1);
       ea1 = Expression.flattenArrayExpToList(e1_1);
       ea2 = Expression.flattenArrayExpToList(e2_1);