Recover original cse index logic

OpenModelica · Jan 29, 2016 · 506ea92 · 506ea92
1 parent 387689b
commit 506ea92
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 124 deletions.
diff --git a/simulation/modelica/commonSubExp/cse1.mos b/simulation/modelica/commonSubExp/cse1.mos
@@ -65,16 +65,16 @@ simulate(Tearing15); getErrorString();
 // ========================================
 // 1: $res1.$pDERNLSJac1.dummyVarNLSJac1:STATE_DER()  type: Real unreplaceable
 // 2: v5.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE()  type: Real
-// 3: $cse5:VARIABLE()  type: Real unreplaceable
-// 4: $cse4:VARIABLE()  type: Real unreplaceable
+// 3: $cse4:VARIABLE()  type: Real unreplaceable
+// 4: $cse3:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (4, 4)
 // ========================================
-// 1/1 (1): $res1.$pDERNLSJac1.dummyVarNLSJac1 = v5.$pDERNLSJac1.dummyVarNLSJac1 + v6 * $cse4 * v6SeedNLSJac1 * source + v6SeedNLSJac1 * $cse5 * source   [dynamic]
-// 2/2 (1): 3.0 * v5.$pDERNLSJac1.dummyVarNLSJac1 + (-v6) * $cse4 * v6SeedNLSJac1 - v6SeedNLSJac1 * $cse5 = 0.0   [dynamic]
-// 3/3 (1): $cse5 = sin(v6)   [binding]
-// 4/4 (1): $cse4 = cos(v6)   [binding]
+// 1/1 (1): $res1.$pDERNLSJac1.dummyVarNLSJac1 = v5.$pDERNLSJac1.dummyVarNLSJac1 + v6 * $cse3 * v6SeedNLSJac1 * source + v6SeedNLSJac1 * $cse4 * source   [dynamic]
+// 2/2 (1): 3.0 * v5.$pDERNLSJac1.dummyVarNLSJac1 + (-v6) * $cse3 * v6SeedNLSJac1 - v6SeedNLSJac1 * $cse4 = 0.0   [dynamic]
+// 3/3 (1): $cse4 = sin(v6)   [binding]
+// 4/4 (1): $cse3 = cos(v6)   [binding]
 //
 //
 // ########### Updated Variable List ########### (11)
@@ -87,24 +87,24 @@ simulate(Tearing15); getErrorString();
 // 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
 // 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
 // 8: source:VARIABLE() .Tearing15, .Real type: Real
-// 9: $cse9:VARIABLE()  type: Real unreplaceable
-// 10: $cse8:VARIABLE()  type: Real unreplaceable
-// 11: $cse7:VARIABLE()  type: Real unreplaceable
+// 9: $cse7:VARIABLE()  type: Real unreplaceable
+// 10: $cse6:VARIABLE()  type: Real unreplaceable
+// 11: $cse5:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (11, 11)
 // ========================================
-// 1/1 (1): source = $cse7   [dynamic]
-// 2/2 (1): -4.0 + v1 * $cse8 + v2 + source = 0.0   [dynamic]
-// 3/3 (1): 2.0 * v1 * $cse8 + v2 + v7 + (-source) - v3 = 0.0   [dynamic]
-// 4/4 (1): 3.0 * v1 * $cse8 + -7.0 * v2 + -2.0 * v3 + 3.0 * source * v7 = 0.0   [dynamic]
-// 5/5 (1): v1 * $cse8 + v2 + source + (-v3) * source - v7 = 0.0   [dynamic]
+// 1/1 (1): source = $cse5   [dynamic]
+// 2/2 (1): -4.0 + v1 * $cse6 + v2 + source = 0.0   [dynamic]
+// 3/3 (1): 2.0 * v1 * $cse6 + v2 + v7 + (-source) - v3 = 0.0   [dynamic]
+// 4/4 (1): 3.0 * v1 * $cse6 + -7.0 * v2 + -2.0 * v3 + 3.0 * source * v7 = 0.0   [dynamic]
+// 5/5 (1): v1 * $cse6 + v2 + source + (-v3) * source - v7 = 0.0   [dynamic]
 // 6/6 (1): 2.0 + 3.0 * v2 + -0.5 * source * v7 + (-v5) - v4 = 0.0   [dynamic]
