Skip to content

Commit 8a460b0

Browse files
kabdelhakadrpo
authored andcommitted
[testuite] fixup for clocked state report
1 parent 917cffa commit 8a460b0

File tree

118 files changed

+266
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+266
-30
lines changed

testsuite/openmodelica/debugDumps/libraryCoverageFlags.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ buildModel(Modelica.Utilities.Examples.readRealParameterModel); getErrorString()
2222
// * Number of states: 0 ()
2323
// * Number of discrete variables: 0 ()
2424
// * Number of discrete states: 0 ()
25+
// * Number of clocked states: 0 ()
2526
// * Top-level inputs: 0
2627
// Notification: Strong component statistics for initialization (0):
2728
// * Single equations (assignments): 0
@@ -38,6 +39,7 @@ buildModel(Modelica.Utilities.Examples.readRealParameterModel); getErrorString()
3839
// * Number of states: 0 ()
3940
// * Number of discrete variables: 0 ()
4041
// * Number of discrete states: 0 ()
42+
// * Number of clocked states: 0 ()
4143
// * Top-level inputs: 0
4244
// Notification: Strong component statistics for simulation (0):
4345
// * Single equations (assignments): 0

testsuite/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6.mos

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runScript(modelTesting);getErrorString();
3333
// Simulation options: startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6', options = '', outputFormat = 'mat', variableFilter = 'time|load.phi|load.w|filter.x.1.|filter.x.2.', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
3434
// Result file: Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_res.mat
3535
// Messages: LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
36-
// LOG_SUCCESS | info | The simulation finished successfully.
36+
// LOG_SUCCESS | info | The simulation finished successfully.
3737
//
3838
// Files Equal!
3939
// Notification: Model statistics after passing the front-end and creating the data structures used by the back-end:
@@ -44,6 +44,7 @@ runScript(modelTesting);getErrorString();
4444
// * Number of states: 0 ()
4545
// * Number of discrete variables: 390 ('-d=discreteinfo' for list of discrete vars)
4646
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
47+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
4748
// * Top-level inputs: 0
4849
// Notification: Strong component statistics for initialization (3205):
4950
// * Single equations (assignments): 3192
@@ -63,6 +64,7 @@ runScript(modelTesting);getErrorString();
6364
// * Number of states: 4 (load.phi,load.w,filter.x[1],filter.x[2])
6465
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
6566
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
67+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
6668
// * Top-level inputs: 0
6769
// Notification: Strong component statistics for simulation (1454):
6870
// * Single equations (assignments): 1441

testsuite/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ runScript(modelTesting);getErrorString();
4444
// * Number of states: 0 ()
4545
// * Number of discrete variables: 333 ('-d=discreteinfo' for list of discrete vars)
4646
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
47+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
4748
// * Top-level inputs: 0
4849
// Notification: Strong component statistics for initialization (2822):
4950
// * Single equations (assignments): 2815
@@ -63,6 +64,7 @@ runScript(modelTesting);getErrorString();
6364
// * Number of states: 4 (load.phi,load.w,filter.x[1],filter.x[2])
6465
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
6566
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
67+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
6668
// * Top-level inputs: 0
6769
// Notification: Strong component statistics for simulation (1343):
6870
// * Single equations (assignments): 1342

testsuite/simulation/modelica/inlineFunction/forceComplexEq.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ val(x2,{0,1});
4545
// * Number of states: 0 ('-d=stateselection' for list of states)
4646
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
4747
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
48+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
4849
// * Top-level inputs: 0
4950
// Notification: Strong component statistics for initialization (2):
5051
// * Single equations (assignments): 2
@@ -61,6 +62,7 @@ val(x2,{0,1});
6162
// * Number of states: 0 ('-d=stateselection' for list of states)
6263
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
6364
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
65+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
6466
// * Top-level inputs: 0
6567
// Notification: Strong component statistics for simulation (3):
6668
// * Single equations (assignments): 3

testsuite/simulation/modelica/inlineFunction/forceComplexEq2.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ val(x3,{0,1});
112112
// * Number of states: 0 ('-d=stateselection' for list of states)
113113
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
114114
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
115+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
115116
// * Top-level inputs: 0
116117
// Notification: Strong component statistics for initialization (1):
117118
// * Single equations (assignments): 0
@@ -131,6 +132,7 @@ val(x3,{0,1});
131132
// * Number of states: 0 ('-d=stateselection' for list of states)
132133
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
133134
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
135+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
134136
// * Top-level inputs: 0
135137
// Notification: Strong component statistics for simulation (3):
136138
// * Single equations (assignments): 2

