Expected output

OpenModelica · Jan 31, 2017 · 799f659 · 799f659
1 parent aac242c
commit 799f659
Show file tree

Hide file tree

Showing 15 changed files with 1,046 additions and 19 deletions.
diff --git a/openmodelica/debugDumps/lateInline.mos b/openmodelica/debugDumps/lateInline.mos
@@ -1235,6 +1235,104 @@ buildModel(testOptdaedump); getErrorString();
 //
 // pre-optimization done.
 //
+// ########################################
+// synchronousFeatures
+// ########################################
+//
+//
+// unspecified partition
+// ========================================
+//
+// Variables (2)
+// ========================================
+// 1: y:VARIABLE()  type: Real 
+// 2: x:VARIABLE()  type: Real 
+//
+//
+// Equations (2, 2)
+// ========================================
+// 1/1 (1): x = time ^ 3.0 + exp(time ^ 3.0)   [binding]
+// 2/2 (1): y = exp(time ^ 3.0) + x   [binding]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// State Sets
+// ========================================
+//
+//
+// Matching
+// ========================================
+// 2 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+//
+//
+// StrongComponents
+// ========================================
+// {1:2}
+// {2:1}
+//
+//
+//
+// BackendDAEType: simulation
+//
+//
+// Known variables only depending on parameters and constants - globalKnownVars (0)
+// ========================================
+//
+//
+// Known variables only depending on states and inputs - localKnownVars (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (0)
+// ========================================
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
+//
+//
 // created initial system:
 //
 //

diff --git a/openmodelica/debugDumps/optSimpleSolveDAEdump.mos b/openmodelica/debugDumps/optSimpleSolveDAEdump.mos
@@ -118,6 +118,108 @@ buildModel(testOptdaedump); getErrorString();
 //
 // pre-optimization done.
 //
+// ########################################
+// synchronousFeatures
+// ########################################
+//
+//
+// unknown partition
+// ========================================
+//
+// Variables (3)
+// ========================================
+// 1: z:VARIABLE()  type: Real 
+// 2: y:VARIABLE()  type: Real 
+// 3: x:VARIABLE()  type: Real 
+//
+//
+// Equations (3, 3)
+// ========================================
+// 1/1 (1): tanh(x) = 0.9 * sin(10.0 * time)   [dynamic]
+// 2/2 (1): (y ^ 3.0 + x ^ 3.0) ^ 2.0 = 0.0   [dynamic]
+// 3/3 (1): if noEvent(x > 0.0) then 1.0 + 3.0 * z else 2.0 + 5.0 * z = y   [dynamic]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// State Sets
+// ========================================
+//
+//
+// Matching
+// ========================================
+// 3 variables and equations
+// var 1 is solved in eqn 3
+// var 2 is solved in eqn 2
+// var 3 is solved in eqn 1
+//
+//
+// StrongComponents
+// ========================================
+// {1:3}
+// {2:2}
+// {3:1}
+//
+//
+//
+// BackendDAEType: simulation
+//
+//
+// Known variables only depending on parameters and constants - globalKnownVars (0)
+// ========================================
+//
+//
+// Known variables only depending on states and inputs - localKnownVars (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (0)
+// ========================================
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
+//
+//
 // created initial system:
 //
 //

diff --git a/openmodelica/debugDumps/optdaedump.mos b/openmodelica/debugDumps/optdaedump.mos
@@ -1646,6 +1646,138 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Index reduction done.
 //
+// ########################################
+// synchronousFeatures
+// ########################################
+//
+//
+// unspecified partition
+// ========================================
+//
+// Variables (9)
+// ========================================
+// 1: iC:VARIABLE()  type: Real 
+// 2: iL:STATE(1)()  type: Real 
+// 3: i2:VARIABLE()  type: Real 
+// 4: i1:VARIABLE()  type: Real 
+// 5: i0:VARIABLE()  type: Real 
+// 6: uC:DUMMY_STATE()  type: Real 
+// 7: uL:VARIABLE()  type: Real 
+// 8: u1:VARIABLE()  type: Real 
+// 9: $DER.uC:DUMMY_DER(fixed = false )  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]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// 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, 4, 3:8, 7, 3, 4} Size: 4 Jacobian Linear
+// {5:2}
+// {1:9}
+// {6:1}
+// {7:5}
+//
+//
+//
+// BackendDAEType: simulation
+//
+//
+// Known variables only depending on parameters and constants - globalKnownVars (5)
+// ========================================
+// 1: v0:VARIABLE()  = 0.0  type: Real 
+// 2: R1:PARAM()  = 1.0  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: L:PARAM()  = 0.5  type: Real 
+// 5: C:PARAM()  = 3.0  type: Real 
+//
+//
+// Known variables only depending on states and inputs - localKnownVars (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (4)
+// ========================================
+// 1: u0:VARIABLE()  = uC  type: Real 
+// 2: u2:VARIABLE()  = uL  type: Real 
+// 3: v1:VARIABLE()  = uC  type: Real 
+// 4: v2:VARIABLE()  = uL  type: Real 
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
+//
+//
 // created initial system:
 //
 //

diff --git a/simulation/modelica/statemachines/ConferenceTut1.mos b/simulation/modelica/statemachines/ConferenceTut1.mos
@@ -12,5 +12,5 @@ val(i,30.0);
 // Result:
 // true
 // true
-// 5
+// 5.0
 // endResult
diff --git a/simulation/modelica/statemachines/MLS33_17_3_7NA.mos b/simulation/modelica/statemachines/MLS33_17_3_7NA.mos
@@ -13,4 +13,4 @@ val(v,30.0);
 // true
 // true
 // 18.0
-// endResult
+// endResult
diff --git a/simulation/modelica/statemachines/Maraninchi2003_2.mos b/simulation/modelica/statemachines/Maraninchi2003_2.mos
@@ -14,7 +14,7 @@ val(z,20.0);
 // Result:
 // true
 // true
-// 21
-// 1
-// 101
+// 21.0
+// 1.0
+// 101.0
 // endResult
diff --git a/simulation/modelica/statemachines/SingleState.mos b/simulation/modelica/statemachines/SingleState.mos
@@ -10,7 +10,7 @@ simulate(SingleState, startTime=0, stopTime=2, numberOfIntervals=0); getErrorStr
 // true
 // record SimulationResult
 //     resultFile = "SingleState_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 0, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'DeadEnd', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 0, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'SingleState', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set +d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("+d=initialization").