- updated expected output for c++ fmu simulations

Makefile

@@ -24,6 +24,7 @@ cppruntimeFMU1.log \
 cppruntimeFMU2.log \
 cppruntimeUmfpack.log \
 cppruntimeStaticLinking.log \
+cppruntimeGenDebugSymbols.log \
 cppruntimeOMEdit.log \
 taskGraph.log \
 debugDumps.log \
@@ -389,6 +390,9 @@ cppruntimeUmfpack.log: omc-diff
 cppruntimeStaticLinking.log: omc-diff
 	$(MAKE) -j1 -C openmodelica/cppruntime/staticLinking -f Makefile test  > $@
 	@echo $@ done
+cppruntimeGenDebugSymbols.log: omc-diff
+	$(MAKE) -j1 -C openmodelica/cppruntime/genDebugSymbols -f Makefile test  > $@
+	@echo $@ done
 linearization.log: omc-diff
 	$(MAKE) -C openmodelica/linearization -f Makefile test > $@
 	@echo $@ done
@@ -596,6 +600,7 @@ clean_g_2 :
 	$(MAKE) -C openmodelica/cppruntime/fmu/modelExchange/2.0 -f Makefile clean
 	$(MAKE) -C openmodelica/cppruntime/umfpack -f Makefile clean
 	$(MAKE) -C openmodelica/cppruntime/staticLinking -f Makefile clean
+	$(MAKE) -C openmodelica/cppruntime/genDebugSymbols -f Makefile clean
 	$(MAKE) -C openmodelica/cruntime/optimization/basic -f Makefile clean
 	$(MAKE) -C openmodelica/cruntime/xmlFiles -f Makefile clean
 	$(MAKE) -C openmodelica/debugDumps -f Makefile clean

openmodelica/cppruntime/fmu/modelExchange/1.0/Crane_FMU1_CPP.mos

@@ -36,7 +36,34 @@ val(prismatic_v, 1);
 //    simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 150, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'cranes_crane_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //    messages = ""
 // end SimulationResult;
-// ""
-// 0.9493545677180384
-// 0.3948240973756043
+// "[openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1670:3-1670: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1671:3-1671: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1672:3-1672:102:writable] Warning: Parameter bodyShape_frameTranslation_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1673:3-1673:185:writable] Warning: Parameter bodyShape_shape1_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1674:3-1674:183:writable] Warning: Parameter bodyShape_shape2_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="sphere") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1675:3-1675:85:writable] Warning: Parameter bodyShape_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1676:3-1676:191:writable] Warning: Parameter fixedTranslation_shape_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1677:3-1677:92:writable] Warning: Parameter fixedTranslation_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1678:3-1678:177:writable] Warning: Parameter prismatic_box_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="box") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1679:3-1679:186:writable] Warning: Parameter revolute_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
+// [openmodelica/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1680:3-1680: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1681:3-1681: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1682:3-1682: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1683:3-1683: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1684:3-1684: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1685:3-1685: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1686:3-1686: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1687:3-1687: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1688:3-1688: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1689:3-1689: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1690:3-1690: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1691:3-1691: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1692:3-1692: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1693:3-1693: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1694:3-1694: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1695:3-1695: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/cppruntime/fmu/modelExchange/1.0/cranes_crane_me_FMU.mo:1696:3-1696: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.9493545677180412
+// 0.3948240973749629
 // endResult

openmodelica/cppruntime/fmu/modelExchange/2.0/Makefile

@@ -25,7 +25,7 @@ test:
 
 clean :
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
-	@rm -f $(CLEAN)
+	@rm -rf $(CLEAN)
 
 getdeps:
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp

openmodelica/cppruntime/genDebugSymbols/Makefile

@@ -1,7 +1,7 @@
 TEST = ../../../rtest -v
 
 TESTFILES = \
-Modelica.Fluid.Examples.BranchingDynamicPipes.mos
+Modelica.Fluid.Examples.BranchingDynamicPipes_genDebugSymbols.mos
 
 # Run make failingtest
 FAILINGTESTFILES =

openmodelica/cppruntime/hpcom/fmu/modelExchange/1.0/Makefile

@@ -2,8 +2,8 @@ TEST = ../../../../../../rtest -v
 
 
 TESTFILES = \
-CoupledClutches.mos \
-crane.mos
+CoupledClutches_FMU1_CPP_HPCOM.mos \
+Crane_FMU1_CPP_HPCOM.mos
 
 FAILINGTESTFILES =