Fix ticket:4611.

- Fix counting of complex equations in checkModel. Belonging to [master]: - OpenModelica/OMCompiler#1977 - OpenModelica/OpenModelica-testsuite#761
OpenModelica · Nov 6, 2017 · 0f09961 · 0f09961
1 parent 23c2c8b
commit 0f09961
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Compiler/FrontEnd/CheckModel.mo b/Compiler/FrontEnd/CheckModel.mo
@@ -191,7 +191,7 @@ algorithm
     case DAE.ARRAY_EQUATION(dimension=dims)
       equation
         (varSize, eqnSize, eqns, hs) = inArg;
-        size =  List.fold(Expression.dimensionsSizes(dims), intMul, 1);
+        size = Expression.sizeOf(Expression.typeof(inElt.exp));
       then (varSize, eqnSize+size, inElt::eqns, hs);
 
     // initial array equations

diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -2135,6 +2135,7 @@ algorithm
     case DAE.T_ARRAY(dims = ad)
       equation
         nr = dimensionSize(List.reduce(ad, dimensionsMult));
+        nr = nr * sizeOf(inType.ty);
       then
         nr;