Changeset 20882

Timestamp:

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

Author:

vwaurich

Message:

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

File:

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

trunk/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);