Skip to content

Commit

Permalink
update module wrapFunctionCalls
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel
lochel committed Apr 4, 2016
1 parent 3e08e7a commit 0989114
Show file tree
Hide file tree
Showing 22 changed files with 398 additions and 561 deletions.
94 changes: 45 additions & 49 deletions simulation/modelica/commonSubExp/cse1.mos
View file
Expand Up @@ -41,7 +41,7 @@ simulate(Tearing15); getErrorString();
// true
// ""
//
// ########### Updated Variable List ########### (6)
// ########### Updated Variable List (jacobian) ########### (6)
// ========================================
// 1: $res2.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
// 2: $res1.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
Expand All @@ -51,7 +51,7 @@ simulate(Tearing15); getErrorString();
// 6: $cse1:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (6, 6)
// ########### Updated Equation List (jacobian) ########### (6, 6)
// ========================================
// 1/1 (1): $res2.$pDERNLSJac0.dummyVarNLSJac0 = v1 * $cse1 * v1SeedNLSJac0 + v1SeedNLSJac0 * $cse2 + v2.$pDERNLSJac0.dummyVarNLSJac0 + (-v3.$pDERNLSJac0.dummyVarNLSJac0) * source - v7SeedNLSJac0 [dynamic]
// 2/2 (1): $res1.$pDERNLSJac0.dummyVarNLSJac0 = 3.0 * (v1 * $cse1 * v1SeedNLSJac0 + v1SeedNLSJac0 * $cse2) + -7.0 * v2.$pDERNLSJac0.dummyVarNLSJac0 + -2.0 * v3.$pDERNLSJac0.dummyVarNLSJac0 + 3.0 * source * v7SeedNLSJac0 [dynamic]
Expand All @@ -61,23 +61,23 @@ simulate(Tearing15); getErrorString();
// 6/6 (1): $cse1 = cos(v1) [binding]
//
//
// ########### Updated Variable List ########### (4)
// ########### Updated Variable List (jacobian) ########### (4)
// ========================================
// 1: $res1.$pDERNLSJac1.dummyVarNLSJac1:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE() type: Real
// 3: $cse4:VARIABLE() type: Real unreplaceable
// 4: $cse3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (4, 4)
// ########### Updated Equation List (jacobian) ########### (4, 4)
// ========================================
// 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)
// ########### Updated Variable List (simulation) ########### (10)
// ========================================
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
Expand All @@ -87,27 +87,25 @@ 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: $cse7:VARIABLE() type: Real unreplaceable
// 10: $cse6:VARIABLE() type: Real unreplaceable
// 11: $cse5:VARIABLE() type: Real unreplaceable
// 9: $cse6:VARIABLE() type: Real unreplaceable
// 10: $cse5:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (11, 11)
// ########### Updated Equation List (simulation) ########### (10, 10)
// ========================================
// 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]
// 1/1 (1): source = sin(time) [dynamic]
// 2/2 (1): -4.0 + v1 * $cse5 + v2 + source = 0.0 [dynamic]
// 3/3 (1): 2.0 * v1 * $cse5 + v2 + v7 + (-source) - v3 = 0.0 [dynamic]
// 4/4 (1): 3.0 * v1 * $cse5 + -7.0 * v2 + -2.0 * v3 + 3.0 * source * v7 = 0.0 [dynamic]
// 5/5 (1): v1 * $cse5 + 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 * $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]
// 7/7 (1): v5 + v6 * $cse6 * source + v3 = 0.0 [dynamic]
// 8/8 (1): 3.0 * v5 + (-v6) * $cse6 - source = 0.0 [dynamic]
// 9/9 (1): $cse6 = sin(v6) [binding]
// 10/10 (1): $cse5 = sin(v1) [binding]
//
//
// ########### Updated Variable List ########### (13)
// ########### Updated Variable List ########### (12)
// ========================================
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
Expand All @@ -117,58 +115,56 @@ 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: $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
// 9: $cse6:VARIABLE() type: Real unreplaceable
// 10: $cse5:VARIABLE() type: Real unreplaceable
// 11: $cseb17:VARIABLE() type: Real unreplaceable
// 12: $cseb3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (13, 13)
// ########### Updated Equation List ########### (12, 12)
// ========================================
// 1/1 (1): source = $cse5 [dynamic]
// 1/1 (1): source = sin(time) [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]
// 7/7 (1): v5 + v6 * $cse6 * source + v3 = 0.0 [dynamic]
// 8/8 (1): 3.0 * v5 + (-v6) * $cse6 - source = 0.0 [dynamic]
// 9/9 (1): $cse6 = sin(v6) [binding]
// 10/10 (1): $cse5 = sin(v1) [binding]
// 11/11 (1): $cseb17 = source * v7 [binding]
// 12/12 (1): $cseb3 = v1 * $cse5 [binding]
//
//
// ########### Updated Variable List ########### (3)
// ########### Updated Variable List (jacobian) ########### (3)
// ========================================
// 1: $res1.$pDERNLSJac3.dummyVarNLSJac3:STATE_DER() type: Real unreplaceable
// 2: $cse6.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real
// 3: $cse8:VARIABLE() type: Real unreplaceable
// 2: $cse5.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real
// 3: $cse7:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (3, 3)
// ########### Updated Equation List (jacobian) ########### (3, 3)
// ========================================
// 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]
// 1/1 (1): $res1.$pDERNLSJac3.dummyVarNLSJac3 = v1 * $cse5.$pDERNLSJac3.dummyVarNLSJac3 + v1SeedNLSJac3 * $cse5 [binding]
// 2/2 (1): $cse5.$pDERNLSJac3.dummyVarNLSJac3 = $cse7 * v1SeedNLSJac3 [binding]
// 3/3 (1): $cse7 = cos(v1) [binding]
//
//
// ########### Updated Variable List ########### (4)
// ########### Updated Variable List (jacobian) ########### (4)
// ========================================
// 1: $res1.$pDERNLSJac4.dummyVarNLSJac4:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 3: $cse7.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 4: $cse9:VARIABLE() type: Real unreplaceable
// 3: $cse6.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 4: $cse8:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (4, 4)
// ########### Updated Equation List (jacobian) ########### (4, 4)
// ========================================
// 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]
// 1/1 (1): $res1.$pDERNLSJac4.dummyVarNLSJac4 = 3.0 * v5.$pDERNLSJac4.dummyVarNLSJac4 + (-v6) * $cse6.$pDERNLSJac4.dummyVarNLSJac4 - v6SeedNLSJac4 * $cse6 [dynamic]
// 2/2 (1): v5.$pDERNLSJac4.dummyVarNLSJac4 + v6 * $cse6.$pDERNLSJac4.dummyVarNLSJac4 * source + v6SeedNLSJac4 * $cse6 * source = 0.0 [dynamic]
// 3/3 (1): $cse6.$pDERNLSJac4.dummyVarNLSJac4 = $cse8 * v6SeedNLSJac4 [binding]
// 4/4 (1): $cse8 = cos(v6) [binding]
//
// record SimulationResult
// resultFile = "Tearing15_res.mat",
Expand Down
58 changes: 6 additions & 52 deletions simulation/modelica/commonSubExp/cse2.mos
View file
Expand Up @@ -66,75 +66,29 @@ 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: $cse2:VARIABLE() type: Real unreplaceable
// 17: $cse1:VARIABLE() type: Real unreplaceable
// 16: $cseb10:VARIABLE() type: Real unreplaceable
// 17: $cseb3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (17, 17)
// ========================================
// 1/1 (1): $DER.i1 = der(i2) + $DER.iL [dynamic]
// 2/2 (1): i0 = i1 + iC [dynamic]
// 3/3 (1): $DER.uC = $DER.u1 + $DER.uL [dynamic]
// 4/4 (1): $DER.u0 = $DER.u1 + $DER.uL [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 = $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): $cse2 = sin(time) [binding]
// 17/17 (1): $cse1 = cos(time) [binding]
//
//
// ########### Updated Variable List ########### (19)
// ========================================
// 1: iC:VARIABLE() .Tearing3, .Real type: Real
// 2: iL:DUMMY_STATE() .Tearing3, .Real type: Real
// 3: i2:STATE(1)(start = 0.0 fixed = true ) .Tearing3, .Real type: Real
// 4: i1:DUMMY_STATE() .Tearing3, .Real type: Real
// 5: i0:VARIABLE() .Tearing3, .Real type: Real
// 6: uC:DUMMY_STATE() .Tearing3, .Real type: Real
// 7: uL:DUMMY_STATE() .Tearing3, .Real type: Real
// 8: u1:DUMMY_STATE() .Tearing3, .Real type: Real
// 9: u0:DUMMY_STATE() .Tearing3, .Real type: Real
// 10: $DER.uC:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 11: $DER.iL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 12: $DER.u0:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 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: $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 = $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 = $cse1 [dynamic]
// 10/10 (1): u0 = $cse2 [dynamic]
// 9/9 (1): $DER.u0 = cos(time) [dynamic]
// 10/10 (1): u0 = sin(time) [dynamic]
// 11/11 (1): u1 = R1 * i1 [dynamic]
// 12/12 (1): uL = R2 * i2 [dynamic]
// 13/13 (1): u0 = $cseb10 [dynamic]
// 14/14 (1): uC = $cseb10 [dynamic]
// 15/15 (1): i1 = i2 + iL [dynamic]
// 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]
// 16/16 (1): $cseb10 = u1 + uL [binding]
// 17/17 (1): $cseb3 = $DER.u1 + $DER.uL [binding]
//
// record SimulationResult
// resultFile = "Tearing3_res.mat",
Expand Down

0 comments on commit 0989114

Please sign in to comment.