update tests due to lib update

OpenModelica · Mar 23, 2017 · ac7e1a7 · ac7e1a7
1 parent ca4d5b0
commit ac7e1a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/simulation/libraries/3rdParty/ThermoPower/Makefile b/simulation/libraries/3rdParty/ThermoPower/Makefile
@@ -3,7 +3,6 @@ TEST = ../../../../rtest -v
 TESTFILES = \
 Bug2537.mos \
 ThermoPower.Test.DistributedParameterComponents.TestWaterFlow1DFV_B.mos \
-ThermoPower.Examples.CISE.CISESim2States120501.mos \
 ThermoPower.Test.DistributedParameterComponents.TestFlow1D2phChen.mos \
 ThermoPower.Test.DistributedParameterComponents.TestFlow1D2phDB_hf.mos \
 ThermoPower.Examples.RankineCycle.Simulators.ClosedLoop.mos \
@@ -16,6 +15,7 @@ ThermoPower.Examples.HRB.Simulators.ClosedLoopSimulator \
 # Run make testfailing
 FAILINGTESTFILES = \
 
+
 # Dependency files that are not .mo .mos or Makefile
 # Add them here or they will be cleaned.
 DEPENDENCIES = \

diff --git a/simulation/libraries/3rdParty/ThermoPower/ThermoPower.Examples.CISE.CISESim2States120501.mos b/simulation/libraries/3rdParty/ThermoPower/ThermoPower.Examples.CISE.CISESim2States120501.mos
@@ -10,12 +10,9 @@ simulate(ThermoPower.Examples.CISE.CISESim2States120501); getErrorString();
 // true
 // ""
 // record SimulationResult
-//     resultFile = "ThermoPower.Examples.CISE.CISESim2States120501_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 1200.0, numberOfIntervals = 1000, tolerance = 1e-07, method = 'dassl', fileNamePrefix = 'ThermoPower.Examples.CISE.CISESim2States120501', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     resultFile = "",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ThermoPower.Examples.CISE.CISESim2States120501', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     messages = "Simulation Failed. Model: ThermoPower.Examples.CISE.CISESim2States120501 does not exist! Please load it first before simulation."
 // end SimulationResult;
-// "Notification: The following equation is consistent and got removed from the initialization problem: $DER.Plant.SH.p = 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").
-// 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
diff --git a/...ibraries/3rdParty/ThermoPower/ThermoPower.Examples.RankineCycle.Simulators.ClosedLoop.mos b/...ibraries/3rdParty/ThermoPower/ThermoPower.Examples.RankineCycle.Simulators.ClosedLoop.mos
@@ -10,8 +10,8 @@ translateModel(ThermoPower.Examples.RankineCycle.Simulators.ClosedLoop); getErro
 // true
 // ""
 // true
-// "[ThermoPower 3.1/Examples.mo:2538:70-2538:81:writable] Error: Variable q_nom not found in scope ThermoPower.Examples.RankineCycle.Models.
-// [ThermoPower 3.1/Examples.mo:2546:21-2546:69:writable] Error: Cyclically dependent constants or parameters found in scope : {q_nom}, {head_nom}.
+// "[ThermoPower 3.1/Examples.mo:2534:70-2534:81:writable] Error: Variable q_nom not found in scope ThermoPower.Examples.RankineCycle.Models.
+// [ThermoPower 3.1/Examples.mo:2542:21-2542:69:writable] Error: Cyclically dependent constants or parameters found in scope : {q_nom}, {head_nom}.
 // Notification: The given system is mixed-determined.   [index = 1]
 // 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: The initial conditions are over specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").