Add flags to tests

Belonging to [master]: - OpenModelica/OMCompiler#1885 - OpenModelica/OpenModelica-testsuite#735
OpenModelica · Oct 11, 2017 · 8e44932 · 8e44932
1 parent 5411248
commit 8e44932
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 28 deletions.
diff --git a/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6.mos b/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6.mos
@@ -7,7 +7,7 @@
 //
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
-setCommandLineOptions({"+d=backenddaeinfo,stateselection"}); getErrorString();
+setCommandLineOptions("-d=backenddaeinfo,stateselection --maxSizeLinearTearing=4000"); getErrorString();
 
 modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6);
@@ -25,7 +25,7 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// {true}
+// true
 // ""
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6

diff --git a/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic.mos b/simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic.mos
@@ -7,7 +7,7 @@
 //
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
-setCommandLineOptions({"+d=backenddaeinfo,stateselection"}); getErrorString();
+setCommandLineOptions("-d=backenddaeinfo,stateselection --maxSizeLinearTearing=4000"); getErrorString();
 
 modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic);
@@ -25,7 +25,7 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// {true}
+// true
 // ""
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic

diff --git a/simulation/modelica/arrays/NPendulum.mos b/simulation/modelica/arrays/NPendulum.mos
@@ -6,6 +6,7 @@
 //setCommandLineOptions("+preOptModules=simplifyIfEquations,removeEqualFunctionCalls,partitionIndependentBlocks,expandDerOperator,findStateOrder,replaceEdgeChange,inlineArrayEqn,removeSimpleEquations,resolveLoops,evalFunc");
 loadModel(Modelica,{"3.2.1"}); getErrorString();
 loadFile("NPendulum.mo"); getErrorString();
+setCommandLineOptions("--maxSizeLineartearing=4000"); getErrorString();
 simulate(NPendulum, stopTime=1, numberOfIntervals=500); getErrorString();
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum_res.mat",
   "ReferenceFiles/NPendulum_10.mat",
@@ -17,6 +18,8 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum_res.mat",
 // ""
 // true
 // ""
+// true
+// ""
 // record SimulationResult
 //     resultFile = "NPendulum_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'NPendulum', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",

diff --git a/simulation/modelica/linear_system/EngineV6_partlintorn.mos b/simulation/modelica/linear_system/EngineV6_partlintorn.mos
@@ -4,7 +4,7 @@
 //
 
 loadModel(Modelica,{"3.2.1"});
