Update FMI tests to new xml structure.

Move failing tests up.

openmodelica/fmi/ModelExchange/2.0/Makefile

@@ -16,12 +16,12 @@ ZeroStates.mos \
 EnumerationTest.mos \
 Modelica.Blocks.Sources.BooleanPulse.mos \
 Modelica.Electrical.Analog.Examples.ChuaCircuit.mos \
+Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.mos \
+Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.mos \
 
 # test that currently fail. Move up when fixed. 
 # Run make testfailing
 FAILINGTESTFILES= \
-Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.mos \
-Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.mos \
 
 # Dependency files that are not .mo .mos or Makefile
 # Add them here or they will be cleaned.

openmodelica/fmi/ModelExchange/2.0/Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.mos

@@ -1,12 +1,25 @@
 // name:     Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum
-// keywords: simulation MSL Examples
+// keywords: DoublePendulum FMI-Export FMI-Import
 // status: correct
-// teardown_command: rm -rf binaries sources modelDescription.xml Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_* Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU.mo Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.libs Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.lib BouncingBall.so Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.dll Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.c Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.makefile Modelica_from_nxy_*
+// teardown_command: rm -rf Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.* Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum_* binaries sources modelDescription.xml Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU.mo Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.lib* Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.so Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.dll Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_*.c Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_*.h Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_*.o Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_*.json
 // Simulation Results 
 // Modelica Standard Library
 //
 
 loadModel(Modelica);
+simulate(Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum,stopTime=3.0);
+getErrorString();
+
+val(revolute1.phi, 0);
+val(revolute1.phi, 1);
+val(revolute1.phi, 2);
+val(revolute1.phi, 3);
+
+val(revolute2.phi, 0);
+val(revolute2.phi, 1);
+val(revolute2.phi, 2);
+val(revolute2.phi, 3);
+
 translateModelFMU(Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum, version="2.0");
 getErrorString();
 importFMU("Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum.fmu");
@@ -28,6 +41,20 @@ val(revolute2_phi, 3);
 
 // Result:
 // true
+// record SimulationResult
+//     resultFile = "Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     messages = ""
+// end SimulationResult;
+// ""
+// 0.0
+// -2.915113487709522
+// -0.03693230502575465
+// -2.315832532768317
+// 0.0
+// -0.5164246964069449
+// -0.9041244442894454
+// -1.736500374427386
 // "SimCode: The model Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum has been translated to FMU"
 // ""
 // "Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU.mo"
@@ -36,15 +63,16 @@ val(revolute2_phi, 3);
 // ""
 // record SimulationResult
 //     resultFile = "Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Mechanics_MultiBody_Examples_Elementary_DoublePendulum_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
+// ""
 // 0.0
-// -2.9151134877484743
-// -0.036932304869208676
-// -2.315833281802642
+// -2.915113487709145
+// -0.03693230502957622
+// -2.315832532793247
 // 0.0
-// -0.5164246962637027
-// -0.9041244419923411
-// -1.7364994721877753
+// -0.516424696407867
+// -0.904124444176797
+// -1.736500372024582
 // endResult

openmodelica/fmi/ModelExchange/2.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.mos

@@ -1,12 +1,15 @@
 // name:     Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum
-// keywords: simulation MSL Examples
+// keywords: Pendulum FMI-Export FMI-Import
 // status: correct
-// teardown_command: rm -rf binaries sources modelDescription.xml Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_* Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.libs Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.lib Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.so Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.dll Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.c Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.makefile Modelica_from_nxy_*
-// Simulation Results 
-// Modelica Standard Library
+// teardown_command: rm -rf Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.* Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum_* binaries sources modelDescription.xml Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.lib* Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.so Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.dll Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_*.c Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_*.h Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_*.o Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_*.json
 //
 
 loadModel(Modelica); getErrorString();
+simulate(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum,stopTime=3.0); getErrorString();
+val(rev.phi, 0);
+val(rev.phi, 1);
+val(rev.phi, 2);
+val(rev.phi, 3);
 translateModelFMU(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum, version="2.0"); getErrorString();
 importFMU("Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.fmu"); getErrorString();
 loadFile("Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo"); getErrorString();
