Changeset 13362

Timestamp:

2012-10-13T00:45:54+02:00 (12 years ago)

Author:

adrpo

Message:

• fix tests.

Location:

trunk/testsuite/simulation/modelica

Files:

• arrays/ArrayDivError.mos (modified) (1 diff)
• initialization/FilterBlock1.mos (modified) (2 diffs)

trunk/testsuite/simulation/modelica/arrays/ArrayDivError.mos

@@ -13 +13 @@
 // record SimulationResult
 //     resultFile = "",
-//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 2, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'ArrayDivError', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 2, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'ArrayDivError', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
 //     messages = "Simulation failed for model: ArrayDivError
-// [ArrayDivError.mo:10:2-10:22:writable] Error: Type mismatch in equation {{Div1[1,1], Div1[1,2], Div1[1,3]}}={1.0, 2.0, 3.0} of type Real[1, 3]=Real[3]
+// [ArrayDivError.mo:10:3-10:23:writable] Error: Type mismatch in equation {{Div1[1,1], Div1[1,2], Div1[1,3]}}={1.0, 2.0, 3.0} of type Real[1, 3]=Real[3]
 // Error: Error occurred while flattening model ArrayDivError
 // "

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

@@ -2 +2 @@
 // keywords: equations when
 // status:   correct
-// 
+// teardown_command: rm -f _FilterBlock1.* FilterBlock1_res.mat FilterBlock1.exe FilterBlock1.c FilterBlock1_* output.log
 //  Tests when, elsewhen
 // Drmodelica: 9.1 reinit (p. 296)
 //
 
-loadFile("FilterBlock1.mo");
-simulate(FilterBlock1,numberOfIntervals=2, tolerance=1e-5); // 2 intervals == 3 values
-echo(false); // turns of output 
-res:=readSimulationResult("FilterBlock1_res.mat",{x, y},3); 
-echo(true); // turns on output
-system("rm -rf FilterBlock1.plt FilterBlock1.exe FilterBlock1.c FilterBlock1_* output.log"); // remove tmp files.
+loadFile("FilterBlock1.mo"); getErrorString();
+simulate(FilterBlock1,numberOfIntervals=2, tolerance=1e-5); getErrorString();
+res := readSimulationResult("FilterBlock1_res.mat",{x, y},4); getErrorString();
 
 
 // Result:
 // true
+// ""
 // record SimulationResult
 //     resultFile = "FilterBlock1_res.mat",
@@ -22 +20 @@
 //     messages = ""
 // end SimulationResult;
-// true
-// dimsize: 3, rows 4
-// 0
+// ""
+// {{0.0,0.0,0.0,0.0},{0.0,0.0,0.0,0.0}}
+// ""
 // endResult