Skip to content

Commit 9f36c1c

Browse files
author
Willi Braun
committed
fix daeMode testsuite
1 parent 7496b21 commit 9f36c1c

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

simulation/modelica/solver/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ problem2-lobatto6.mos \
2222
problem2-symEuler.mos \
2323
problem2-ida.mos \
2424
problem2-idaLinearSolver.mos \
25-
problem3-symEuler.mos
25+
problem3-symEuler.mos \
2626
testDAEp1.mos \
2727
testDAEp2.mos \
2828
testDAEp3.mos \

simulation/modelica/solver/testDAEp6.mos

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// name: testDAE.p5
1+
// name: testDAE.p6
22
// status: correct
33
// teardown_command: rm -f testDAE.p5* output.log
44

@@ -39,44 +39,38 @@ val(x[2],1.0);
3939
// true
4040
// ""
4141
// record SimulationResult
42-
// resultFile = "testDAE.p5_res.mat",
43-
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testDAE.p5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
42+
// resultFile = "testDAE.p6_res.mat",
43+
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testDAE.p6', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
4444
// messages = ""
4545
// end SimulationResult;
4646
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
4747
// "
4848
// 0.0
49-
// 1.0
50-
// -3.0
51-
// 0.2519655435313273
52-
// 0.7318517148672625
53-
// -3.0
49+
// 0.0
50+
// -1.0
51+
// 4.0
5452
// true
5553
// record SimulationResult
56-
// resultFile = "testDAE.p5_res.mat",
57-
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'ida', fileNamePrefix = 'testDAE.p5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-daeMode'",
54+
// resultFile = "testDAE.p6_res.mat",
55+
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'ida', fileNamePrefix = 'testDAE.p6', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-daeMode'",
5856
// messages = ""
5957
// end SimulationResult;
6058
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
6159
// "
6260
// 0.0
63-
// 1.0
64-
// -3.0
65-
// 0.2519641224122206
66-
// 0.7318508241807287
67-
// -3.0
61+
// 0.0
62+
// -1.0
63+
// 4.0
6864
// true
6965
// record SimulationResult
70-
// resultFile = "testDAE.p5_res.mat",
71-
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'ida', fileNamePrefix = 'testDAE.p5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-daeMode'",
66+
// resultFile = "testDAE.p6_res.mat",
67+
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'ida', fileNamePrefix = 'testDAE.p6', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-daeMode'",
7268
// messages = ""
7369
// end SimulationResult;
7470
// "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
7571
// "
7672
// 0.0
77-
// 1.0
78-
// -3.0
79-
// 0.2519641224122206
80-
// 0.7318508241807287
81-
// -3.0
73+
// 0.0
74+
// -1.0
75+
// 4.0
8276
// endResult

0 commit comments

Comments
 (0)