Changeset 13359

Timestamp:

2012-10-12T22:08:43+02:00 (12 years ago)

Author:

adrpo

Message:

• fix testsuite.

Location:

trunk/testsuite/simulation

Files:

• libraries/msl32/Modelica.Fluid.Examples.DrumBoiler.DrumBoiler.mos (modified) (1 diff)
• libraries/msl32/ReferenceFiles/Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.oneAxis.mat (added)
• modelica/inheritances/Makefile (modified) (2 diffs)
• modelica/inheritances/MoonLanding.mos (modified) (2 diffs)
• modelica/initialization/FilterBlock1.mos (modified) (1 diff)

trunk/testsuite/simulation/libraries/msl32/Modelica.Fluid.Examples.DrumBoiler.DrumBoiler.mos

@@ -11 +11 @@
 // record SimulationResult
 //     resultFile = "Modelica.Fluid.Examples.DrumBoiler.DrumBoiler_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 5400.0, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'Modelica.Fluid.Examples.DrumBoiler.DrumBoiler', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 5400.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Fluid.Examples.DrumBoiler.DrumBoiler', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// "[Nonlinear.mo:19:12-23:97:writable] Warning: If-equations are only partially supported. Ignoring   assert(limiter.u >= limiter.uMin + -0.01 * abs(limiter.uMin) and limiter.u <= limiter.uMax + 0.01 * abs(limiter.uMax), "Limiter: During initialization the limits have been ignored.However, the result is that the input u is not within the required limits:  u = " + String(limiter.u, 0, true, 6) + ", uMin = " + String(limiter.uMin, 0, true, 6) + ", uMax = " + String(limiter.uMax, 0, true, 6));
-// Warning: Alias variables evaporator.T_D = evaporator.heatPort.T have start values 300.0 != 288.15. Use value from evaporator.T_D.
+// "Warning: Alias variables evaporator.T_D = evaporator.heatPort.T have start values 300.0 != 288.15. Use value from evaporator.T_D.
 // 
 // Warning: Alias variables evaporator.T = furnace.port.T have start values 300.0 != 288.15. Use value from evaporator.T.

trunk/testsuite/simulation/modelica/inheritances/Makefile

@@ -4 +4 @@
 MoonLanding.mos \
 OneArgBaseFunction.mos \
-TempResistor3.mos \
+
 
 
@@ -11 +11 @@
 # Run make testfailing
 FAILINGTESTFILES=  \
-
+TempResistor3.mos 
 
 # Dependency files that are not .mo .mos or Makefile

trunk/testsuite/simulation/modelica/inheritances/MoonLanding.mos

@@ -29 +29 @@
 // true
 // record SimulationResult
-//     resultFile = "MoonLanding_res.mat"
+//     resultFile = "MoonLanding_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 100, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'MoonLanding', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
+//     messages = ""
 // end SimulationResult;
 // true
@@ -35 +37 @@
 // 57911.0
 // 33.0
-// ""
-// 0
 // endResult

trunk/testsuite/simulation/modelica/initialization/FilterBlock1.mos

@@ -14 +14 @@
 system("rm -rf FilterBlock1.plt FilterBlock1.exe FilterBlock1.c FilterBlock1_* output.log"); // remove tmp files.
 
+
 // Result:
 // true
 // record SimulationResult
-//     resultFile = "FilterBlock1_res.mat"
+//     resultFile = "FilterBlock1_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 2, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'FilterBlock1', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
+//     messages = ""
 // end SimulationResult;
 // true
-// ""
+// dimsize: 3, rows 4
 // 0
 // endResult
-