testsuite/simulation/modelica/inlineFunction/forceComplexEq3.mos

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ val(x3,{0,1});
147147
// * Number of states: 0 ('-d=stateselection' for list of states)
148148
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
149149
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
150+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
150151
// * Top-level inputs: 0
151152
// Notification: Strong component statistics for initialization (1):
152153
// * Single equations (assignments): 0
@@ -166,6 +167,7 @@ val(x3,{0,1});
166167
// * Number of states: 0 ('-d=stateselection' for list of states)
167168
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
168169
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
170+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
169171
// * Top-level inputs: 0
170172
// Notification: Strong component statistics for simulation (3):
171173
// * Single equations (assignments): 2
@@ -181,7 +183,7 @@ val(x3,{0,1});
181183
// * Linear torn systems: 0
182184
// * Non-linear torn systems: 1 {2 10}
183185
// "
184-
// {0.07675361072940334,0.07423981665119772}
185-
// {-4.868670267709003,-4.868661846237771}
186+
// {0.07675361072940334,0.0742398166511995}
187+
// {-4.868670267709003,-4.868661846237769}
186188
// {-4.91813581765761,-4.914352494333452}
187189
// endResult

testsuite/simulation/modelica/inlineFunction/forceComplexEq4.mos

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ val(x3,{0,1});
115115
// * Number of states: 0 ('-d=stateselection' for list of states)
116116
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
117117
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
118+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
118119
// * Top-level inputs: 0
119120
// Notification: Strong component statistics for initialization (1):
120121
// * Single equations (assignments): 0
@@ -134,6 +135,7 @@ val(x3,{0,1});
134135
// * Number of states: 0 ('-d=stateselection' for list of states)
135136
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
136137
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
138+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
137139
// * Top-level inputs: 0
138140
// Notification: Strong component statistics for simulation (3):
139141
// * Single equations (assignments): 2
@@ -149,7 +151,7 @@ val(x3,{0,1});
149151
// * Linear torn systems: 0
150152
// * Non-linear torn systems: 1 {2 2}
151153
// "
152-
// {0.07675361072941356,0.07423981665119062}
153-
// {-4.868670267708994,-4.868661846237778}
154+
// {0.07675361072941356,0.07423981665119239}
155+
// {-4.868670267708994,-4.868661846237776}
154156
// {-4.918135817657611,-4.914352494333452}
155157
// endResult

testsuite/simulation/modelica/nonlinear_system/bug_3527.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ val(z,{0,1});
5252
// * Number of states: 0 ('-d=stateselection' for list of states)
5353
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5454
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
55+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
5556
// * Top-level inputs: 0
5657
// Notification: Strong component statistics for initialization (2):
5758
// * Single equations (assignments): 0
@@ -76,6 +77,7 @@ val(z,{0,1});
7677
// * Number of states: 0 ('-d=stateselection' for list of states)
7778
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
7879
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
80+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
7981
// * Top-level inputs: 0
8082
// Notification: Strong component statistics for simulation (5):
8183
// * Single equations (assignments): 3

testsuite/simulation/modelica/resolveLoops/Circuit1x.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ simulate(Circuit1x); getErrorString();
3131
// * Number of states: 0 ()
3232
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
3333
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
34+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
3435
// * Top-level inputs: 0
3536
// Notification: Strong component statistics for initialization (10):
3637
// * Single equations (assignments): 8
@@ -50,6 +51,7 @@ simulate(Circuit1x); getErrorString();
5051
// * Number of states: 1 (Cds.v)
5152
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5253
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
54+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
5355
// * Top-level inputs: 0
5456
// Notification: Strong component statistics for simulation (7):
5557
// * Single equations (assignments): 5

testsuite/simulation/modelica/resolveLoops/Circuit2x.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ simulate(Circuit2x); getErrorString();
3131
// * Number of states: 0 ()
3232
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
3333
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
34+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
3435
// * Top-level inputs: 0
3536
// Notification: Strong component statistics for initialization (10):
3637
// * Single equations (assignments): 8
@@ -50,6 +51,7 @@ simulate(Circuit2x); getErrorString();
5051
// * Number of states: 1 (Cgd.v)
5152
// * Number of discrete variables: 0 ('-d=discreteinfo' for list of discrete vars)
5253
// * Number of discrete states: 0 ('-d=discreteinfo' for list of discrete states)
54+
// * Number of clocked states: 0 ('-d=discreteinfo' for list of clocked states)
5355
// * Top-level inputs: 0
5456
// Notification: Strong component statistics for simulation (7):
5557
// * Single equations (assignments): 5

0 commit comments

Comments
 (0)