Skip to content

Commit

Permalink
Revert "Expected output"
Browse files Browse the repository at this point in the history
This reverts commit 05b74d7.
  • Loading branch information
ptaeuber authored and OpenModelica-Hudson committed May 30, 2017
1 parent 05b74d7 commit d51c142
Show file tree
Hide file tree
Showing 152 changed files with 188 additions and 188 deletions.
2 changes: 1 addition & 1 deletion flattening/modelica/modification/Bug3817.mos
Expand Up @@ -763,6 +763,6 @@ simulate(PowerSystems.Examples.Spot.DrivesAC3ph.SM_ctrlAv); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PowerSystems.Examples.Spot.DrivesAC3ph.SM_ctrlAv', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// endResult
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TFC4.mos
Expand Up @@ -64,7 +64,7 @@ getErrorString();
// max_iter = -1"
// end SimulationResult;
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TFC7.mos
Expand Up @@ -70,7 +70,7 @@ getErrorString();
// "
// end SimulationResult;
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/TFC8.mos
Expand Up @@ -76,7 +76,7 @@ getErrorString();
// "
// end SimulationResult;
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop3.mos
Expand Up @@ -57,7 +57,7 @@ getErrorString();
// LOG_IPOPT_ERROR | info | max violation is 1.53473e-09 for the constraint $EqCon$y1(time = 1)
// "
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop4.mos
Expand Up @@ -61,7 +61,7 @@ getErrorString();
// LOG_IPOPT_ERROR | info | max violation is 1.16403e-15 for the constraint $EqCon$y(time = 0.012899)
// "
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/optimization/basic/testAlgLoop6.mos
Expand Up @@ -418,7 +418,7 @@ getErrorString();
// "Notification: Following iteration variables are selected by the user for strong component 1 (DAE kind: initialization):
// x2:VARIABLE(min = -1.0 max = 1.0 ) type: Real
// Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Notification: Following iteration variables are selected by the user for strong component 2 (DAE kind: simulation):
// x2:VARIABLE(min = -1.0 max = 1.0 ) type: Real
// "
Expand Down
Expand Up @@ -39,7 +39,7 @@ getErrorString();
// "
// end SimulationResult;
// true
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// record SimulationResult
// resultFile = "drumBoiler.optDrumBoiler_res.mat",
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/cruntime/simoptions/nlssMinSize.mos
Expand Up @@ -21,6 +21,6 @@ simulate(M, simflags="-nlssMinSize=1"); getErrorString();
// messages = "stdout | info | Maximum system size for using non-linear sparse solver changed to 1
// "
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// endResult
Expand Up @@ -43,7 +43,7 @@ if 0<>system("sort -h testModel_info.json.filtered | diff - testModel_info.json.
// ""
// true
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// 0
// "OK"
Expand Down
2 changes: 1 addition & 1 deletion openmodelica/fmi/ModelExchange/1.0/CoupledClutches.mos
Expand Up @@ -23,7 +23,7 @@ val(J4_w1, 1);
// true
// ""
// "CoupledClutches.fmu"
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// "CoupledClutches_me_FMU.mo"
// ""
Expand Down
16 changes: 8 additions & 8 deletions openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos
Expand Up @@ -53,16 +53,16 @@ val(s, 1);
// assert | warning | Variable violating min constraint: 0.0 <= lever_arm_simple_2D1.ausleger1.fixedTranslation.r0[2], has value: -0.0885635
// "
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// 127.2093118472222
// -1.473673372206885
// -1.473673372206996
// 12720.93118472221
// -2.525849023131421
// -2.525849023135152
// 0.0
// -0.5326917977051209
// -0.5326917977050821
// "JuliansBib_Connector_Hebelarm_einfach.fmu"
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// "JuliansBib_Connector_Hebelarm_einfach_me_FMU.mo"
// ""
Expand Down Expand Up @@ -96,9 +96,9 @@ val(s, 1);
// [openmodelica/fmi/ModelExchange/1.0/JuliansBib_Connector_Hebelarm_einfach_me_FMU.mo:688:3-688:216:writable] Warning: Parameter lever_arm_simple_2D1_fixedTranslation1_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// "
// 29.87032083226751
// -2.843354040232149
// -2.843354040235502
// 2987.032083226751
// -1.18046718501934
// -1.180467185279577
// 0.0
// 2.726903938446021
// 2.726903938445559
// endResult
4 changes: 2 additions & 2 deletions openmodelica/linearization/test_06.mos
Expand Up @@ -46,7 +46,7 @@ readFile("linear_simple__test.log"); // Check that output log is empty
// "
// end SimulationResult;
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// true
// ""
Expand Down Expand Up @@ -88,7 +88,7 @@ readFile("linear_simple__test.log"); // Check that output log is empty
// "
// end SimulationResult;
// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// true
// record SimulationResult
Expand Down
6 changes: 3 additions & 3 deletions openmodelica/xml/Bug3857.mos
Expand Up @@ -23,7 +23,7 @@ readFile("Bug3857.xml"); getErrorString();
// true
// ""
// true
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// true
// ""
Expand Down Expand Up @@ -1554,7 +1554,7 @@ readFile("Bug3857.xml"); getErrorString();
// </ScalarVariable>
//
// <ScalarVariable name=\"driveAngle\" description=\"Reference distance to move\" valueReference=\"118\" variability=\"parameter\" causality=\"internal\" alias=\"noAlias\">
// <Real start=\"1.570796326794897\" fixed=\"true\" unit=\"rad\" displayUnit=\"deg\"/>
// <Real start=\"1.57\" fixed=\"true\" unit=\"rad\" displayUnit=\"deg\"/>
// <QualifiedName>
// <exp:QualifiedNamePart name=\"driveAngle\"/>
// </QualifiedName>
Expand Down Expand Up @@ -2279,7 +2279,7 @@ readFile("Bug3857.xml"); getErrorString();
// <exp:QualifiedNamePart name=\"driveAngle\"/>
// </equ:Parameter>
// <equ:BindingExp>
// <exp:RealLiteral>1.570796326794897</exp:RealLiteral>
// <exp:RealLiteral>1.57</exp:RealLiteral>
// </equ:BindingExp>
// </equ:BindingEquation>
//
Expand Down
Expand Up @@ -30,7 +30,7 @@ res := OpenModelica.Scripting.compareSimulationResults("DrModelicaForTesting.Cir
// "[Modelica 3.1/Electrical/Analog/Basic.mo:68:3-69:40:writable] Warning: Parameter R1.R has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
// [Modelica 3.1/Electrical/Analog/Sources.mo:359:5-359:61:writable] Warning: Parameter src.V has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
// [Modelica 3.1/Electrical/Analog/Sources.mo:361:5-361:68:writable] Warning: Parameter src.freqHz has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// endResult
Expand Up @@ -51,7 +51,7 @@ getErrorString();
// [WasteWater 2.1.0/ASM1/Interfaces.mo:7:3-45:19:writable] Warning: Connector .WasteWater.ASM1.Interfaces.WWFlowAsm1in is not balanced: The number of potential variables (13) is not equal to the number of flow variables (1).
// [Modelica 3.2.1/Blocks/Sources.mo:239:5-239:54:writable] Warning: Parameter Constant1.k has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
// [Modelica 3.2.1/Blocks/Sources.mo:239:5-239:54:writable] Warning: Parameter Constant2.k has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// (true,{})
// ""
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/HumMod/buildHumModOMC.mos
Expand Up @@ -21,6 +21,6 @@ buildModel(HumModTest); getErrorString();
// Notification: Automatically loaded package Complex 3.2.1 due to uses annotation.
// Notification: Automatically loaded package ModelicaServices 3.2.1 due to uses annotation.
// Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/PNlib/Test11.mos
Expand Up @@ -27,7 +27,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.Test11_re
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Test11', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/PNlib/Test12.mos
Expand Up @@ -30,7 +30,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.Test12_re
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Test12', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "Warning: There are iteration variables with default zero start attribute or nominal value as start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
// "
// {"Files Equal!"}
// "Warning: 'compareSimulationResults' is deprecated. It is recommended to use 'diffSimulationResults' instead.
Expand Down

0 comments on commit d51c142

Please sign in to comment.