-// 7/7 (1): v5 + v6 * $cse9 * source + v3 = 0.0   [dynamic]
-// 8/8 (1): 3.0 * v5 + (-v6) * $cse9 - source = 0.0   [dynamic]
-// 9/9 (1): $cse9 = sin(v6)   [binding]
-// 10/10 (1): $cse8 = sin(v1)   [binding]
-// 11/11 (1): $cse7 = sin(time)   [binding]
+// 7/7 (1): v5 + v6 * $cse7 * source + v3 = 0.0   [dynamic]
+// 8/8 (1): 3.0 * v5 + (-v6) * $cse7 - source = 0.0   [dynamic]
+// 9/9 (1): $cse7 = sin(v6)   [binding]
+// 10/10 (1): $cse6 = sin(v1)   [binding]
+// 11/11 (1): $cse5 = sin(time)   [binding]
 //
 //
 // ########### Updated Variable List ########### (13)
@@ -117,74 +117,74 @@ simulate(Tearing15); getErrorString();
 // 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
 // 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
 // 8: source:VARIABLE() .Tearing15, .Real type: Real
-// 9: $cse9:VARIABLE()  type: Real unreplaceable
-// 10: $cse8:VARIABLE()  type: Real unreplaceable
-// 11: $cse7:VARIABLE()  type: Real unreplaceable
-// 12: $cseb26:VARIABLE()  type: Real unreplaceable
-// 13: $cseb12:VARIABLE()  type: Real unreplaceable
+// 9: $cse7:VARIABLE()  type: Real unreplaceable
+// 10: $cse6:VARIABLE()  type: Real unreplaceable
+// 11: $cse5:VARIABLE()  type: Real unreplaceable
+// 12: $cseb17:VARIABLE()  type: Real unreplaceable
+// 13: $cseb3:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (13, 13)
 // ========================================
-// 1/1 (1): source = $cse7   [dynamic]
-// 2/2 (1): -4.0 + $cseb12 + v2 + source = 0.0   [dynamic]
-// 3/3 (1): 2.0 * $cseb12 + v2 + v7 + (-source) - v3 = 0.0   [dynamic]
-// 4/4 (1): 3.0 * $cseb12 + -7.0 * v2 + -2.0 * v3 + 3.0 * $cseb26 = 0.0   [dynamic]
-// 5/5 (1): $cseb12 + v2 + source + (-v3) * source - v7 = 0.0   [dynamic]
-// 6/6 (1): 2.0 + 3.0 * v2 + -0.5 * $cseb26 + (-v5) - v4 = 0.0   [dynamic]
-// 7/7 (1): v5 + v6 * $cse9 * source + v3 = 0.0   [dynamic]
-// 8/8 (1): 3.0 * v5 + (-v6) * $cse9 - source = 0.0   [dynamic]
-// 9/9 (1): $cse9 = sin(v6)   [binding]
-// 10/10 (1): $cse8 = sin(v1)   [binding]
-// 11/11 (1): $cse7 = sin(time)   [binding]
-// 12/12 (1): $cseb26 = source * v7   [binding]
-// 13/13 (1): $cseb12 = v1 * $cse8   [binding]
+// 1/1 (1): source = $cse5   [dynamic]
+// 2/2 (1): -4.0 + $cseb3 + v2 + source = 0.0   [dynamic]
+// 3/3 (1): 2.0 * $cseb3 + v2 + v7 + (-source) - v3 = 0.0   [dynamic]
+// 4/4 (1): 3.0 * $cseb3 + -7.0 * v2 + -2.0 * v3 + 3.0 * $cseb17 = 0.0   [dynamic]
+// 5/5 (1): $cseb3 + v2 + source + (-v3) * source - v7 = 0.0   [dynamic]
+// 6/6 (1): 2.0 + 3.0 * v2 + -0.5 * $cseb17 + (-v5) - v4 = 0.0   [dynamic]
+// 7/7 (1): v5 + v6 * $cse7 * source + v3 = 0.0   [dynamic]
+// 8/8 (1): 3.0 * v5 + (-v6) * $cse7 - source = 0.0   [dynamic]
+// 9/9 (1): $cse7 = sin(v6)   [binding]
+// 10/10 (1): $cse6 = sin(v1)   [binding]
+// 11/11 (1): $cse5 = sin(time)   [binding]
+// 12/12 (1): $cseb17 = source * v7   [binding]
+// 13/13 (1): $cseb3 = v1 * $cse6   [binding]
 //
 //
 // ########### Updated Variable List ########### (4)
 // ========================================
 // 1: $res2.$pDERLSJac2.dummyVarLSJac2:STATE_DER()  type: Real unreplaceable
 // 2: $res1.$pDERLSJac2.dummyVarLSJac2:STATE_DER()  type: Real unreplaceable
 // 3: v7.$pDERLSJac2.dummyVarLSJac2:VARIABLE()  type: Real
