Skip to content

Commit

Permalink
update tests due to library updates
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - #146
  • Loading branch information
adrpo authored and OpenModelica-Hudson committed Apr 15, 2019
1 parent 43dbf0d commit bb5274d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 9 deletions.
4 changes: 3 additions & 1 deletion testsuite/openmodelica/cppruntime/testVectorizedBlocks.mos
Expand Up @@ -195,7 +195,9 @@ val(y[10], 1.0);
// "Notification: Automatically loaded package Modelica 3.2.2 due to uses annotation.
// Notification: Automatically loaded package Complex 3.2.2 due to uses annotation.
// Notification: Automatically loaded package ModelicaServices 3.2.2 due to uses annotation.
// Notification: Automatically loaded package Modelica_Synchronous 0.92.1 due to uses annotation.
// Notification: Automatically loaded package Modelica_Synchronous 0.93.0 due to uses annotation.
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: The initial conditions are over specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// 10.0
Expand Down
Expand Up @@ -28,7 +28,7 @@ runScript(modelTesting);getErrorString();
// LOG_SUCCESS | info | The simulation finished successfully.
//
// Files Equal!
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica_Synchronous of version 0.92.1, but this package was already loaded with version 0.93.0. You might experience problems if these versions are incompatible.
// Warning: Alias equations of external objects are not Modelica compliant as in:
// addBoolean.pkgOut[1].pkg = resetPointer.pkgIn.pkg
// getBoolean.pkgIn.pkg = getInteger.pkgOut[1].pkg
Expand Down
Expand Up @@ -28,7 +28,7 @@ runScript(modelTesting);getErrorString();
// LOG_SUCCESS | info | The simulation finished successfully.
//
// Files Equal!
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica_Synchronous of version 0.92.1, but this package was already loaded with version 0.93.0. You might experience problems if these versions are incompatible.
// Warning: Alias equations of external objects are not Modelica compliant as in:
// getInteger.pkgIn.pkg = unpackInt1.pkgOut[1].pkg
// unpackInt.pkgOut[1].pkg = unpackInt1.pkgIn.pkg
Expand Down
Expand Up @@ -35,7 +35,7 @@ runScript(modelTesting);getErrorString();
// LOG_SUCCESS | info | The simulation finished successfully.
//
// Files Equal!
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica_Synchronous of version 0.92.1, but this package was already loaded with version 0.93.0. You might experience problems if these versions are incompatible.
// Warning: Alias equations of external objects are not Modelica compliant as in:
// addInteger.pkgOut[1].pkg = resetPointer.pkgIn.pkg
// getInteger.pkgIn.pkg = getString.pkgOut[1].pkg
Expand Down
10 changes: 8 additions & 2 deletions testsuite/simulation/modelica/external_functions/MDD_test.mos
Expand Up @@ -15,14 +15,20 @@ buildModel(MDD_test); getErrorString();
// true
// ""
// true
// ""
// true
// "Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// true
// "Warning: Requested package Modelica_Synchronous of version 0.92.1, but this package was already loaded with version 0.93.0. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// true
// ""
// {"MDD_test","MDD_test_init.xml"}
// "Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica_Synchronous of version 0.92.1, but this package was already loaded with version 0.93.0. You might experience problems if these versions are incompatible.
// Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Alias equations of external objects are not Modelica compliant as in:
// getInteger.pkgIn.pkg = resetPointer.pkgOut[1].pkg
// packInt.pkgOut[1].pkg = resetPointer.pkgIn.pkg
Expand Down
Expand Up @@ -16,23 +16,29 @@ simulate(Modelica_Synchronous.Examples.SimpleControlledDrive.ClockedWithDiscreti
// true
// ""
// true
// ""
// "Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "Modelica_Synchronous.Examples.Systems.ControlledMixingUnit_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 300.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Synchronous.Examples.Systems.ControlledMixingUnit', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
// LOG_SUCCESS | info | The simulation finished successfully.
// "
// end SimulationResult;
// ""
// "Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// "
// record SimulationResult
// resultFile = "Modelica_Synchronous.Examples.SimpleControlledDrive.ClockedWithDiscretizedContinuousController_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Synchronous.Examples.SimpleControlledDrive.ClockedWithDiscretizedContinuousController', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
// LOG_SUCCESS | info | The simulation finished successfully.
// "
// end SimulationResult;
// "Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: PI.y = 0.0 (PI.y_start = 0.0)
// "Warning: Requested package Modelica of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: Requested package ModelicaServices of version 3.2.3, but this package was already loaded with version 3.2.2. You might experience problems if these versions are incompatible.
// Warning: It was not possible to determine if the initialization problem is consistent, because of not evaluable parameters/start values during compile time: PI.y = 0.0 (PI.y_start = 0.0)
// Warning: The initial conditions are over specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// endResult

0 comments on commit bb5274d

Please sign in to comment.