expected output

OpenModelica · Oct 27, 2015 · 3976439 · 3976439
1 parent ca92c9c
commit 3976439
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/openmodelica/cruntime/simoptions/testOutputIntervalDASSLsteps.mos b/openmodelica/cruntime/simoptions/testOutputIntervalDASSLsteps.mos
@@ -53,25 +53,25 @@ readSimulationResultSize("testModel_res.mat");
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid'",
 //     messages = ""
 // end SimulationResult;
-// 223
+// 211
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -noEventEmit'",
 //     messages = ""
 // end SimulationResult;
-// 198
+// 186
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -maxStepSize=0.001'",
 //     messages = ""
 // end SimulationResult;
-// 2146
+// 2134
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -maxIntegrationOrder=1'",
 //     messages = ""
 // end SimulationResult;
-// 6703
+// 6691
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 0.4, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid'",
@@ -83,18 +83,18 @@ readSimulationResultSize("testModel_res.mat");
 //     simulationOptions = "startTime = 0.0, stopTime = 0.4, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -noEquidistantOutputFrequency=5'",
 //     messages = ""
 // end SimulationResult;
-// 7
+// 8
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 0.4, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -noEquidistantOutputTime=0.1'",
 //     messages = ""
 // end SimulationResult;
-// 6
+// 7
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 0.4, numberOfIntervals = 20, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -noEquidistantOutputTime=0.1 -noEquidistantOutputFrequency=2'",
 //     messages = "stdout            | warning | The flags are  \"noEquidistantOutputFrequency\" and \"noEquidistantOutputTime\" are in opposition to each other. The flag \"noEquidistantOutputFrequency\" superiors.
 // "
 // end SimulationResult;
-// 14
+// 15
 // endResult
diff --git a/openmodelica/cruntime/simoptions/testOutputIntervalDASSLstepsnoEquidistant.mos b/openmodelica/cruntime/simoptions/testOutputIntervalDASSLstepsnoEquidistant.mos
@@ -40,18 +40,18 @@ readSimulationResultSize("testModel_res.mat");
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -maxIntegrationOrder=1 -noEquidistantOutputFrequency=2'",
 //     messages = ""
 // end SimulationResult;
-// 218
+// 219
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -maxIntegrationOrder=1 -noEquidistantOutputTime=0.1'",
 //     messages = ""
 // end SimulationResult;
-// 52
+// 53
 // record SimulationResult
 //     resultFile = "testModel_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testModel', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-noEquidistantTimeGrid -maxIntegrationOrder=1 -noEquidistantOutputTime=0.1 -noEquidistantOutputFrequency=10'",
 //     messages = "stdout            | warning | The flags are  \"noEquidistantOutputFrequency\" and \"noEquidistantOutputTime\" are in opposition to each other. The flag \"noEquidistantOutputFrequency\" superiors.
 // "
 // end SimulationResult;
-// 46
+// 47
 // endResult
diff --git a/simulation/modelica/external_functions/ExternalRHSFlag.mos b/simulation/modelica/external_functions/ExternalRHSFlag.mos
@@ -35,6 +35,8 @@ getErrorString();
 // RHSFinlaFlag NOT set!
 // RHSFinlaFlag NOT set!
 // RHSFinlaFlag NOT set!
+// RHSFinlaFlag NOT set!
+// RHSFinlaFlag NOT set!
 // RHSFinlaFlag set!
 // RHSFinlaFlag NOT set!
 // RHSFinlaFlag set!
@@ -137,8 +139,7 @@ getErrorString();
 // RHSFinlaFlag set!
 // RHSFinlaFlag NOT set!
 // RHSFinlaFlag set!
-// RHSFinlaFlag NOT set!
-// RHSFinlaFlag NOT set!
+// RHSFinlaFlag set!
 // "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.