@@ -19,6 +22,16 @@ val(rev_phi, 3);
 // Result:
 // true
 // ""
+// record SimulationResult
+//     resultFile = "Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     messages = ""
+// end SimulationResult;
+// ""
+// 0.0
+// -2.580150841077486
+// -1.57760305358518
+// -0.8529875495512299
 // "SimCode: The model Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum has been translated to FMU"
 // ""
 // "Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo"
@@ -30,29 +43,9 @@ val(rev_phi, 3);
 //     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// "[openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1082:3-1082:182:writable] Warning: Parameter body_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1083:3-1083:178:writable] Warning: Parameter body_sphere_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="sphere") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1084:3-1084:181:writable] Warning: Parameter rev_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1085:3-1085:187:writable] Warning: Parameter world_gravityArrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1086:3-1086:191:writable] Warning: Parameter world_gravityArrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1087:3-1087:90:writable] Warning: Parameter world_label1 has no value, and is fixed during initialization (fixed=true), using available start value (start="x") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1088:3-1088:88:writable] Warning: Parameter world_label2 has no value, and is fixed during initialization (fixed=true), using available start value (start="y") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1089:3-1089:182:writable] Warning: Parameter world_x_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1090:3-1090:186:writable] Warning: Parameter world_x_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1091:3-1091:195:writable] Warning: Parameter world_x_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1092:3-1092:195:writable] Warning: Parameter world_x_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1093:3-1093:182:writable] Warning: Parameter world_y_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1094:3-1094:186:writable] Warning: Parameter world_y_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1095:3-1095:195:writable] Warning: Parameter world_y_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1096:3-1096:195:writable] Warning: Parameter world_y_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1097:3-1097:182:writable] Warning: Parameter world_z_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1098:3-1098:186:writable] Warning: Parameter world_z_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1099:3-1099:195:writable] Warning: Parameter world_z_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1100:3-1100:195:writable] Warning: Parameter world_z_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1101:3-1101:195:writable] Warning: Parameter world_z_label_cylinders_3__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
-// "
+// ""
 // 0.0
-// -2.580150841078529
-// -1.577603053583751
-// -0.8529875495514738
+// -2.580150841078526
+// -1.577603053583732
+// -0.8529875495514888
 // endResult

openmodelica/fmi/ModelExchange/2.0/testBug2764.mos

@@ -103,7 +103,7 @@ readFile("modelDescription.tmp.xml");
 //     valueReference=\"4\"
 //     variability=\"continuous\"
 //     causality=\"input\"
-//     initial=\"approx\">
+//     >
 //     <Real start=\"-2.0\"/>
 //   </ScalarVariable>
 //   <!-- Index of variable = \"6\" -->

openmodelica/fmi/ModelExchange/2.0/testBug3049.mos

@@ -58,7 +58,7 @@ readFile("modelDescription.tmp.xml");
 //     valueReference=\"0\"
 //     variability=\"continuous\"
 //     causality=\"output\"
-//     initial=\"approx\">
+//     initial=\"exact\">
 //     <Real start=\"100000.0\" min=\"0.0\" nominal=\"100000.0\"/>
 //   </ScalarVariable>
 //   <!-- Index of variable = \"2\" -->
@@ -67,7 +67,7 @@ readFile("modelDescription.tmp.xml");
 //     valueReference=\"1\"
 //     variability=\"continuous\"
 //     causality=\"output\"
-//     initial=\"approx\">
+//     initial=\"exact\">
 //     <Real start=\"5000000.0\" min=\"611.657\" max=\"100000000.0\" nominal=\"1000000.0\"/>
 //   </ScalarVariable>
 //   <!-- Index of variable = \"3\" -->
@@ -76,7 +76,7 @@ readFile("modelDescription.tmp.xml");
 //     valueReference=\"2\"
 //     variability=\"continuous\"
 //     causality=\"output\"
-//     initial=\"approx\">
+//     initial=\"exact\">
 //     <Real start=\"100000.0\" min=\"0.0\" nominal=\"10000000.0\"/>
 //   </ScalarVariable>
 //   </ModelVariables>