Update tests.

Belonging to [master]: - OpenModelica/OMCompiler#2663 - OpenModelica/OpenModelica-testsuite#1035
OpenModelica · Sep 17, 2018 · 629c139 · 629c139
1 parent 66e7ec8
commit 629c139
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/openmodelica/cruntime/optimization/basic/CC.mos b/openmodelica/cruntime/optimization/basic/CC.mos
@@ -18,7 +18,7 @@ end CheckConstraintViolation;
 getErrorString();
 
 echo(false);
-res := optimize(CheckConstraintViolation,numberOfIntervalls=200, tolerance = 1e-12, simflags="-lv LOG_IPOPT -ipopt_max_iter 2");
+res := optimize(CheckConstraintViolation,numberOfIntervals=200, tolerance = 1e-12, simflags="-lv LOG_IPOPT -ipopt_max_iter 2");
 messages:=res.messages;
 
 echo(true);

diff --git a/openmodelica/cruntime/sensitivities/testVanDerPol.mos b/openmodelica/cruntime/sensitivities/testVanDerPol.mos
@@ -14,7 +14,7 @@ end VanDerPol;
 getErrorString();
 
 setCommandLineOptions("+calculateSensitivities");
-simulate(VanDerPol, stopTime=20, numberOfintervals=2000, simflags="-s ida -idaSensitivity");
+simulate(VanDerPol, stopTime=20, numberOfIntervals=2000, simflags="-s ida -idaSensitivity");
 getErrorString();
 
 
@@ -24,7 +24,7 @@ getErrorString();
 // true
 // record SimulationResult
 //     resultFile = "VanDerPol_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'VanDerPol', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-s ida -idaSensitivity'",
+//     simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 2000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'VanDerPol', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-s ida -idaSensitivity'",
 //     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

diff --git a/...PlanarMechanics/PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection.mos b/...PlanarMechanics/PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection.mos
@@ -13,7 +13,7 @@ loadFile("PlanarMechanicsForTesting.mo"); getErrorString();
 setMatchingAlgorithm("PFPlus");
 setIndexReductionMethod("dynamicStateSelection");
 // adrpo: stopTime=3 is got from the experiment annotation in the model
-simulate(PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection,stopTime=0.000001,steps=2); getErrorString();
+simulate(PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection,stopTime=0.000001,numberOfIntervals=2); getErrorString();
 
 res := OpenModelica.Scripting.compareSimulationResults("PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/PlanarMechanics//PistonEngine.mat","PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection_diff.csv",0.01,0.001,
@@ -28,7 +28,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PlanarMechanicsForTestin
 // true
 // record SimulationResult
 //     resultFile = "PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 1e-06, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 1e-06, numberOfIntervals = 2, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PlanarMechanicsForTesting.Examples.PistonEngine_DynamicStateSelection', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

diff --git a/simulation/modelica/arrays/PolynomialEvaluatorA.mos b/simulation/modelica/arrays/PolynomialEvaluatorA.mos
@@ -6,7 +6,7 @@
 // Drmodelica: 8.2 Polynomial Evaluator (p. 242)
 //
 loadFile("PolynomialEvaluatorA.mo");
-simulate(PolyEvaluate1,startTime=0.0, stopTime=10.0, numberOfIntervalls = 100, tolerance=1e-5); // 2 intervals == 3 values
+simulate(PolyEvaluate1,startTime=0.0, stopTime=10.0, numberOfIntervals = 100, tolerance=1e-5); // 2 intervals == 3 values
 echo(false); // turns of output  
 p1:=val(p,3.0);
 p2:=val(p,5.0);
@@ -27,7 +27,7 @@ p3/1000.0;
 // true
 // record SimulationResult
 //     resultFile = "PolyEvaluate1_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'PolyEvaluate1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 100, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'PolyEvaluate1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

diff --git a/simulation/modelica/arrays/PolynomialEvaluatorB.mos b/simulation/modelica/arrays/PolynomialEvaluatorB.mos
@@ -6,7 +6,7 @@
 // Drmodelica: 8.2 Polynomial Evaluator (p. 242)
 //
 loadFile("PolynomialEvaluatorB.mo");
-simulate(PolyEvaluate2,startTime=0.0, stopTime=10.0, numberOfIntervalls = 100, tolerance=1e-5); // 2 intervals == 3 values
+simulate(PolyEvaluate2,startTime=0.0, stopTime=10.0, numberOfIntervals = 100, tolerance=1e-5); // 2 intervals == 3 values
 echo(false); // turns of output 
 p1:=val(p,3.0);
 p2:=val(p,5.0);
@@ -27,7 +27,7 @@ p3/1000.0;
 // true
 // record SimulationResult
 //     resultFile = "PolyEvaluate2_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'PolyEvaluate2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 100, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'PolyEvaluate2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

diff --git a/simulation/modelica/functions_eval/Inverter2.mos b/simulation/modelica/functions_eval/Inverter2.mos
@@ -6,7 +6,7 @@
 
 loadModel(Modelica,{"3.2.1"}); getErrorString();
 loadFile("Inverter2.mo"); getErrorString();
-simulate(Inverter2, stopTime=1e-11,numberOfIntervalls=2000);getErrorString();
+simulate(Inverter2, stopTime=1e-11,numberOfIntervals=2000);getErrorString();
 res := OpenModelica.Scripting.compareSimulationResults("Inverter2_res.mat",
   "ReferenceFiles/Inverter2.mat",
   "Inverter2_diff.csv", 0.01, 0.0001,

diff --git a/simulation/modelica/nonlinear_system/problem8_newton.mos b/simulation/modelica/nonlinear_system/problem8_newton.mos
@@ -3,7 +3,7 @@
 // teardown_command: rm -f nonlinear_system.problem8* _nonlinear_system.problem8* output.log
 
 loadFile("nlsTestPackage.mo"); getErrorString();
-simulate(nonlinear_system.problem8, stopTime=100, solver="dassl", simflags="-nls=newton", tolerance=0.5e-7); getErrorString();
+simulate(nonlinear_system.problem8, stopTime=100, method="dassl", simflags="-nls=newton", tolerance=0.5e-7); getErrorString();
 
 val(a,{0.0,1.0,10.0,100.0});
 

diff --git a/simulation/modelica/others/sample1.mos b/simulation/modelica/others/sample1.mos
@@ -21,7 +21,7 @@ package sampleTests
 end sampleTests;
 "); getErrorString();
 
-simulate(sampleTests.sample1, startTime=0.0, stopTime=10.0, step=0.2); getErrorString();
+simulate(sampleTests.sample1, startTime=0.0, stopTime=10.0, numberOfIntervals=5); getErrorString();
 val(storage, 0.1);
 val(storage, 1.1);
 val(storage, 3.1);
@@ -34,7 +34,7 @@ val(storage, 9.1);
 // ""
 // record SimulationResult
 //     resultFile = "sampleTests.sample1_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'sampleTests.sample1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 5, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'sampleTests.sample1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "