Merge branch 'master' into issue4153_devPostRelease

Author: mwetter

.github/workflows/formatting.yml

@@ -40,7 +40,7 @@ jobs:
         run: pip3 install --upgrade pip wheel
 
       - name: "Install BuildingsPy"
-        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
+        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.2.0
 
       - name: Check for UTF-8 BOM
         run : |

.travis.yml

@@ -31,7 +31,7 @@ services:
 env:
   global:
     - DOCKER_REPONAME=lbnlblum
-    - BUILDINGSPY_VERSION=BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
+    - BUILDINGSPY_VERSION=BuildingsPy@v5.2.0
     - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-1
@@ -161,7 +161,7 @@ install:
       export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
       pip3 install pandas==1.3.5;
     fi;
-  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
+  - if [[ "$TEST_ARG" == *EnergyPlus_24_2_0* ]] || [[ "$TEST_ARG" == *Buildings.{Obsolete* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
       echo "Installing Spawn binaries";
       Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
     fi;

Buildings/Resources/Scripts/BuildingsPy/conf.yml

@@ -480,6 +480,10 @@
   dymola:
     comment: Requires docker update to Ubuntu 22.04 due to libgc.
     simulate: false
+- model_name: Buildings.ThermalZones.EnergyPlus_24_2_0.Examples.SmallOffice.ASHRAE2006Spring
+  openmodelica:
+    comment: timed out after 600 seconds on travis but works locally
+    simulate: false
 - model_name: Buildings.ThermalZones.EnergyPlus_24_2_0.Examples.SmallOffice.ASHRAE2006Summer
   openmodelica:
     comment: timed out after 300 seconds
@@ -512,6 +516,14 @@
 - model_name: Buildings.ThermalZones.EnergyPlus_24_2_0.Examples.SmallOffice.Unconditioned
   optimica:
     rtol: 1.0e-08
+- model_name: Buildings.ThermalZones.EnergyPlus_24_2_0.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings
+  openmodelica:
+    comment: error during shutdown, https://github.com/lbl-srg/modelica-buildings/issues/3345
+    simulate: false
+- model_name: Buildings.ThermalZones.EnergyPlus_24_2_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings
+  openmodelica:
+    comment: error during shutdown, https://github.com/lbl-srg/modelica-buildings/issues/3345
+    simulate: false
 - model_name: Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.TestCase11
   openmodelica:
     comment: Inputs differ by more than threShold. Check output 'satisfied' for when violation(s) happened. Segmentation fault (core dumped)

Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos

@@ -9,6 +9,10 @@ convertClear();
 convertClass("Buildings.ThermalZones.EnergyPlus_9_6_0",
              "Buildings.Obsolete.ThermalZones.EnergyPlus_9_6_0");
 
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/4134
+convertModifiers("Buildings.DHC.ETS.Combined.Controls.Reset",
+                 {"THeaWatSupSetMin"}, {"TWatSupSetMinMax"}, true);
+
 // Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1956
 convertModifiers("Buildings.Fluid.SolarCollectors.ASHRAE93",
                 {"nPanelsSer"}, fill("",0), true);

Buildings/Resources/Scripts/travis/Makefile

@@ -83,7 +83,7 @@ test-openmodelica-spawn-spaces-success:
 	@mkdir -p $(TMP)
 	@chmod a+rwx $(TMP)
 	@cp -rp $(ROOT)/Buildings $(TMP)/
-	@mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0
+	@mv $(TMP)/Buildings $(TMP)/Buildings\ 12.0.0
 	@cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP)
 	@(cd  $(TMP) && \
 	  echo "clearCommandLineOptions();\n" \
@@ -96,7 +96,7 @@ test-openmodelica-spawn-spaces-success:
 	"setMatchingAlgorithm(\"PFPlusExt\");\n" \
 	"setIndexReductionMethod(\"dynamicStateSelection\");\n" \
 	"loadModel(Modelica, {\"4.0.0\"});\n" \
-	"loadFile(\"Buildings 9.0.0/package.mo\");\n" \
+	"loadFile(\"Buildings 12.0.0/package.mo\");\n" \
 	"loadFile(\"SpawnTest.mo\");\n" \
 	"simulate(SpawnTest);\n" \
 	"getErrorString();" > openmod.mos )
@@ -113,7 +113,7 @@ test-openmodelica-spawn-spaces-failure:
 	@mkdir -p $(TMP)
 	@chmod a+rwx $(TMP)
 	@cp -rp $(ROOT)/Buildings $(TMP)/
-	@mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0
+	@mv $(TMP)/Buildings $(TMP)/Buildings\ 12.0.0
 	@cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP)
 	@(cd  $(TMP) && \
 	  echo "clearCommandLineOptions();\n" \
@@ -126,7 +126,7 @@ test-openmodelica-spawn-spaces-failure:
 	"setMatchingAlgorithm(\"PFPlusExt\");\n" \
 	"setIndexReductionMethod(\"dynamicStateSelection\");\n" \
 	"loadModel(Modelica, {\"4.0.0\"});\n" \
-	"loadFile(\"Buildings 9.0.0/package.mo\");\n" \
+	"loadFile(\"Buildings 12.0.0/package.mo\");\n" \
 	"loadFile(\"SpawnTest.mo\");\n" \
 	"simulate(SpawnTest);\n" \
 	"getErrorString();" > openmod.mos )
@@ -140,7 +140,7 @@ test-dymola-spawn-spaces:
 	@$(eval TMP := $(shell mktemp --suffix=-LBL-Buildings -d))
 	@mkdir -p $(TMP)
 	@cp -rp $(ROOT)/Buildings $(TMP)/
-	@mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0
+	@mv $(TMP)/Buildings $(TMP)/Buildings\ 12.0.0
 	@cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP)
 	@(cd  $(TMP) && \
 	  echo "simulateModel(\"SpawnTest\", stopTime=432000, method=\"Cvode\", tolerance=1e-06);" > run.mos && \

Buildings/Resources/Scripts/travis/pyfmi/runSpawnFromOtherDirectory.py

@@ -83,7 +83,7 @@ def run_test(pathVariable):
          "des": "my-bin"},
         {"src": os.path.abspath(os.path.join("Buildings", "Resources", "weatherdata")),
          "des": "some_weather_directory_that_the_fmu_does_not_know_about"},
-        {"src": os.path.abspath(os.path.join("Buildings", "Resources", "Data", "ThermalZones", "EnergyPlus_9_6_0")),
+        {"src": os.path.abspath(os.path.join("Buildings", "Resources", "Data", "ThermalZones", "EnergyPlus_24_2_0")),
          "des": "some_idf_directory_that_the_fmu_does_not_know_about"},
     ]
 

Buildings/UsersGuide/ReleaseNotes/Version_11_1_0.mo

@@ -14,7 +14,7 @@ OPTIMICA 1.55.11 and recent versions of Impact.
 </p>
 <p>
 This backward compatible version adds a new package with heat pump models
-that can be operate in reversible model to provide heating or cooling,
+that can be operate in reversible mode to provide heating or cooling,
 and that can be configured to use various approaches to compute performance, such as
 data tables or Carnot analogy.
 </p>