- FMU 1.0 test is now working again, if a nls is part of the model

OpenModelica · Jul 27, 2015 · b801d5c · b801d5c
1 parent 924fa65
commit b801d5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/openmodelica/cppruntime/fmu/modelExchange/1.0/Makefile b/openmodelica/cppruntime/fmu/modelExchange/1.0/Makefile
@@ -2,9 +2,10 @@ TEST = ../../../../../rtest -v
 
 
 TESTFILES = \
-CoupledClutches.mos
+CoupledClutches.mos \
+crane.mos
 
-FAILINGTESTFILES = crane.mos
+FAILINGTESTFILES =
 
 DEPENDENCIES = \
 *.mo \

diff --git a/openmodelica/cppruntime/fmu/modelExchange/1.0/crane.mos b/openmodelica/cppruntime/fmu/modelExchange/1.0/crane.mos
@@ -6,14 +6,14 @@
 loadModel(Modelica); getErrorString();
 setCommandLineOptions("+simCodeTarget=Cpp"); getErrorString();
 loadFile("cranes.mo"); getErrorString();
-//translateModelFMU(cranes.crane); getErrorString();
+translateModelFMU(cranes.crane); getErrorString();
 
 //importFMU("cranes_crane.fmu", "<default>", 6, false, true); getErrorString();
-//importFMU("cranes_crane.fmu", "<default>"); getErrorString();
-//loadFile("cranes_crane_me_FMU.mo"); getErrorString();
-//simulate(cranes_crane_me_FMU, numberOfIntervals=150); getErrorString();
+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, simflags="-N newton"); getErrorString();
+//simulate(cranes.crane, numberOfIntervals=150); getErrorString();
 
 val(position_s, 1);
 val(prismatic_v, 1);