Changeset 22a8249 in OpenModelica

Timestamp:

2023-03-22T15:21:34+01:00 (14 months ago)

Author:

AnHeuermann <andreas.heuermann@…>

Children:

d6fb23cd

Parents:

e8d53f78

Message:

Fix for Windows

Location:

testsuite/openmodelica/fmi/CoSimulation/2.0

Files:

• ExportCvodeFmu_cmake.mos (modified) (2 diffs)
• ExportCvodeFmu_dynamic.mos (modified) (2 diffs)
• ExportCvodeFmu_static.mos (modified) (2 diffs)

testsuite/openmodelica/fmi/CoSimulation/2.0/ExportCvodeFmu_cmake.mos

@@ -2 +2 @@
 // keywords: fmu export simulation flags
 // status: correct
-// teardown_command: rm -rf *.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum* Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum*  Pendulum-dynamic* Pendulum_dynamic* Pendulum_cs_systemCall* Pendulum_flags_dynamic.json
+// teardown_command: rm -rf Pendulum*  Pendulum-dynamic* Pendulum_dynamic* Pendulum_cs_systemCall* Pendulum_flags_dynamic.json
 // cflags: -d=-newInst
 //
-// Export Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum as 2.0 CS FMU with CVODE solver
+// Export Pendulum as 2.0 CS FMU with CVODE solver
 
 // Generate FMU
 loadModel(Modelica, {"3.2.3"}); getErrorString();
