expected output for cpp tests

OpenModelica · Aug 24, 2015 · c11efa1 · c11efa1
1 parent 44ef6fe
commit c11efa1
Show file tree

Hide file tree

Showing 10 changed files with 993 additions and 982 deletions.
diff --git a/...ion/libraries/msl32_cpp/Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling.mos b/...ion/libraries/msl32_cpp/Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling.mos
@@ -8,7 +8,7 @@
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
+modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling);
 compareVars :=
 {
@@ -29,20 +29,22 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.SimpleSimulation
+// OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling
 // {"dcpm.la.i","loadInertia.phi","loadInertia.w","cooling.T","armature.T","core.T","volumeFlow.T"}
 // "OpenModelicaModelTesting.SimulationRuntime.Cpp
 // "
 // ""
 // Simulation options: startTime = 0.0, stopTime = 25.0, numberOfIntervals = 25000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
 // Result file: Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling_res.mat
-// [Modelica 3.2.1/Electrical/Machines.mo:13497:7-13501:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element final  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 and  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 on component m.
-// [Modelica 3.2.1/Electrical/Machines.mo:13497:7-13501:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element  = (typed)dcpm.ViNominal, type:
+// Files Equal!
+// [Modelica 3.2.1/Electrical/Machines.mo:13518:7-13522:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element final  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 and  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 on component m.
+// [Modelica 3.2.1/Electrical/Machines.mo:13518:7-13522:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element  = (typed)dcpm.ViNominal, type:
 // DAE.PROP(Real(quantity = "ElectricPotential", unit = "V"), C_PARAM) and  = (typed)95.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 95.0 on component VRef.
-// [Modelica 3.2.1/Electrical/Machines.mo:13497:7-13501:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element final  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 and  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 on component m.
+// [Modelica 3.2.1/Electrical/Machines.mo:13518:7-13522:42:writable] Error: Variable dcpm.coreParameters: Duplicate modification of element final  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 and  = (typed)1 DAE.PROP(Integer, C_CONST), value: 1 on component m.
 // Error: Duplicate modification of element  = (typed)dcpm.ViNominal, type:
 // DAE.PROP(Real(quantity = "ElectricPotential", unit = "V"), C_PARAM) and  = (typed)95.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 95.0 on component VRef.
+// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
 // 
 // "true
 // "

diff --git a/...ibraries/msl32_cpp/Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse.mos b/...ibraries/msl32_cpp/Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse.mos
@@ -8,7 +8,7 @@
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
+modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
 modelName := $TypeName(Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse);
 compareVars :=
 {
@@ -22,19 +22,20 @@ runScript("common.mos");getErrorString();
 
 runScript(modelTesting);getErrorString();
 
+
 // Result:
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.Compilation
+// OpenModelicaModelTesting.Kind.SimpleSimulation
 // Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse
 // {"cDC1.v","cDC2.v","transformer1.l2sigma.inductor[1].i","transformer1.l2sigma.inductor[3].i"}
 // "OpenModelicaModelTesting.SimulationRuntime.Cpp
 // "
 // ""
-// Compilation succeeded
+// Simulation options: startTime = 0.0, stopTime = 0.1, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
+// Result file: Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse_res.mat
 // "true
 // "
 // ""
 // endResult
-
diff --git a/simulation/libraries/msl32_cpp/Modelica.Electrical.Spice3.Examples.Graetz.mos b/simulation/libraries/msl32_cpp/Modelica.Electrical.Spice3.Examples.Graetz.mos
@@ -9,7 +9,7 @@
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
 
-modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
+modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Electrical.Spice3.Examples.Graetz);
 compareVars :=
 {
@@ -25,14 +25,15 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.SimpleSimulation
+// OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Spice3.Examples.Graetz
 // {"D1.pin","D3.n.v"}
 // "OpenModelicaModelTesting.SimulationRuntime.Cpp
 // "
 // ""
 // Simulation options: startTime = 0.0, stopTime = 0.025, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Spice3.Examples.Graetz', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
 // Result file: Modelica.Electrical.Spice3.Examples.Graetz_res.mat
+// Files Equal!
 // "true
 // "
 // ""