-setCommandLineOptions("+partlintorn=2"); getErrorString();
+setCommandLineOptions("--partlintorn=2 --maxSizeLineartearing=4000"); getErrorString();
 simulate(Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6); getErrorString();
 
 res := OpenModelica.Scripting.compareSimulationResults("Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_res.mat",
@@ -21,7 +21,7 @@ res := OpenModelica.Scripting.compareSimulationResults("Modelica.Mechanics.Multi
 // ""
 // record SimulationResult
 //     resultFile = "Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // "

diff --git a/simulation/modelica/linear_system/NPendulum.mos b/simulation/modelica/linear_system/NPendulum.mos
@@ -6,6 +6,7 @@
 loadFile("NPendulum.mo");
 getErrorString();
 
+setCommandLineOptions("--maxSizeLinearTearing=4000"); getErrorString();
 buildModel(NPendulum.pendulum); getErrorString();
 system("./NPendulum.pendulum -ls totalpivot");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.mat",
@@ -40,22 +41,21 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.m
   {"phi[10]"});
 
 
-setCommandLineOptions("--maxSizeLinearTearing=0");
-getErrorString();
+setCommandLineOptions("--maxSizeLinearTearing=0"); getErrorString();
 buildModel(NPendulum.pendulum); getErrorString();
 
-system("./NPendulum.pendulum -ls totalpivot");
+system("./NPendulum.pendulum -ls totalpivot -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_10.mat",
   "NPendulum_diff.csv",0.01,0.01,
   {"phi[10]"});
 
-system("./NPendulum.pendulum -ls lapack");
+system("./NPendulum.pendulum -ls lapack -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_10.mat",
   "NPendulum_diff.csv",0.01,0.01,
   {"phi[10]"});
-system("./NPendulum.pendulum -ls umfpack");
+system("./NPendulum.pendulum -ls umfpack -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_10.mat",
   "NPendulum_diff.csv",0.01,0.01,
@@ -70,7 +70,7 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.m
   {"phi[10]"});
 */
 
-system("./NPendulum.pendulum -ls klu");
+system("./NPendulum.pendulum -ls klu -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_10.mat",
   "NPendulum_diff.csv",0.01,0.01,
@@ -79,6 +79,8 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.m
 // Result:
 // true
 // ""
+// true
+// ""
 // {"NPendulum.pendulum","NPendulum.pendulum_init.xml"}
 // "Notification: Automatically loaded package Modelica 3.2.1 due to uses annotation.
 // Notification: Automatically loaded package Complex 3.2.1 due to uses annotation.
@@ -104,19 +106,27 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum_res.m
 // "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
 // "
 // {"NPendulum.pendulum","NPendulum.pendulum_init.xml"}
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 278 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 275 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0
 // {"Files Equal!"}
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0
 // {"Files Equal!"}
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0
 // {"Files Equal!"}
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0

diff --git a/simulation/modelica/linear_system/NPendulum40.mos b/simulation/modelica/linear_system/NPendulum40.mos
@@ -8,12 +8,12 @@ getErrorString();
 
 setCommandLineOptions("--maxSizeLinearTearing=0");
 buildModel(NPendulum.pendulum40); getErrorString();
-system("./NPendulum.pendulum40 -ls umfpack");
+system("./NPendulum.pendulum40 -ls umfpack -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum40_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_40.mat",
   "NPendulum_diff.csv",0.01,0.0001,
   {"pendel.phi[40]"});
-system("./NPendulum.pendulum40 -ls klu");
+system("./NPendulum.pendulum40 -ls klu -lssMinSize=4001");
 res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum40_res.mat",
   getEnvironmentVar("REFERENCEFILES")+"/linear_system/NPendulum_40.mat",
   "NPendulum_diff.csv",0.01,0.0001,
@@ -27,11 +27,17 @@ res := OpenModelica.Scripting.compareSimulationResults("NPendulum.pendulum40_res
 // "Notification: Automatically loaded package Modelica 3.2.1 due to uses annotation.
 // Notification: Automatically loaded package Complex 3.2.1 due to uses annotation.
 // Notification: Automatically loaded package ModelicaServices 3.2.1 due to uses annotation.
+// Notification: Tearing is skipped for strong component 1 because system size of 1178 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 1175 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
 // "
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0
 // {"Files Equal!"}
+// stdout            | info    | Maximum system size for using linear sparse solver changed to 4001
 // stdout            | info    | The initialization finished successfully without homotopy method.
 // stdout            | info    | The simulation finished successfully.
 // 0

diff --git a/simulation/modelica/linear_system/problem2.mos b/simulation/modelica/linear_system/problem2.mos
@@ -222,7 +222,11 @@ val(i2, 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 0.0
 // 2.804903282692988
 // 0.0
@@ -234,7 +238,11 @@ val(i2, 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 0.0
 // 2.804903282692988
 // 0.0
@@ -246,7 +254,11 @@ val(i2, 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 0.0
 // 2.804903282692989
 // 0.0
@@ -258,7 +270,11 @@ val(i2, 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 9.518569369879021e-28
 // 2.804903282692988
 // 2.655481430415245e-28
@@ -270,7 +286,11 @@ val(i2, 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 5 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 0.0
 // 2.804903282692988
 // 0.0

diff --git a/simulation/modelica/linear_system/problem3.mos b/simulation/modelica/linear_system/problem3.mos
@@ -52,7 +52,11 @@ val(x[2], 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 10.0
 // 9.980736544657136
 // 1.0
@@ -64,7 +68,11 @@ val(x[2], 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 10.0
 // 9.980736544657136
 // 0.9999999999999999
@@ -76,7 +84,11 @@ val(x[2], 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 10.0
 // 9.980736544657136
 // 1.0
@@ -88,7 +100,11 @@ val(x[2], 1.0);
 // stdout            | info    | The simulation finished successfully.
 // "
 // end SimulationResult;
-// ""
+// "Notification: Tearing is skipped for strong component 1 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// Notification: Tearing is skipped for strong component 2 because system size of 2 exceeds maximum system size for tearing of linear systems (0).
+// To adjust the maximum system size for tearing use --maxSizeLinearTearing=<size> and --maxSizeNonlinearTearing=<size>.
+// "
 // 9.999999999999998
 // 9.980736544657136
 // 1.0

diff --git a/simulation/modelica/others/EngineV6_evalParams.mos b/simulation/modelica/others/EngineV6_evalParams.mos
@@ -4,7 +4,7 @@
 //
 loadModel(Modelica,{"3.2.1"});
 loadFile("EngineV6_output.mo");getErrorString();
-setCommandLineOptions("-d=evaluateAllParameters"); getErrorString();
+setCommandLineOptions("-d=evaluateAllParameters --maxSizeLineartearing=4000"); getErrorString();
 simulate(EngineV6_output); getErrorString();
 
 val(crankshaftSpeed,1.0); getErrorString();

diff --git a/simulation/modelica/others/EngineV6_output.mos b/simulation/modelica/others/EngineV6_output.mos
@@ -5,6 +5,7 @@
 loadModel(Modelica,{"3.2.1"});
 loadFile("EngineV6_output.mo");getErrorString();
 setDebugFlags("evalOutputOnly"); getErrorString();
+setCommandLineOptions("--maxSizeLineartearing=4000"); getErrorString();
 simulate(EngineV6_output); getErrorString();
 
 val(crankshaftSpeed,1.0); getErrorString();
@@ -15,6 +16,8 @@ val(crankshaftSpeed,1.0); getErrorString();
 // ""
 // true
 // ""
+// true
+// ""
 // There have been 1188 SCCs and now there are 566 SCCs.
 // record SimulationResult
 //     resultFile = "EngineV6_output_res.mat",

diff --git a/simulation/modelica/tearing/Tearing12-cel.mos b/simulation/modelica/tearing/Tearing12-cel.mos
@@ -9,7 +9,7 @@ loadFile("Tearing12.mo"); getErrorString();
 
 setDebugFlags("backenddaeinfo"); getErrorString();
 setTearingMethod("cellier"); getErrorString();
-setCommandLineOptions("+tearingHeuristic=MC1"); getErrorString();
+setCommandLineOptions("--tearingHeuristic=MC1 --maxSizeLinearTearing=4000"); getErrorString();
 simulate(Tearing12); getErrorString();
 
 

diff --git a/simulation/modelica/tearing/Tearing12-celMC3.mos b/simulation/modelica/tearing/Tearing12-celMC3.mos
@@ -9,7 +9,7 @@ loadFile("Tearing12.mo"); getErrorString();
 
 setDebugFlags("backenddaeinfo"); getErrorString();
 setTearingMethod("cellier"); getErrorString();
-setCommandLineOptions("+tearingHeuristic=MC3"); getErrorString();
+setCommandLineOptions("--tearingHeuristic=MC3 --maxSizeLinearTearing=4000"); getErrorString();
 simulate(Tearing12); getErrorString();
 
 

diff --git a/simulation/modelica/tearing/Tearing12-omc.mos b/simulation/modelica/tearing/Tearing12-omc.mos
@@ -8,7 +8,7 @@ loadFile("Tearing12.mo"); getErrorString();
 
 setDebugFlags("backenddaeinfo"); getErrorString();
 setTearingMethod("omcTearing"); getErrorString();
-setCommandLineOptions("+preferTVarsWithStartValue=false"); getErrorString();
+setCommandLineOptions("--maxSizeLinearTearing=4000"); getErrorString();
 simulate(Tearing12); getErrorString();
 
 // Result: