Skip to content

Commit

Permalink
update expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
@OpenModelica-Hudson
vruge authored and OpenModelica-Hudson committed Jun 30, 2015
1 parent c52d337 commit 9db0174
Show file tree
Hide file tree
Showing 4 changed files with 223 additions and 18 deletions.
87 changes: 87 additions & 0 deletions openmodelica/debugDumps/lateInline.mos
View file
Expand Up @@ -2646,6 +2646,93 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
//
//
// post-optimization module recursiveTearing:
//
//
// unspecified partition
// ========================================
//
// Variables (3)
// ========================================
// 1: y:VARIABLE() .testOptdaedump, .Real type: Real []
// 2: x:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: $cse1:VARIABLE() type: Real []
//
//
// Equations (3, 3)
// ========================================
// 1/1 (1): x = time ^ 3.0 + $cse1 [binding]
// 2/2 (1): y = $cse1 + x [binding]
// 3/3 (1): $cse1 = exp(time ^ 3.0) [binding]
//
//
// State Sets
// ========================================
//
//
// Matching
// ========================================
// 3 variables and equations
// var 1 is solved in eqn 2
// var 2 is solved in eqn 1
// var 3 is solved in eqn 3
//
//
// StrongComponents
// ========================================
// {3:3}
// {1:2}
// {2:1}
//
//
//
// BackendDAEType: simulation
//
//
// Known Variables (constants) (0)
// ========================================
//
//
// External Objects (0)
// ========================================
//
//
// Classes of External Objects (0)
// ========================================
//
//
// Alias Variables (0)
// ========================================
//
//
// Simple Equations (0, 0)
// ========================================
//
//
// Initial Equations (0, 0)
// ========================================
//
//
// Zero Crossings (0)
// ========================================
//
//
// Relations (0)
// ========================================
//
//
// Time Events (0)
// ========================================
//
//
// When Clauses (0)
// ========================================
//
//
// Constraints (0)
// ========================================
//
//
// post-optimization module partlintornsystem:
//
//
Expand Down
118 changes: 118 additions & 0 deletions openmodelica/debugDumps/optdaedump.mos
View file
Expand Up @@ -3617,6 +3617,124 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
//
//
// post-optimization module recursiveTearing:
//
//
// unspecified partition
// ========================================
//
// Variables (9)
// ========================================
// 1: iC:VARIABLE() .testOptdaedump, .Real type: Real []
// 2: iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 3: i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: i1:VARIABLE() .testOptdaedump, .Real type: Real []
// 5: i0:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 7: uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 8: u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 9: $DER.uC:DUMMY_DER(fixed = false ) .testOptdaedump, .Real type: Real []
//
//
// Equations (9, 9)
// ========================================
// 1/1 (1): $DER.uC = -sin(time) [dynamic]
// 2/2 (1): u1 = R1 * i1 [dynamic]
// 3/3 (1): u1 = uC - uL [dynamic]
// 4/4 (1): uL = R2 * i2 [dynamic]
// 5/5 (1): uL = L * der(iL) [dynamic]
// 6/6 (1): iC = C * $DER.uC [dynamic]
// 7/7 (1): i0 = i1 + iC [dynamic]
// 8/8 (1): i1 = i2 + iL [dynamic]
// 9/9 (1): uC = cos(time) [dynamic]
//
//
// State Sets
// ========================================
//
//
// Matching
// ========================================
// 9 variables and equations
// var 1 is solved in eqn 6
// var 2 is solved in eqn 5
// var 3 is solved in eqn 8
// var 4 is solved in eqn 2
// var 5 is solved in eqn 7
// var 6 is solved in eqn 9
// var 7 is solved in eqn 4
// var 8 is solved in eqn 3
// var 9 is solved in eqn 1
//
//
// StrongComponents
// ========================================
// {9:6}
// {{{2:8}, {8:3}, {3:7}}
// ,{4:4}} Size: 1 linear
// {5:2}
// {1:9}
// {6:1}
// {7:5}
//
//
//
// BackendDAEType: simulation
//
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
// ========================================
//
//
// Classes of External Objects (0)
// ========================================
//
//
// Alias Variables (4)
// ========================================
// 1: u0:VARIABLE() = uC .testOptdaedump, .Real type: Real []
// 2: u2:VARIABLE() = uL .testOptdaedump, .Real type: Real []
// 3: v1:VARIABLE() = uC .testOptdaedump, .Real type: Real []
// 4: v2:VARIABLE() = uL .testOptdaedump, .Real type: Real []
//
//
// Simple Equations (0, 0)
// ========================================
//
//
// Initial Equations (0, 0)
// ========================================
//
//
// Zero Crossings (0)
// ========================================
//
//
// Relations (0)
// ========================================
//
//
// Time Events (0)
// ========================================
//
//
// When Clauses (0)
// ========================================
//
//
// Constraints (0)
// ========================================
//
//
// post-optimization module partlintornsystem:
//
//
Expand Down
14 changes: 7 additions & 7 deletions simulation/modelica/linear_system/problem2.mos
View file
Expand Up @@ -118,9 +118,9 @@ val(i2, 1.0);
// messages = ""
// end SimulationResult;
// ""
// 0.0
// 8.881784197001252e-16
// 2.804903282692988
// 0.0
// 8.881784197001253e-17
// 0.2804903282692989
// true
// record SimulationResult
Expand All @@ -129,27 +129,27 @@ val(i2, 1.0);
// messages = ""
// end SimulationResult;
// ""
// -0.0
// 2.804903282692988
// 0.0
// 2.804903282692988
// -0.0
// 0.2804903282692989
// record SimulationResult
// resultFile = "linear_system.problem2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'linear_system.problem2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-ls lapack'",
// messages = ""
// end SimulationResult;
// ""
// -0.0
// 2.804903282692988
// 0.0
// 2.804903282692988
// -0.0
// 0.2804903282692989
// record SimulationResult
// resultFile = "linear_system.problem2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'linear_system.problem2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-ls umfpack'",
// messages = ""
// end SimulationResult;
// ""
// -0.0
// 0.0
// 2.804903282692989
// 0.0
// 0.2804903282692989
Expand Down
22 changes: 11 additions & 11 deletions simulation/modelica/nonlinear_system/problem11.mos
View file
Expand Up @@ -50,13 +50,13 @@ val(x[1],{0.0, 0.5, 1.0, 1.5, 5});
// ------------
// update eqn[2]
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time)) --old--
// => - b * (cos(time) + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
// => b * (cos(time) + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
// update eqn[3]
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0 --old--
// => - x[1] - b * x[2] ^ 2.0 * (1.0 + a) = ((-b) - a) * b --new--
// => x[1] - b * x[2] ^ 2.0 * (1.0 + a) = ((-b) - a) * b --new--
// update eqn[4]
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b --old--
// => - (a ^ 2.0 + b ^ 2.0) * x[2] + ((-a ^ 2.0) - b ^ 2.0) * x[1] - x[3] = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a --new--
// => (a ^ 2.0 + b ^ 2.0) * x[2] + ((-a ^ 2.0) - b ^ 2.0) * x[1] - x[3] = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a --new--
// END: simplifyLoops
// record SimulationResult
// resultFile = "nonlinear_system.problem11_res.mat",
Expand All @@ -76,18 +76,18 @@ val(x[1],{0.0, 0.5, 1.0, 1.5, 5});
// ------------
// update eqn[2]
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time)) --old--
// __OMC__1$LOOPT = cos(time) -- new--
// => - b * (__OMC__1$LOOPT + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
// __OMC__1$LOOPT = cos(time) -- new eqn--
// => b * (__OMC__1$LOOPT + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
// update eqn[3]
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0 --old--
// __OMC__2$LOOPT = ((-b) - a) * b -- new--
// => - x[1] - b * x[2] ^ 2.0 * (1.0 + a) = __OMC__2$LOOPT --new--
// __OMC__2$LOOPT = ((-b) - a) * b -- new eqn--
// => x[1] - b * x[2] ^ 2.0 * (1.0 + a) = __OMC__2$LOOPT --new--
// update eqn[4]
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b --old--
// __OMC__3$LOOPT = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a -- new--
// __OMC__4$LOOPF = (-a ^ 2.0) - b ^ 2.0 -- new--
// __OMC__5$LOOPF = a ^ 2.0 + b ^ 2.0 -- new--
// => - __OMC__5$LOOPF * x[2] + __OMC__4$LOOPF * x[1] - x[3] = __OMC__3$LOOPT --new--
// __OMC__3$LOOPT = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a -- new eqn--
// __OMC__4$LOOPF = (-a ^ 2.0) - b ^ 2.0 -- new eqn--
// __OMC__5$LOOPF = a ^ 2.0 + b ^ 2.0 -- new eqn--
// => __OMC__5$LOOPF * x[2] + __OMC__4$LOOPF * x[1] - x[3] = __OMC__3$LOOPT --new--
// END: simplifyLoops
// record SimulationResult
// resultFile = "nonlinear_system.problem11_res.mat",
Expand Down

0 comments on commit 9db0174

Please sign in to comment.