Changeset 74f72fe in OpenModelica

Timestamp:

2020-10-21T15:09:21+02:00 (3 years ago)

Author:

Adrian Pop <adrian.pop@…>

Children:

e0a8d3d

Parents:

9960cdcd

git-author:

Per Östlund <perost86@…> (10/20/20 15:41:28)

git-committer:

Adrian Pop <adrian.pop@…> (10/21/20 15:09:21)

Message:

Fix indexing in ArrayConnections.transMulti.

Files:

• OMCompiler/Compiler/NFFrontEnd/NFArrayConnections.mo (modified) (1 diff)
• testsuite/flattening/modelica/scodeinst/ArrayConnect3.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFArrayConnections.mo

@@ -1017 +1017 @@
       i2_sz := SBInterval.size(i2);
 
-      x := Expression.fromCref(ComponentRef.makeIterator(iterators[1], Type.INTEGER()));
+      x := Expression.fromCref(ComponentRef.makeIterator(iterators[i], Type.INTEGER()));
 
       if i1_sz == i2_sz then

testsuite/flattening/modelica/scodeinst/ArrayConnect3.mo

@@ -59 +59 @@
 //   for $i1 in 1:999 loop
 //     for $i2 in 2:100 loop
-//       cells[$i1,$i2].l.e = cells[$i1,$i1 - 1].r.e;
+//       cells[$i1,$i2].l.e = cells[$i1,$i2 - 1].r.e;
 //     end for;
 //   end for;
 //   for $i1 in 1:999 loop
-//     cells[$i1,$i1].r.f + cells[$i1,$i1 + 1].l.f = 0.0;
+//     for $i2 in 1:99 loop
+//       cells[$i1,$i2].r.f + cells[$i1,$i2 + 1].l.f = 0.0;
+//     end for;
 //   end for;
 //   for $i1 in 2:1000 loop
 //     for $i2 in 1:99 loop
-//       cells[$i1,$i2].u.e = cells[$i1 - 1,$i1].d.e;
+//       cells[$i1,$i2].u.e = cells[$i1 - 1,$i2].d.e;
 //     end for;
 //   end for;
 //   for $i1 in 1:999 loop
-//     cells[$i1,$i1].d.f + cells[$i1 + 1,$i1].u.f = 0.0;
+//     for $i2 in 1:99 loop
+//       cells[$i1,$i2].d.f + cells[$i1 + 1,$i2].u.f = 0.0;
+//     end for;
 //   end for;
 //   for $i1 in 1:1000 loop
-//     cells[$i1,1].l.e = cells[$i1,$i1 + 99].r.e;
+//     cells[$i1,1].l.e = cells[$i1,100].r.e;
 //   end for;
 //   for $i1 in 1:1000 loop
-//     cells[$i1,$i1].r.f + cells[$i1,$i1 - 99].l.f = 0.0;
+//     cells[$i1,100].r.f + cells[$i1,1].l.f = 0.0;
 //   end for;
-//   cells[1000,1000].r.f = 0.0;
-//   cells[1000,1000].l.f = 0.0;
-//   cells[1000,1000].d.f = 0.0;
+//   for $i2 in 1:99 loop
+//     cells[1000,$i2].r.f = 0.0;
+//   end for;
+//   for $i2 in 2:100 loop
+//     cells[1000,$i2].l.f = 0.0;
+//   end for;
+//   for $i2 in 1:100 loop
+//     cells[1000,$i2].d.f = 0.0;
+//   end for;
 //   for $i1 in 1:999 loop
-//     cells[$i1,$i1].d.f = 0.0;
+//     cells[$i1,100].d.f = 0.0;
 //   end for;
-//   cells[1,1].u.f = 0.0;
+//   for $i2 in 1:100 loop
+//     cells[1,$i2].u.f = 0.0;
+//   end for;
 //   for $i1 in 2:1000 loop
-//     cells[$i1,$i1].u.f = 0.0;
+//     cells[$i1,100].u.f = 0.0;
 //   end for;
 // end ArrayConnect3;