Update expected output - remove warnings (see #3325)

OpenModelica · May 19, 2015 · a4b5245 · a4b5245
1 parent 028b425
commit a4b5245
Show file tree

Hide file tree

Showing 46 changed files with 54 additions and 115 deletions.
diff --git a/openmodelica/cruntime/optimization/basic/TT.mos b/openmodelica/cruntime/optimization/basic/TT.mos
@@ -45,7 +45,6 @@ getErrorString();
 // --------------------------------------------------------
 // number of nonlinear constraints: 0
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.

diff --git a/openmodelica/cruntime/optimization/basic/TT2.mos b/openmodelica/cruntime/optimization/basic/TT2.mos
@@ -46,7 +46,6 @@ getErrorString();
 // --------------------------------------------------------
 // number of nonlinear constraints: 0
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.

diff --git a/openmodelica/cruntime/optimization/basic/TT3.mos b/openmodelica/cruntime/optimization/basic/TT3.mos
@@ -46,7 +46,6 @@ getErrorString();
 // --------------------------------------------------------
 // number of nonlinear constraints: 0
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.

diff --git a/openmodelica/cruntime/optimization/basic/TestConstraintsAlias.mos b/openmodelica/cruntime/optimization/basic/TestConstraintsAlias.mos
@@ -57,7 +57,6 @@ getErrorString();
 // --------------------------------------------------------
 // number of nonlinear constraints: 2
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.

diff --git a/openmodelica/cruntime/optimization/basic/staticOP.mos b/openmodelica/cruntime/optimization/basic/staticOP.mos
@@ -42,7 +42,6 @@ val(w, 1.0);
 // --------------------------------------------------------
 // number of nonlinear constraints: 0
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.

diff --git a/openmodelica/cruntime/optimization/basic/testDerInput.mos b/openmodelica/cruntime/optimization/basic/testDerInput.mos
@@ -44,7 +44,6 @@ val(cost,1.0);
 // --------------------------------------------------------
 // number of nonlinear constraints: 4
 // ========================================================
-// stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
 //
 // ******************************************************************************
 // This program contains Ipopt, a library for large-scale nonlinear optimization.
@@ -53,12 +52,12 @@ val(cost,1.0);
 // ******************************************************************************
 //
 // LOG_IPOPT_ERROR   | info    | max error is 0.00499703 for the approximation of the state x1(time = 3.2)
-// LOG_IPOPT_ERROR   | info    | max error is 3.10841e-16 for the approximation of the state x1(time = 2.2)
+// LOG_IPOPT_ERROR   | info    | max error is 2.88615e-16 for the approximation of the state x1(time = 2.2)
+// LOG_IPOPT_ERROR   | info    | max error is 3.33067e-16 for the approximation of the state x1(time = 4.2)
+// LOG_IPOPT_ERROR   | info    | max error is 4.44089e-16 for the approximation of the state x1(time = 1.9)
 // LOG_IPOPT_ERROR   | info    | max error is 3.55185e-16 for the approximation of the state x1(time = 2.1)
-// LOG_IPOPT_ERROR   | info    | max error is 3.33067e-16 for the approximation of the state x1(time = 4.1)
-// LOG_IPOPT_ERROR   | info    | max error is 3.55185e-16 for the approximation of the state x1(time = 2.3)
-// LOG_IPOPT_ERROR   | info    | max error is 4.69243e-16 for the approximation of the state x1(time = 3.1)
-// LOG_IPOPT_ERROR   | info    | max error is 4.44089e-16 for the approximation of the state x1(time = 3.9)
+// LOG_IPOPT_ERROR   | info    | max error is 5.43836e-16 for the approximation of the state x1(time = 3.4)
+// LOG_IPOPT_ERROR   | info    | max error is 3.10949e-16 for the approximation of the state x1(time = 1.9)
 // LOG_IPOPT_ERROR   | info    | max error is 3.44343e-16 for the approximation of the state x1(time = 3.3)
 // LOG_IPOPT_ERROR   | info    | max error is 6.38378e-16 for the approximation of the state x1(time = 3)
 // "

diff --git a/simulation/libraries/3rdParty/DrModelica/DrModelicaForTesting.BasicVolume2.mos b/simulation/libraries/3rdParty/DrModelica/DrModelicaForTesting.BasicVolume2.mos
@@ -25,8 +25,7 @@ res := OpenModelica.Scripting.compareSimulationResults("DrModelicaForTesting.Bas
 // record SimulationResult
 //     resultFile = "DrModelicaForTesting.BasicVolume2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 200, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'DrModelicaForTesting.BasicVolume2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // "

diff --git a/simulation/libraries/msl31/Modelica.Electrical.Analog.Examples.ShowSaturatingInductor.mos b/simulation/libraries/msl31/Modelica.Electrical.Analog.Examples.ShowSaturatingInductor.mos
@@ -29,8 +29,6 @@ runScript(modelTesting);getErrorString();
 // {"SaturatingInductance1.Psi"}
 // Simulation options: startTime = 0.0, stopTime = 6.2832, numberOfIntervals = 628, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.ShowSaturatingInductor', options = '', outputFormat = 'mat', variableFilter = 'time|SaturatingInductance1.Psi', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Electrical.Analog.Examples.ShowSaturatingInductor_res.mat
-// Messages: stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-//
 // Files Equal!
 // Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.

diff --git a/...ries/msl32/Modelica.Electrical.QuasiStationary.SinglePhase.Examples.ParallelResonance.mos b/...ries/msl32/Modelica.Electrical.QuasiStationary.SinglePhase.Examples.ParallelResonance.mos
@@ -32,8 +32,6 @@ runScript(modelTesting);getErrorString();
 // {"capacitor.i.im","capacitor.pin_n.reference.gamma","inductor.pin_p.reference.gamma","resistor.pin_p.reference.gamma","voltageSensor.pin_n.reference.gamma","capacitor.pin_n.reference.gamma","ground.pin.reference.gamma"}
 // Simulation options: startTime = 0.0, stopTime = 1.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.QuasiStationary.SinglePhase.Examples.ParallelResonance', options = '', outputFormat = 'mat', variableFilter = 'time|capacitor.i.im|capacitor.pin_n.reference.gamma|inductor.pin_p.reference.gamma|resistor.pin_p.reference.gamma|voltageSensor.pin_n.reference.gamma|capacitor.pin_n.reference.gamma|ground.pin.reference.gamma', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Electrical.QuasiStationary.SinglePhase.Examples.ParallelResonance_res.mat
-// Messages: stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-//
 // "true
 // "
 // ""

diff --git a/...raries/msl32/Modelica.Electrical.QuasiStationary.SinglePhase.Examples.SeriesResonance.mos b/...raries/msl32/Modelica.Electrical.QuasiStationary.SinglePhase.Examples.SeriesResonance.mos
@@ -31,8 +31,6 @@ runScript(modelTesting);getErrorString();
 // {"capacitor.i.im","capacitor.pin_n.reference.gamma","inductor.pin_p.reference.gamma","resistor.pin_p.reference.gamma","capacitor.pin_n.reference.gamma","ground.pin.reference.gamma"}
 // Simulation options: startTime = 0.0, stopTime = 1.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.QuasiStationary.SinglePhase.Examples.SeriesResonance', options = '', outputFormat = 'mat', variableFilter = 'time|capacitor.i.im|capacitor.pin_n.reference.gamma|inductor.pin_p.reference.gamma|resistor.pin_p.reference.gamma|capacitor.pin_n.reference.gamma|ground.pin.reference.gamma', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Electrical.QuasiStationary.SinglePhase.Examples.SeriesResonance_res.mat
-// Messages: stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-//
 // Files Equal!
 // "true
 // "

diff --git a/simulation/libraries/msl32/Modelica.Media.Examples.SimpleLiquidWater.mos b/simulation/libraries/msl32/Modelica.Media.Examples.SimpleLiquidWater.mos
@@ -26,8 +26,6 @@ runScript(modelTesting);getErrorString();
 // {"U"}
 // Simulation options: startTime = 0.0, stopTime = 100.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Media.Examples.SimpleLiquidWater', options = '', outputFormat = 'mat', variableFilter = 'time|U', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Media.Examples.SimpleLiquidWater_res.mat
-// Messages: stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-//
 // Files Equal!
 // "true
 // "

diff --git a/...s/ModelicaTest.Fluid.Dissipation.Verifications.HeatTransfer.Channel.kc_evenGapLaminar.mos b/...s/ModelicaTest.Fluid.Dissipation.Verifications.HeatTransfer.Channel.kc_evenGapLaminar.mos
@@ -380,8 +380,7 @@ simulate(ModelicaTest.Fluid.Dissipation.Verifications.HeatTransfer.Channel.kc_ev
 // record SimulationResult
 //     resultFile = "ModelicaTest.Fluid.Dissipation.Verifications.HeatTransfer.Channel.kc_evenGapLaminar_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ModelicaTest.Fluid.Dissipation.Verifications.HeatTransfer.Channel.kc_evenGapLaminar', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // "

diff --git a/simulation/modelica/asserts/TestAssert.mos b/simulation/modelica/asserts/TestAssert.mos
@@ -74,8 +74,7 @@ simulate(TestAssert.TestErrorVariable); getErrorString();
 // record SimulationResult
 //     resultFile = "TestAssert.TestWarningConstant_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'TestAssert.TestWarningConstant', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// assert            | warning | The following assertion has been violated at time 0.000000
+//     messages = "assert            | warning | The following assertion has been violated at time 0.000000
 // |                 | |       | false
 // assert            | warning | Variable x is probably too big
 // "

diff --git a/simulation/modelica/built_in_functions/SemiLinear.mos b/simulation/modelica/built_in_functions/SemiLinear.mos
@@ -14,8 +14,7 @@ val(c, 1.0);
 // record SimulationResult
 //     resultFile = "SemiLinearTest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'SemiLinearTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // 5.0
 // 4.0

diff --git a/simulation/modelica/connectors/Tank.mos b/simulation/modelica/connectors/Tank.mos
@@ -31,8 +31,7 @@ z/1000.0;
 // record SimulationResult
 //     resultFile = "Tank_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 50, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'Tank', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // true
 // 2.9

diff --git a/simulation/modelica/equations/WhenEquation1.mos b/simulation/modelica/equations/WhenEquation1.mos
@@ -22,8 +22,7 @@ val(toggle,0.8);
 // record SimulationResult
 //     resultFile = "WhenEquation1_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'WhenEquation1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // 0.0
 // 1.0

diff --git a/simulation/modelica/equations/deriveToLog.mos b/simulation/modelica/equations/deriveToLog.mos
@@ -34,8 +34,7 @@ getErrorString();
 // record SimulationResult
 //     resultFile = "modelDiffLog_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'modelDiffLog', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // ""
 // endResult
diff --git a/simulation/modelica/events/EventTests3.mos b/simulation/modelica/events/EventTests3.mos
@@ -22,8 +22,7 @@ simulate(testEvents3, simflags="-lv=LOG_EVENTS"); getErrorString();
 // record SimulationResult
 //     resultFile = "testEvents3_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'testEvents3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-lv=LOG_EVENTS'",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// LOG_EVENTS        | info    | status of relations at time=0
+//     messages = "LOG_EVENTS        | info    | status of relations at time=0
 // |                 | |       | | [1] (pre: false) false = time > 0.5
 // LOG_EVENTS        | info    | status of zero crossings at time=0
 // |                 | |       | | [1] (pre:  0) -1 = time > 0.5

diff --git a/simulation/modelica/events/bug2718.mos b/simulation/modelica/events/bug2718.mos
@@ -42,17 +42,16 @@ val(y, 0.3);
 // record SimulationResult
 //     resultFile = "eventTests.bug2718_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 0.3, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'eventTests.bug2718', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // "
 // 0.0
-// 0.0009999998999998822
-// 0.0009999998999998822
-// 0.001999999799899716
+// 0.0009999998999998816
+// 0.0009999998999998816
+// 0.001999999799899718
 // 0.0
 // -0.001000000100000118
-// -0.002000000200100131
-// -0.003000000300300149
+// -0.002000000200100132
+// -0.003000000300300141
 // endResult
diff --git a/simulation/modelica/events/bug2752.mos b/simulation/modelica/events/bug2752.mos
@@ -58,8 +58,7 @@ val(y[3], 4.0);
 // record SimulationResult
 //     resultFile = "eventTests.bug2752_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'eventTests.bug2752', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // "

diff --git a/simulation/modelica/external_functions/TestRoots.mos b/simulation/modelica/external_functions/TestRoots.mos
@@ -10,8 +10,7 @@ simulate(TestRoots);getErrorString();
 // record SimulationResult
 //     resultFile = "TestRoots_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'TestRoots', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // ""
 // endResult
diff --git a/simulation/modelica/functions_eval/functionTest4.mos b/simulation/modelica/functions_eval/functionTest4.mos
@@ -40,8 +40,7 @@ getErrorString();
 // record SimulationResult
 //     resultFile = "PartEvalFunc.functionTest4_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PartEvalFunc.functionTest4', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
 // "

diff --git a/simulation/modelica/functions_eval/functionTest5.mos b/simulation/modelica/functions_eval/functionTest5.mos
@@ -41,8 +41,7 @@ getErrorString();
 // record SimulationResult
 //     resultFile = "PartEvalFunc.functionTest5_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PartEvalFunc.functionTest5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // ""
 // {"Files Equal!"}

diff --git a/simulation/modelica/functions_eval/functionTest7.mos b/simulation/modelica/functions_eval/functionTest7.mos
@@ -40,8 +40,7 @@ getErrorString();
 // record SimulationResult
 //     resultFile = "PartEvalFunc.functionTest7_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PartEvalFunc.functionTest7', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     messages = ""
 // end SimulationResult;
 // ""
 // {"Files Equal!"}

diff --git a/simulation/modelica/hpcom/MergingExample.mos b/simulation/modelica/hpcom/MergingExample.mos
@@ -46,8 +46,7 @@ res := OpenModelica.Scripting.compareSimulationResults("MergingExample_res.mat",
 // record SimulationResult
 //     resultFile = "MergingExample_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'MergingExample', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "stdout            | info    | Jacobian or SparsePattern is not generated or failed to initialize! Switch back to normal.
-// "
+//     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: The initial conditions are not fully specified. Use +d=initialization for more information.