Skip to content

Commit 17af9c5

Browse files
sjoelundOpenModelica-Hudson
sjoelund
authored and
OpenModelica-Hudson
committed
Expected output
1 parent 523e2af commit 17af9c5

File tree

8 files changed

+3053
-2695
lines changed

8 files changed

+3053
-2695
lines changed

‎openmodelica/xml/XmlDumpComment.mos‎

Lines changed: 3008 additions & 2654 deletions
Large diffs are not rendered by default.

‎simulation/modelica/hpcom/Modelica.Mechanics.MultiBody.Examples.Elementary.ThreeSprings.mos‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ res := OpenModelica.Scripting.compareSimulationResults("Modelica.Mechanics.Multi
5454
// "
5555
// end SimulationResult;
5656
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
57+
// [BackEnd/HpcOmTaskGraph.mo:0:0-0:0:writable] Error: Internal error HpcOmTaskGraph.getNodeForVarIdx failed (there is a loop somewhere)
5758
// "
5859
// {"Files Equal!"}
5960
// endResult

‎simulation/modelica/parameters/Engine1a_output.mos‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ simulate(Engine1a_output); getErrorString();
1818
// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Engine1a_output', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
1919
// messages = ""
2020
// end SimulationResult;
21-
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
21+
// "Notification: No output variables in this system (2/4)
22+
// Notification: No output variables in this system (3/4)
23+
// Notification: No output variables in this system (4/4)
24+
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
2225
// "
2326
// endResult

‎simulation/modelica/resolveLoops/NPendulum2.mos‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum2_res.m
3131
// * Number of equations: 1228
3232
// * Number of variables: 1228
3333
// Notification: Model statistics after passing the back-end for initialization:
34-
// * Number of independent subsystems: 565
34+
// * Number of independent subsystems: 526
3535
// * Number of states: 0 ('-d=stateselection' for list of states)
3636
// * Number of discrete variables: 27 ('-d=discreteinfo' for list of discrete vars)
3737
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
3838
// * Top-level inputs: 0
39-
// Notification: Strong component statistics for initialization (667):
40-
// * Single equations (assignments): 666
41-
// * Array equations: 0
39+
// Notification: Strong component statistics for initialization (656):
40+
// * Single equations (assignments): 652
41+
// * Array equations: 3
4242
// * Algorithm blocks: 0
4343
// * Record equations: 0
4444
// * When equations: 0
@@ -50,14 +50,14 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum2_res.m
5050
// * Linear torn systems: 1 {(4,87.5%) 34}
5151
// * Non-linear torn systems: 0
5252
// Notification: Model statistics after passing the back-end for simulation:
53-
// * Number of independent subsystems: 1
53+
// * Number of independent subsystems: 4
5454
// * Number of states: 4 ('-d=stateselection' for list of states)
5555
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5656
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
5757
// * Top-level inputs: 0
58-
// Notification: Strong component statistics for simulation (103):
59-
// * Single equations (assignments): 102
60-
// * Array equations: 0
58+
// Notification: Strong component statistics for simulation (133):
59+
// * Single equations (assignments): 129
60+
// * Array equations: 3
6161
// * Algorithm blocks: 0
6262
// * Record equations: 0
6363
// * When equations: 0

‎simulation/modelica/resolveLoops/NPendulum3.mos‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum3_res.m
3434
// * Number of equations: 1495
3535
// * Number of variables: 1495
3636
// Notification: Model statistics after passing the back-end for initialization:
37-
// * Number of independent subsystems: 607
37+
// * Number of independent subsystems: 568
3838
// * Number of states: 0 ('-d=stateselection' for list of states)
3939
// * Number of discrete variables: 36 ('-d=discreteinfo' for list of discrete vars)
4040
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
4141
// * Top-level inputs: 0
42-
// Notification: Strong component statistics for initialization (761):
43-
// * Single equations (assignments): 760
44-
// * Array equations: 0
42+
// Notification: Strong component statistics for initialization (750):
43+
// * Single equations (assignments): 746
44+
// * Array equations: 3
4545
// * Algorithm blocks: 0
4646
// * Record equations: 0
4747
// * When equations: 0
@@ -53,14 +53,14 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum3_res.m
5353
// * Linear torn systems: 1 {(8,73.4%) 60}
5454
// * Non-linear torn systems: 0
5555
// Notification: Model statistics after passing the back-end for simulation:
56-
// * Number of independent subsystems: 1
56+
// * Number of independent subsystems: 4
5757
// * Number of states: 6 ('-d=stateselection' for list of states)
5858
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5959
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
6060
// * Top-level inputs: 0
61-
// Notification: Strong component statistics for simulation (155):
62-
// * Single equations (assignments): 154
63-
// * Array equations: 0
61+
// Notification: Strong component statistics for simulation (185):
62+
// * Single equations (assignments): 181
63+
// * Array equations: 3
6464
// * Algorithm blocks: 0
6565
// * Record equations: 0
6666
// * When equations: 0

‎simulation/modelica/tearing/Tearing12-cel.mos‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ simulate(Tearing12); getErrorString();
3434
// * Number of equations: 9901
3535
// * Number of variables: 9901
3636
// Notification: Model statistics after passing the back-end for initialization:
37-
// * Number of independent subsystems: 2031
37+
// * Number of independent subsystems: 1992
3838
// * Number of states: 0 ('-d=stateselection' for list of states)
3939
// * Number of discrete variables: 288 ('-d=discreteinfo' for list of discrete vars)
4040
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
4141
// * Top-level inputs: 0
42-
// Notification: Strong component statistics for initialization (3896):
43-
// * Single equations (assignments): 3895
44-
// * Array equations: 0
42+
// Notification: Strong component statistics for initialization (3885):
43+
// * Single equations (assignments): 3881
44+
// * Array equations: 3
4545
// * Algorithm blocks: 0
4646
// * Record equations: 0
4747
// * When equations: 0
@@ -53,14 +53,14 @@ simulate(Tearing12); getErrorString();
5353
// * Linear torn systems: 1 {(60,77.4%) 848}
5454
// * Non-linear torn systems: 0
5555
// Notification: Model statistics after passing the back-end for simulation:
56-
// * Number of independent subsystems: 1
56+
// * Number of independent subsystems: 4
5757
// * Number of states: 62 ('-d=stateselection' for list of states)
5858
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5959
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
6060
// * Top-level inputs: 0
61-
// Notification: Strong component statistics for simulation (1864):
62-
// * Single equations (assignments): 1863
63-
// * Array equations: 0
61+
// Notification: Strong component statistics for simulation (1894):
62+
// * Single equations (assignments): 1890
63+
// * Array equations: 3
6464
// * Algorithm blocks: 0
6565
// * Record equations: 0
6666
// * When equations: 0

‎simulation/modelica/tearing/Tearing12-celMC3.mos‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ simulate(Tearing12); getErrorString();
3434
// * Number of equations: 9901
3535
// * Number of variables: 9901
3636
// Notification: Model statistics after passing the back-end for initialization:
37-
// * Number of independent subsystems: 2031
37+
// * Number of independent subsystems: 1992
3838
// * Number of states: 0 ('-d=stateselection' for list of states)
3939
// * Number of discrete variables: 288 ('-d=discreteinfo' for list of discrete vars)
4040
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
4141
// * Top-level inputs: 0
42-
// Notification: Strong component statistics for initialization (3896):
43-
// * Single equations (assignments): 3895
44-
// * Array equations: 0
42+
// Notification: Strong component statistics for initialization (3885):
43+
// * Single equations (assignments): 3881
44+
// * Array equations: 3
4545
// * Algorithm blocks: 0
4646
// * Record equations: 0
4747
// * When equations: 0
@@ -53,14 +53,14 @@ simulate(Tearing12); getErrorString();
5353
// * Linear torn systems: 1 {(53,79.6%) 855}
5454
// * Non-linear torn systems: 0
5555
// Notification: Model statistics after passing the back-end for simulation:
56-
// * Number of independent subsystems: 1
56+
// * Number of independent subsystems: 4
5757
// * Number of states: 62 ('-d=stateselection' for list of states)
5858
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5959
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
6060
// * Top-level inputs: 0
61-
// Notification: Strong component statistics for simulation (1864):
62-
// * Single equations (assignments): 1863
63-
// * Array equations: 0
61+
// Notification: Strong component statistics for simulation (1894):
62+
// * Single equations (assignments): 1890
63+
// * Array equations: 3
6464
// * Algorithm blocks: 0
6565
// * Record equations: 0
6666
// * When equations: 0

‎simulation/modelica/tearing/Tearing12-omc.mos‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ simulate(Tearing12); getErrorString();
3232
// * Number of equations: 9901
3333
// * Number of variables: 9901
3434
// Notification: Model statistics after passing the back-end for initialization:
35-
// * Number of independent subsystems: 2031
35+
// * Number of independent subsystems: 1992
3636
// * Number of states: 0 ('-d=stateselection' for list of states)
3737
// * Number of discrete variables: 288 ('-d=discreteinfo' for list of discrete vars)
3838
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
3939
// * Top-level inputs: 0
40-
// Notification: Strong component statistics for initialization (3896):
41-
// * Single equations (assignments): 3895
42-
// * Array equations: 0
40+
// Notification: Strong component statistics for initialization (3885):
41+
// * Single equations (assignments): 3881
42+
// * Array equations: 3
4343
// * Algorithm blocks: 0
4444
// * Record equations: 0
4545
// * When equations: 0
@@ -51,14 +51,14 @@ simulate(Tearing12); getErrorString();
5151
// * Linear torn systems: 1 {(74,72.1%) 834}
5252
// * Non-linear torn systems: 0
5353
// Notification: Model statistics after passing the back-end for simulation:
54-
// * Number of independent subsystems: 1
54+
// * Number of independent subsystems: 4
5555
// * Number of states: 62 ('-d=stateselection' for list of states)
5656
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5757
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
5858
// * Top-level inputs: 0
59-
// Notification: Strong component statistics for simulation (1864):
60-
// * Single equations (assignments): 1863
61-
// * Array equations: 0
59+
// Notification: Strong component statistics for simulation (1894):
60+
// * Single equations (assignments): 1890
61+
// * Array equations: 3
6262
// * Algorithm blocks: 0
6363
// * Record equations: 0
6464
// * When equations: 0

0 commit comments

Comments
 (0)