- changed CoupleClutches test of FMU 2.0 ModelExchange (C++ Runtime) …

…to a verified simulation test - all FMU test of the cpp runtime are working now as verified simulations - changed the names of the mos-files, so that they can be identified in the hudson-jobs more easily
OpenModelica · Jul 28, 2015 · 5b0f74e · 5b0f74e
1 parent b801d5c
commit 5b0f74e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/...fmu/modelExchange/1.0/CoupledClutches.mos → ...Exchange/1.0/CoupledClutches_FMU1_CPP.mos b/...fmu/modelExchange/1.0/CoupledClutches.mos → ...Exchange/1.0/CoupledClutches_FMU1_CPP.mos
diff --git a/...ppruntime/fmu/modelExchange/1.0/crane.mos → .../fmu/modelExchange/1.0/Crane_FMU1_CPP.mos b/...ppruntime/fmu/modelExchange/1.0/crane.mos → .../fmu/modelExchange/1.0/Crane_FMU1_CPP.mos
@@ -13,7 +13,7 @@ importFMU("cranes_crane.fmu", "<default>"); getErrorString();
 loadFile("cranes_crane_me_FMU.mo"); getErrorString();
 simulate(cranes_crane_me_FMU, numberOfIntervals=150); getErrorString();
 
-//simulate(cranes.crane, numberOfIntervals=150); getErrorString();
+//simulate(cranes.crane, numberOfIntervals=150, simflags="-N newton"); getErrorString();
 
 val(position_s, 1);
 val(prismatic_v, 1);

diff --git a/openmodelica/cppruntime/fmu/modelExchange/1.0/Makefile b/openmodelica/cppruntime/fmu/modelExchange/1.0/Makefile
@@ -2,8 +2,8 @@ TEST = ../../../../../rtest -v
 
 
 TESTFILES = \
-CoupledClutches.mos \
-crane.mos
+CoupledClutches_FMU1_CPP.mos \
+Crane_FMU1_CPP.mos
 
 FAILINGTESTFILES =
 

diff --git a/...fmu/modelExchange/2.0/CoupledClutches.mos → ...Exchange/2.0/CoupledClutches_FMU2_CPP.mos b/...fmu/modelExchange/2.0/CoupledClutches.mos → ...Exchange/2.0/CoupledClutches_FMU2_CPP.mos
@@ -9,9 +9,14 @@ setCommandLineOptions("+simCodeTarget=Cpp"); getErrorString();
 loadFile("CoupledClutches.mo"); getErrorString();
 translateModelFMU(CoupledClutches, version = "2.0"); getErrorString();
 
-//importFMU("CoupledClutches.fmu"); getErrorString();
-//loadFile("CoupledClutches_me_FMU.mo"); getErrorString();
-//simulate(CoupledClutches_me_FMU, numberOfIntervals=150, variableFilter="J1_w1|J2_w1|J3_w1|J4_w1"); getErrorString();
+importFMU("CoupledClutches.fmu"); getErrorString();
+loadFile("CoupledClutches_me_FMU.mo"); getErrorString();
+simulate(CoupledClutches_me_FMU, numberOfIntervals=150, variableFilter="J1_w1|J2_w1|J3_w1|J4_w1"); getErrorString();
+
+val(J1_w1, 1);
+val(J2_w1, 1);
+val(J3_w1, 1);
+val(J4_w1, 1);
 
 // Result:
 // true
@@ -23,4 +28,18 @@ translateModelFMU(CoupledClutches, version = "2.0"); getErrorString();
 // "SimCode: The model CoupledClutches has been translated to FMU"
 // "Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
 // "
+// "CoupledClutches_me_FMU.mo"
+// ""
+// true
+// ""
+// record SimulationResult
+// resultFile = "CoupledClutches_me_FMU_res.mat",
+// simulationOptions = "startTime = 0.0, stopTime = 1.5, numberOfIntervals = 150, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'CoupledClutches_me_FMU', options = '', outputFormat = 'mat', variableFilter = 'J1_w1|J2_w1|J3_w1|J4_w1', cflags = '', simflags = ''",
+// messages = ""
+// end SimulationResult;
+// ""
+// 3.235510485522502
+// 3.382296491595568
+// 3.382296493634146
+// 7.492717557511241e-11
 // endResult
diff --git a/openmodelica/cppruntime/fmu/modelExchange/2.0/Makefile b/openmodelica/cppruntime/fmu/modelExchange/2.0/Makefile
@@ -2,7 +2,7 @@ TEST = ../../../../../rtest -v
 
 
 TESTFILES = \
-CoupledClutches.mos
+CoupledClutches_FMU2_CPP.mos
 
 FAILINGTESTFILES =