Skip to content

Commit

Permalink
Expected result when placing iter subs appropriately
Browse files Browse the repository at this point in the history 
Belonging to [master]:
  - OpenModelica/OMCompiler#2786
  - OpenModelica/OpenModelica-testsuite#1075
  • Loading branch information
@rfranke @OpenModelica-Hudson
rfranke authored and OpenModelica-Hudson committed Nov 14, 2018
1 parent aa7e9c1 commit 7322a43
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions openmodelica/cppruntime/testVectorizedBlocks.mos
View file
Expand Up @@ -70,7 +70,7 @@ val(y[10], 1.0);
// 3/21 (10): integrator1.y = y [dynamic |0|0|0|0|]
// 4/31 (10): assignClock1.y = assignClock1.u [dynamic |0|0|0|0|]
// 5/41 (10): for $i in 1 : 10 loop
// der(integrator1.y[$i]) = integrator1.k[$i] * integrator1.u[$i]; end for; [dynamic |0|0|0|0|]
// der(integrator1[$i].y) = integrator1[$i].k * integrator1[$i].u; end for; [dynamic |0|0|0|0|]
//
//
// Simple Equations (0, 0)
Expand Down Expand Up @@ -178,9 +178,9 @@ val(y[10], 1.0);
// 3/21 (10): integrator1.y = y [dynamic |0|0|0|0|]
// 4/31 (10): assignClock1.y = assignClock1.u [dynamic |0|0|0|0|]
// 5/41 (10): for $i in 1 : 10 loop
// $DER.integrator1.y[$i] = integrator1.k[$i] * integrator1.u[$i]; end for; [dynamic |0|0|0|0|]
// $DER.integrator1[$i].y = integrator1[$i].k * integrator1[$i].u; end for; [dynamic |0|0|0|0|]
// 6/51 (10): for i in 1 : 10 loop
// (integrator1.y[i] - previous(integrator1.y[i])) / interval() = if firstTick() then 0.0 else $DER.integrator1.y[i]; end for; [dynamic |0|0|0|0|]
// (integrator1[i].y - previous(integrator1[i].y)) / interval() = if firstTick() then 0.0 else $DER.integrator1[i].y; end for; [dynamic |0|0|0|0|]
//
//
// Simple Equations (0, 0)
Expand Down
8 changes: 4 additions & 4 deletions openmodelica/cppruntime/testVectorizedPowerSystem.mos
View file
Expand Up @@ -223,9 +223,9 @@ val(fixedVoltageSource1.p[1], 1.0);
// 5/9 (1): fixedVoltageSource1.p = {fixedVoltageSource1.terminal.v * fixedVoltageSource1.terminal.i} [dynamic |0|0|0|0|]
// 6/10 (1): fixedVoltageSource1.terminal.v = {fixedVoltageSource1.V} [dynamic |0|0|0|0|]
// 7/11 (3): for $i in 1 : 3 loop
// fixedCurrent1.p[$i] = {fixedCurrent1.terminal.v[$i] * fixedCurrent1.terminal.i[$i]}; end for; [dynamic |0|0|0|0|]
// fixedCurrent1[$i].p = {fixedCurrent1[$i].terminal.v * fixedCurrent1[$i].terminal.i}; end for; [dynamic |0|0|0|0|]
// 8/14 (3): for $i in 1 : 3 loop
// fixedCurrent1.terminal.i[$i] = {fixedCurrent1.I[$i]}; end for; [dynamic |0|0|0|0|]
// fixedCurrent1[$i].terminal.i = {fixedCurrent1[$i].I}; end for; [dynamic |0|0|0|0|]
// 9/17 (1): busBar1.v = busBar1.terminal_p.v [dynamic |0|0|0|0|]
// 10/18 (1): busBar1.i = busBar1.terminal_p.i [dynamic |0|0|0|0|]
// 11/19 (1): busBar1.p = {busBar1.v * busBar1.i} [dynamic |0|0|0|0|]
Expand Down Expand Up @@ -580,9 +580,9 @@ val(fixedVoltageSource1.p[1], 1.0);
// 5/9 (1): fixedVoltageSource1.p = {fixedVoltageSource1.terminal.v * fixedVoltageSource1.terminal.i} [dynamic |0|0|0|0|]
// 6/10 (1): fixedVoltageSource1.terminal.v = {fixedVoltageSource1.V} [dynamic |0|0|0|0|]
// 7/11 (3): for $i in 1 : 3 loop
// fixedCurrent1.p[$i] = {fixedCurrent1.terminal.v[$i] * fixedCurrent1.terminal.i[$i]}; end for; [dynamic |0|0|0|0|]
// fixedCurrent1[$i].p = {fixedCurrent1[$i].terminal.v * fixedCurrent1[$i].terminal.i}; end for; [dynamic |0|0|0|0|]
// 8/14 (3): for $i in 1 : 3 loop
// fixedCurrent1.terminal.i[$i] = {fixedCurrent1.I[$i]}; end for; [dynamic |0|0|0|0|]
// fixedCurrent1[$i].terminal.i = {fixedCurrent1[$i].I}; end for; [dynamic |0|0|0|0|]
// 9/17 (1): busBar1.v = busBar1.terminal_p.v [dynamic |0|0|0|0|]
// 10/18 (1): busBar1.i = busBar1.terminal_p.i [dynamic |0|0|0|0|]
// 11/19 (1): busBar1.p = {busBar1.v * busBar1.i} [dynamic |0|0|0|0|]
Expand Down

0 comments on commit 7322a43

Please sign in to comment.