+loadString("model Pendulum
+extends Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum;
+end Pendulum;"); getErrorString();
+
 setCommandLineOptions("--fmiFlags=s:cvode --fmuCMakeBuild=true"); getErrorString();
-buildModelFMU(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum, version = "2.0", fmuType="cs", platforms={"dynamic"}); getErrorString();
+buildModelFMU(Pendulum, version = "2.0", fmuType="cs", platforms={"dynamic"}); getErrorString();
 
 // Check _flags.json for simulation flags
-system("unzip -cqq Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu resources/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_flags.json > Pendulum_flags_dynamic.json"); getErrorString();
+system("unzip -cqq Pendulum.fmu resources/Pendulum_flags.json > Pendulum_flags_dynamic.json"); getErrorString();
 readFile("Pendulum_flags_dynamic.json"); getErrorString();
 
 // Simulate with OMSimulator
-system(getInstallationDirectoryPath() + "/bin/OMSimulator Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu --mode=cs --tolerance=1e-6 --resultFile=\"Pendulum_dynamic_res.mat\" --stopTime=1.0 --suppressPath=true --tempDir=\"Pendulum-dynamic-tmp\"", "Pendulum_cs_systemCall.log"); getErrorString();
+system(getInstallationDirectoryPath() + "/bin/OMSimulator Pendulum.fmu --mode=cs --tolerance=1e-6 --resultFile=\"Pendulum_dynamic_res.mat\" --stopTime=1.0 --suppressPath=true --tempDir=\"Pendulum-dynamic-tmp\"", "Pendulum_cs_systemCall.log"); getErrorString();
 readFile("Pendulum_cs_systemCall.log");
 
@@ -33 +37 @@
 // true
 // ""
-// "Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu"
+// true
+// ""
+// "Pendulum.fmu"
 // ""
 // 0

testsuite/openmodelica/fmi/CoSimulation/2.0/ExportCvodeFmu_dynamic.mos

@@ -2 +2 @@
 // keywords: fmu export simulation flags
 // status: correct
-// teardown_command: rm -rf *.fmu Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum* Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum*  Pendulum-dynamic* Pendulum_dynamic* Pendulum_cs_systemCall* Pendulum_flags_dynamic.json
+// teardown_command: rm -rf *.fmu Pendulum* Pendulum*  Pendulum-dynamic* Pendulum_dynamic* Pendulum_cs_systemCall* Pendulum_flags_dynamic.json
 // cflags: -d=-newInst
 //
-// Export Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum as 2.0 CS FMU with CVODE solver
+// Export Pendulum as 2.0 CS FMU with CVODE solver
 
 // Generate FMU
 loadModel(Modelica, {"3.2.3"}); getErrorString();
+loadString("model Pendulum
+extends Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum;
+end Pendulum;"); getErrorString();
 setCommandLineOptions("--fmiFlags=s:cvode"); getErrorString();
-buildModelFMU(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum, version = "2.0", fmuType="cs", platforms={"dynamic"}); getErrorString();
+buildModelFMU(Pendulum, version = "2.0", fmuType="cs", platforms={"dynamic"}); getErrorString();
 
 // Check _flags.json for simulation flags
-system("unzip -cqq Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu resources/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_flags.json > Pendulum_flags_dynamic.json"); getErrorString();
+system("unzip -cqq Pendulum.fmu resources/Pendulum_flags.json > Pendulum_flags_dynamic.json"); getErrorString();
 readFile("Pendulum_flags_dynamic.json"); getErrorString();
 
 // Simulate with OMSimulator
-system(getInstallationDirectoryPath() + "/bin/OMSimulator Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu --mode=cs --tolerance=1e-6 --resultFile=\"Pendulum_dynamic_res.mat\" --stopTime=1.0 --suppressPath=true --tempDir=\"Pendulum-dynamic-tmp\"", "Pendulum_cs_systemCall.log"); getErrorString();
+system(getInstallationDirectoryPath() + "/bin/OMSimulator Pendulum.fmu --mode=cs --tolerance=1e-6 --resultFile=\"Pendulum_dynamic_res.mat\" --stopTime=1.0 --suppressPath=true --tempDir=\"Pendulum-dynamic-tmp\"", "Pendulum_cs_systemCall.log"); getErrorString();
 readFile("Pendulum_cs_systemCall.log");
 
@@ -33 +36 @@
 // true
 // ""
-// "Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu"
+// "Pendulum.fmu"
 // ""
 // 0

testsuite/openmodelica/fmi/CoSimulation/2.0/ExportCvodeFmu_static.mos

@@ -2 +2 @@
 // keywords: fmu export simulation flags
 // status: correct
-// teardown_command: rm -rf *.fmu Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum* Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum* Pendulum-static* Pendulum_static* Pendulum_me_cs_systemCall.log Pendulum_flags_static.json
+// teardown_command: rm -rf *.fmu Pendulum* Pendulum-static* Pendulum_static* Pendulum_me_cs_systemCall.log Pendulum_flags_static.json
 // cflags: -d=-newInst
 //
-// Export Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum as 2.0 CS FMU with CVODE solver
+// Export Pendulum as 2.0 CS FMU with CVODE solver
 
 // Generate FMU
 loadModel(Modelica, {"3.2.3"}); getErrorString();
+loadString("model Pendulum
+extends Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum;
+end Pendulum;"); getErrorString();
 setCommandLineOptions("--fmiFlags=s:cvode"); getErrorString();
-translateModelFMU(Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum, version = "2.0", fmuType="me_cs"); getErrorString();
+translateModelFMU(Pendulum, version = "2.0", fmuType="me_cs"); getErrorString();
 
 // Check _flags.json for simulation flags
-system("unzip -cqq Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu resources/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_flags.json > Pendulum_flags_static.json"); getErrorString();
+system("unzip -cqq Pendulum.fmu resources/Pendulum_flags.json > Pendulum_flags_static.json"); getErrorString();
 readFile("Pendulum_flags_static.json"); getErrorString();
 
 // Simulate with OMSimulator
-system(getInstallationDirectoryPath() + "/bin/OMSimulator Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu --mode=cs --tolerance=1e-6 --stopTime=1.0 --resultFile=\"Pendulum_static_res.mat\" --suppressPath=true --tempDir=\"Pendulum-static-tmp\"", "Pendulum_me_cs_systemCall.log"); getErrorString();
+system(getInstallationDirectoryPath() + "/bin/OMSimulator Pendulum.fmu --mode=cs --tolerance=1e-6 --stopTime=1.0 --resultFile=\"Pendulum_static_res.mat\" --suppressPath=true --tempDir=\"Pendulum-static-tmp\"", "Pendulum_me_cs_systemCall.log"); getErrorString();
 readFile("Pendulum_me_cs_systemCall.log"); getErrorString();
 
@@ -33 +36 @@
 // true
 // ""
-// "Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu"
+// true
+// ""
+// "Pendulum.fmu"
 // ""
 // 0