-// 4: $cseb26.$pDERLSJac2.dummyVarLSJac2:VARIABLE()  type: Real
+// 4: $cseb17.$pDERLSJac2.dummyVarLSJac2:VARIABLE()  type: Real
 //
 //
 // ########### Updated Equation List ########### (4, 4)
 // ========================================
 // 1/1 (1): v7.$pDERLSJac2.dummyVarLSJac2 - v3SeedLSJac2 - v2SeedLSJac2 = 0.0   [dynamic]
-// 2/2 (1): -10.0 * v2SeedLSJac2 + -2.0 * v3SeedLSJac2 + 3.0 * $cseb26.$pDERLSJac2.dummyVarLSJac2 = 0.0   [dynamic]
-// 3/3 (1): $res1.$pDERLSJac2.dummyVarLSJac2 = $cse7 * v7.$pDERLSJac2.dummyVarLSJac2 - $cseb26.$pDERLSJac2.dummyVarLSJac2   [binding]
-// 4/4 (1): $res2.$pDERLSJac2.dummyVarLSJac2 = (-v3SeedLSJac2) * $cse7 - v7.$pDERLSJac2.dummyVarLSJac2   [dynamic]
+// 2/2 (1): -10.0 * v2SeedLSJac2 + -2.0 * v3SeedLSJac2 + 3.0 * $cseb17.$pDERLSJac2.dummyVarLSJac2 = 0.0   [dynamic]
+// 3/3 (1): $res1.$pDERLSJac2.dummyVarLSJac2 = $cse5 * v7.$pDERLSJac2.dummyVarLSJac2 - $cseb17.$pDERLSJac2.dummyVarLSJac2   [binding]
+// 4/4 (1): $res2.$pDERLSJac2.dummyVarLSJac2 = (-v3SeedLSJac2) * $cse5 - v7.$pDERLSJac2.dummyVarLSJac2   [dynamic]
 //
 //
 // ########### Updated Variable List ########### (3)
 // ========================================
 // 1: $res1.$pDERNLSJac3.dummyVarNLSJac3:STATE_DER()  type: Real unreplaceable
-// 2: $cse8.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE()  type: Real
-// 3: $cse48:VARIABLE()  type: Real unreplaceable
+// 2: $cse6.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE()  type: Real
+// 3: $cse8:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (3, 3)
 // ========================================
-// 1/1 (1): $res1.$pDERNLSJac3.dummyVarNLSJac3 = v1 * $cse8.$pDERNLSJac3.dummyVarNLSJac3 + v1SeedNLSJac3 * $cse8   [binding]
-// 2/2 (1): $cse8.$pDERNLSJac3.dummyVarNLSJac3 = $cse48 * v1SeedNLSJac3   [binding]
-// 3/3 (1): $cse48 = cos(v1)   [binding]
+// 1/1 (1): $res1.$pDERNLSJac3.dummyVarNLSJac3 = v1 * $cse6.$pDERNLSJac3.dummyVarNLSJac3 + v1SeedNLSJac3 * $cse6   [binding]
+// 2/2 (1): $cse6.$pDERNLSJac3.dummyVarNLSJac3 = $cse8 * v1SeedNLSJac3   [binding]
+// 3/3 (1): $cse8 = cos(v1)   [binding]
 //
 //
 // ########### Updated Variable List ########### (4)
 // ========================================
 // 1: $res1.$pDERNLSJac4.dummyVarNLSJac4:STATE_DER()  type: Real unreplaceable
 // 2: v5.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE()  type: Real
-// 3: $cse9.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE()  type: Real
-// 4: $cse50:VARIABLE()  type: Real unreplaceable
+// 3: $cse7.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE()  type: Real
+// 4: $cse9:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (4, 4)
 // ========================================
-// 1/1 (1): $res1.$pDERNLSJac4.dummyVarNLSJac4 = v5.$pDERNLSJac4.dummyVarNLSJac4 + v6 * $cse9.$pDERNLSJac4.dummyVarNLSJac4 * $cse7 + v6SeedNLSJac4 * $cse9 * $cse7   [dynamic]
-// 2/2 (1): 3.0 * v5.$pDERNLSJac4.dummyVarNLSJac4 + (-v6) * $cse9.$pDERNLSJac4.dummyVarNLSJac4 - v6SeedNLSJac4 * $cse9 = 0.0   [dynamic]
-// 3/3 (1): $cse9.$pDERNLSJac4.dummyVarNLSJac4 = $cse50 * v6SeedNLSJac4   [binding]
-// 4/4 (1): $cse50 = cos(v6)   [binding]
+// 1/1 (1): $res1.$pDERNLSJac4.dummyVarNLSJac4 = v5.$pDERNLSJac4.dummyVarNLSJac4 + v6 * $cse7.$pDERNLSJac4.dummyVarNLSJac4 * $cse5 + v6SeedNLSJac4 * $cse7 * $cse5   [dynamic]
+// 2/2 (1): 3.0 * v5.$pDERNLSJac4.dummyVarNLSJac4 + (-v6) * $cse7.$pDERNLSJac4.dummyVarNLSJac4 - v6SeedNLSJac4 * $cse7 = 0.0   [dynamic]
+// 3/3 (1): $cse7.$pDERNLSJac4.dummyVarNLSJac4 = $cse9 * v6SeedNLSJac4   [binding]
+// 4/4 (1): $cse9 = cos(v6)   [binding]
 //
 // record SimulationResult
 //     resultFile = "Tearing15_res.mat",

diff --git a/simulation/modelica/commonSubExp/cse2.mos b/simulation/modelica/commonSubExp/cse2.mos
@@ -80,8 +80,8 @@ simulate(Tearing3); getErrorString();
 // 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
 // 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
 // 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
-// 16: $cse3:VARIABLE()  type: Real unreplaceable
-// 17: $cse2:VARIABLE()  type: Real unreplaceable
+// 16: $cse2:VARIABLE()  type: Real unreplaceable
+// 17: $cse1:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (17, 17)
@@ -94,15 +94,15 @@ simulate(Tearing3); getErrorString();
 // 6/6 (1): uL = L * $DER.iL   [dynamic]
 // 7/7 (1): $DER.uL = R2 * der(i2)   [dynamic]
 // 8/8 (1): $DER.u1 = R1 * $DER.i1   [dynamic]
-// 9/9 (1): $DER.u0 = $cse2   [dynamic]
-// 10/10 (1): u0 = $cse3   [dynamic]
+// 9/9 (1): $DER.u0 = $cse1   [dynamic]
+// 10/10 (1): u0 = $cse2   [dynamic]
 // 11/11 (1): u1 = R1 * i1   [dynamic]
 // 12/12 (1): uL = R2 * i2   [dynamic]
 // 13/13 (1): u0 = u1 + uL   [dynamic]
 // 14/14 (1): uC = u1 + uL   [dynamic]
 // 15/15 (1): i1 = i2 + iL   [dynamic]
-// 16/16 (1): $cse3 = sin(time)   [binding]
-// 17/17 (1): $cse2 = cos(time)   [binding]
+// 16/16 (1): $cse2 = sin(time)   [binding]
+// 17/17 (1): $cse1 = cos(time)   [binding]
 //
 //
 // ########### Updated Variable List ########### (19)
@@ -122,33 +122,33 @@ simulate(Tearing3); getErrorString();
 // 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
 // 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
 // 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
-// 16: $cse3:VARIABLE()  type: Real unreplaceable
-// 17: $cse2:VARIABLE()  type: Real unreplaceable
-// 18: $cseb13:VARIABLE()  type: Real unreplaceable
-// 19: $cseb6:VARIABLE()  type: Real unreplaceable
+// 16: $cse2:VARIABLE()  type: Real unreplaceable
+// 17: $cse1:VARIABLE()  type: Real unreplaceable
+// 18: $cseb10:VARIABLE()  type: Real unreplaceable
+// 19: $cseb3:VARIABLE()  type: Real unreplaceable
 //
 //
 // ########### Updated Equation List ########### (19, 19)
 // ========================================
 // 1/1 (1): $DER.i1 = der(i2) + $DER.iL   [dynamic]
 // 2/2 (1): i0 = i1 + iC   [dynamic]
-// 3/3 (1): $DER.uC = $cseb6   [dynamic]
-// 4/4 (1): $DER.u0 = $cseb6   [dynamic]
+// 3/3 (1): $DER.uC = $cseb3   [dynamic]
+// 4/4 (1): $DER.u0 = $cseb3   [dynamic]
 // 5/5 (1): iC = C * $DER.uC   [dynamic]
 // 6/6 (1): uL = L * $DER.iL   [dynamic]
 // 7/7 (1): $DER.uL = R2 * der(i2)   [dynamic]
 // 8/8 (1): $DER.u1 = R1 * $DER.i1   [dynamic]
-// 9/9 (1): $DER.u0 = $cse2   [dynamic]
-// 10/10 (1): u0 = $cse3   [dynamic]
+// 9/9 (1): $DER.u0 = $cse1   [dynamic]
+// 10/10 (1): u0 = $cse2   [dynamic]
 // 11/11 (1): u1 = R1 * i1   [dynamic]
 // 12/12 (1): uL = R2 * i2   [dynamic]
-// 13/13 (1): u0 = $cseb13   [dynamic]
-// 14/14 (1): uC = $cseb13   [dynamic]
+// 13/13 (1): u0 = $cseb10   [dynamic]
+// 14/14 (1): uC = $cseb10   [dynamic]
 // 15/15 (1): i1 = i2 + iL   [dynamic]
-// 16/16 (1): $cse3 = sin(time)   [binding]
-// 17/17 (1): $cse2 = cos(time)   [binding]
-// 18/18 (1): $cseb13 = u1 + uL   [binding]
-// 19/19 (1): $cseb6 = $DER.u1 + $DER.uL   [binding]
+// 16/16 (1): $cse2 = sin(time)   [binding]
+// 17/17 (1): $cse1 = cos(time)   [binding]
+// 18/18 (1): $cseb10 = u1 + uL   [binding]
+// 19/19 (1): $cseb3 = $DER.u1 + $DER.uL   [binding]
 //
 //
 // ########### Updated Variable List ########### (3)