Skip to content

Commit

Permalink
update tests due to MLS 3.2.2 bump
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo committed Apr 20, 2016
1 parent 131a472 commit 053c7fd
Show file tree
Hide file tree
Showing 57 changed files with 178 additions and 191 deletions.
2 changes: 1 addition & 1 deletion flattening/libraries/3rdParty/Exercises/checkExercises.mos
Expand Up @@ -3,7 +3,7 @@
// provided by Martin Otter
//

loadModel(Modelica, {"3.2"}); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();

loadFile("1/Aufgabe1_1.mo"); getErrorString();
checkModel(Aufgabe1_1); getErrorString();
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cppruntime/externalArrayInputTest.mos
Expand Up @@ -5,7 +5,7 @@

setCommandLineOptions("+simCodeTarget=Cpp"); getErrorString();

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();

loadString("
package ExternalArrayInput
Expand Down
Expand Up @@ -3,7 +3,7 @@
// status: correct
// Real variables, Real input variable, continuous-time states, state events, event iteration

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();
setCommandLineOptions("+simCodeTarget=Cpp"); getErrorString();
loadFile("cranes.mo"); getErrorString();
translateModelFMU(cranes.crane, version="1.0"); getErrorString();
Expand Down
Expand Up @@ -5,7 +5,7 @@
//

setCommandLineOptions("+simCodeTarget=Cpp"); getErrorString();
loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();
loadString("
model DrumBoiler
extends Modelica.Fluid.Examples.DrumBoiler.DrumBoiler(use_inputs = true);
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TT.mos
@@ -1,7 +1,7 @@
// name: TimeTableTest
// status: correct

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
getErrorString();

setCommandLineOptions("+g=Optimica");
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TT2.mos
@@ -1,7 +1,7 @@
// name: CombiTimeTable
// status: correct

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
getErrorString();

setCommandLineOptions("+g=Optimica");
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TT3.mos
@@ -1,7 +1,7 @@
// name: CombiTimeTablePeriodic
// status: correct

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
getErrorString();

setCommandLineOptions("+g=Optimica");
Expand Down
@@ -1,7 +1,7 @@
// name: TestConstraintsAlias
// status: correct

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
getErrorString();

setCommandLineOptions("+g=Optimica");
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/debugDumps/libraryCoverageFlags.mos
Expand Up @@ -4,7 +4,7 @@
// teardown_command: rm -rf Modelica.Utilities.Examples.readRealParameterModel*
//

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();
setCommandLineOptions("+d=nogen,initialization,backenddaeinfo,discreteinfo,stateselection"); getErrorString();
buildModel(Modelica.Utilities.Examples.readRealParameterModel); getErrorString();

Expand Down
2 changes: 1 addition & 1 deletion openmodelica/fmi/ModelExchange/1.0/InOutTest.mos
Expand Up @@ -5,7 +5,7 @@
// Simulation Results
//

loadModel(Modelica);getErrorString();
loadModel(Modelica, {"3.2.1"});getErrorString();
loadFile("InOutTest.mo");getErrorString();
translateModelFMU(InOutTest, version="1.0");getErrorString();
importFMU("InOutTest.fmu");getErrorString();
Expand Down
Expand Up @@ -6,7 +6,7 @@
// Modelica Standard Library
//

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
translateModelFMU(Modelica.Blocks.Sources.BooleanPulse, version="1.0");
getErrorString();

Expand Down
Expand Up @@ -6,7 +6,7 @@
// Modelica Standard Library
//

loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
translateModelFMU(Modelica.Blocks.Sources.BooleanPulse, version="2.0");
getErrorString();

Expand Down
2 changes: 1 addition & 1 deletion openmodelica/interactive-API/Bug2871.mos
Expand Up @@ -5,7 +5,7 @@
// Checks that the intial environment is cloned when returned (as the env now has destructive updates)
//

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();

existClass(Modelica.Fluid.Vessels.OpenTank);
getClassRestriction(Modelica.Fluid.Pipes.StaticPipe);
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/interactive-API/Bug3417.mos
@@ -1,7 +1,7 @@
// name: Bug3417.mos [BUG: #3417]
// status: correct

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();
getClassNames(Modelica.Electrical); getErrorString();
getClassInformation(Modelica.Electrical);
loadString("within Modelica;
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/interactive-API/getDialogAnnotation.mos
Expand Up @@ -3,7 +3,7 @@
// status: correct
//

loadModel(Modelica); getErrorString();
loadModel(Modelica, {"3.2.1"}); getErrorString();
loadFile("getDialogAnnotation.mo"); getErrorString();
list(GetDialogAnnotation); getErrorString();
getComponentAnnotations(GetDialogAnnotation); getErrorString();
Expand Down
4 changes: 2 additions & 2 deletions openmodelica/interactive-API/interactive_api_calls.mos
Expand Up @@ -118,7 +118,7 @@ getMessagesStringInternal();

clear();
// adrpo: test unique messages
loadModel(Modelica);
loadModel(Modelica, {"3.2.1"});
getMessagesStringInternal(); // unique
loadModel(ThermoSysPro);
getMessagesStringInternal(); // unique
Expand Down Expand Up @@ -694,7 +694,7 @@ getMessagesStringInternal(unique = false); // not unique
// end OpenModelica.Scripting.ErrorMessage;}
// Evaluating: clear()
// true
// Evaluating: loadModel(Modelica)
// Evaluating: loadModel(Modelica, {"3.2.1"})
// true
// Evaluating: getMessagesStringInternal()
// {}
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/xml/XmlDumpComment.mos
Expand Up @@ -14,7 +14,7 @@ dumpXMLDAE(XmlDumpComment,"flat");
readFile("XmlDumpComment.xml");

"Optimiser";
loadModel(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum); getErrorString();
loadModel(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum, {"3.2.1"}); getErrorString();
dumpXMLDAE(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum,"optimiser",true,true);
readFile("Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.xml");

Expand Down
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/Aufgabe1_1.mos
Expand Up @@ -14,9 +14,9 @@ simulate(Aufgabe1_1); getErrorString();
// ""
// record SimulationResult
// resultFile = "Aufgabe1_1_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 0.2, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'Aufgabe1_1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// simulationOptions = "startTime = 0.0, stopTime = 0.2, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Aufgabe1_1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// endResult
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/Aufgabe1_2.mos
Expand Up @@ -15,9 +15,9 @@ simulate(Aufgabe1_2); getErrorString();
// ""
// record SimulationResult
// resultFile = "Aufgabe1_2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 0.2, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'Aufgabe1_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// simulationOptions = "startTime = 0.0, stopTime = 0.2, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Aufgabe1_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// endResult
Expand Up @@ -12,14 +12,12 @@ simulate(ServoSystem1.Aufgabe3_2); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem1.Aufgabe3_2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem1.Aufgabe3_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -12,14 +12,12 @@ simulate(ServoSystem1.Aufgabe3_3); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem1.Aufgabe3_3_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem1.Aufgabe3_3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,14 +11,12 @@ simulate(ServoSystem3.Aufgabe3_2); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe3_2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe3_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,14 +11,12 @@ simulate(ServoSystem3.Aufgabe3_3); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe3_3_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe3_3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,13 +11,12 @@ simulate(ServoSystem3.Aufgabe4_1); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe4_1_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 4.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,13 +11,12 @@ simulate(ServoSystem3.Aufgabe4_2); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe4_2_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,13 +11,12 @@ simulate(ServoSystem3.Aufgabe4_3a); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe4_3a_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_3a', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,13 +11,12 @@ simulate(ServoSystem3.Aufgabe4_3b); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe4_3b_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_3b', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// ""
// endResult
Expand Up @@ -11,13 +11,12 @@ simulate(ServoSystem3.Aufgabe4_4a); getErrorString();
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.1. You might experience problems if these versions are incompatible.
// "Warning: Requested package Modelica of version 3.2, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "ServoSystem3.Aufgabe4_4a_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 4.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_4a', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// ""
// endResult

0 comments on commit 053c7fd

Please sign in to comment.