Merge branch 'master' into qss

Makefile

@@ -509,6 +509,9 @@ cse.log: omc-diff
 modelica3d.log: omc-diff
 	$(MAKE) -C simulation/libraries/3rdParty/Modelica3D -f Makefile test > $@
 	@echo $@ done
+hummod.log: omc-diff
+	$(MAKE) -C simulation/libraries/3rdParty/HumMod -f Makefile test > $@
+	@echo $@ done
 
 failingtest: omc-diff
 	cd mofiles; $(MAKE) -f Makefile failingtest; \

ReferenceFiles/README.md

@@ -39,5 +39,19 @@ for f in *.mat; do
 done
 ```
 
+```bash
+for f in *.mos; do
+  # MAT=`echo $f | sed "s/[.]mos/.mat/"`
+  MAT=`echo $f | sed "s/[.]mos//" | rev | cut -d. -f1 | rev`.mat
+  VARS=`grep -v "^//" $f | grep -v loadModel | grep "{[^{]*}"`
+  cat > a.mos <<EOL
+filterSimulationResults("$MAT","ReferenceFiles/$MAT",$VARS
+getErrorString();
+EOL
+  omc a.mos
+  rm -f a.mos
+done
+```
+
 If the model uses the model testing scripts, you might be able to
 simply change the common file to produce the filtered outputs directly.

flattening/libraries/3rdParty/Exercises/Makefile

@@ -1,10 +1,9 @@
 TEST = ../../../../rtest -v
 
 TESTFILES = \
-instExercises.mos \
 checkExercises.mos
 
-# test that currently fail. Move up when fixed. 
+# test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES= \
 
@@ -20,20 +19,20 @@ DEPENDENCIES = \
 *.mo \
 *.mos \
 README.txt \
-Makefile 
+Makefile
 
 CLEAN = `ls | grep -w -v -f deps.tmp`
 
-.PHONY : test clean getdeps failingtest 
+.PHONY : test clean getdeps failingtest
 
 test:
 	@echo
 	@echo Running tests...
 	@echo
 	@echo OPENMODELICAHOME=" $(OPENMODELICAHOME) "
 	@$(TEST) $(TESTFILES)
-	
-# Cleans all files that are not listed as dependencies 
+
+# Cleans all files that are not listed as dependencies
 clean :
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
 	@rm -rf $(CLEAN)
@@ -42,11 +41,11 @@ clean :
 # do it after cleaning and updating the folder
 # then you can get a list of file names (which must be dependencies
 # since you got them from repository + your own new files)
-# then add them to the DEPENDENCIES. You can find the 
-# list in deps.txt 
-getdeps: 
+# then add them to the DEPENDENCIES. You can find the
+# list in deps.txt
+getdeps:
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
-	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt	
+	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt
 	@echo Dependency list saved in deps.txt.
 	@echo Copy the list from deps.txt and add it to the Makefile @DEPENDENCIES
 

flattening/libraries/3rdParty/PlanarMechanics/Makefile

@@ -1,10 +1,9 @@
 TEST = ../../../../rtest -v
 
 TESTFILES = \
-instantiatePlanarMechanicsForTesting.mos \
-checkPlanarMechanicsForTesting.mos 
+checkPlanarMechanicsForTesting.mos
 
-# test that currently fail. Move up when fixed. 
+# test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=  \
 
@@ -15,8 +14,8 @@ FAILINGTESTFILES=  \
 DEPENDENCIES = \
  *.mo \
  *.mos \
- Makefile 
-	
+ Makefile
+
 
 CLEAN = `ls | grep -w -v -f deps.tmp`
 
@@ -29,7 +28,7 @@ test :
 	@echo OPENMODELICAHOME=" $(OPENMODELICAHOME) "
 	@$(TEST) $(TESTFILES)
 
-# Cleans all files that are not listed as dependencies 
+# Cleans all files that are not listed as dependencies
 clean :
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
 	@rm -f $(CLEAN)
@@ -38,14 +37,14 @@ clean :
 # do it after cleaning and updating the folder
 # then you can get a list of file names (which must be dependencies
 # since you got them from repository + your own new files)
-# then add them to the DEPENDENCIES. You can find the 
-# list in deps.txt 
-getdeps: 
+# then add them to the DEPENDENCIES. You can find the
+# list in deps.txt
+getdeps:
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
-	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt	
+	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt
 	@echo Dependency list saved in deps.txt.
 	@echo Copy the list from deps.txt and add it to the Makefile @DEPENDENCIES
-	
+
 failingtest :
 	@echo
 	@echo Running failing tests...

flattening/libraries/3rdParty/SiemensPower/SiemensPower.Components.Pipes.Tests.tube_test.mos

@@ -0,0 +1,22 @@
+// name:     SiemensPower.Components.Pipes.Tests.tube_test.mos
+// keywords: SiemensPower fluid
+// status:   correct
+// teardown_comment:
+//
+//
+//
+
+setCommandLineOptions("+d=acceptTooManyFields");
+loadModel(SiemensPower, {"2.2"}); getErrorString();
+
+checkModel(SiemensPower.Components.Pipes.Tests.tube_test); getErrorString();
+
+// Result:
+// true
+// true
+// ""
+// "Check of SiemensPower.Components.Pipes.Tests.tube_test completed successfully.
+// Class SiemensPower.Components.Pipes.Tests.tube_test has 2465 equation(s) and 2465 variable(s).
+// 1493 of these are trivial equation(s)."
+// ""
+// endResult