Merge branch 'master' into issues1935_unprotectdhDiscretizedDoor

.github/workflows/formatting.yml

@@ -39,7 +39,7 @@ jobs:
         run: pip3 install --upgrade pip wheel
 
       - name: "Install BuildingsPy"
-        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c
+        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.1.0
 
 
       - name: "Test html syntax"

.travis.yml

@@ -21,8 +21,8 @@ services:
 env:
   global:
     - DOCKER_REPONAME=lbnlblum
-    - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0
-    - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
+    - BUILDINGSPY_VERSION=BuildingsPy@v5.1.0
+    - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
 
   jobs:

IBPSA/Resources/Scripts/BuildingsPy/conf.yml

@@ -61,54 +61,10 @@
   openmodelica:
     comment: Timeout after 300 s
     time_out: 600
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.Validation.TemperatureResponseMatrix
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_1borehole_5meters
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_SmallScaleValidation
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.Analytic_20Years
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.FiniteDifference_1Week
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.Measured_SmallScale
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.Geothermal.Borefields.Validation.Sandbox
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: IBPSA.Fluid.HeatPumps.ModularReversible.Examples.AirToWater2D_OneRoomRadiator
-  openmodelica:
-    comment: returned non-zero exit status 2. Works with April 30 2024 nightly build.
-    translate: false
 - model_name: IBPSA.Fluid.HeatPumps.ModularReversible.Examples.LargeScaleWaterToWater_OneRoomRadiator
   openmodelica:
-    comment: simulation terminated by an assertion at initialization. Works with April 30 2024 nightly build.
-    translate: false
-- model_name: IBPSA.Fluid.Movers.Validation.ComparePowerHydraulic
-  openmodelica:
-    comment: 'Fail to translate due to OpenModelica glitch. Fixed in https://github.com/OpenModelica/OpenModelica/issues/12484'
-    translate: false
-- model_name: IBPSA.Fluid.Movers.Validation.ComparePowerInput
-  openmodelica:
-    comment: 'Fail to translate due to OpenModelica glitch. Fixed in https://github.com/OpenModelica/OpenModelica/issues/12484'
-    translate: false
-- model_name: IBPSA.Fluid.Movers.Validation.ComparePowerTotal
-  openmodelica:
-    comment: 'Fail to translate due to OpenModelica glitch. Fixed in https://github.com/OpenModelica/OpenModelica/issues/12484'
-    translate: false
+    comment: simulation terminated by an assertion at initialization.
+    simulate: false
 - model_name: IBPSA.ThermalZones.ReducedOrder.Validation.VDI6007.TestCase11
   openmodelica:
     comment: returned non-zero exit status 139

bin/runUnitTests.py

@@ -24,9 +24,6 @@
 # If no errors occurred during the unit tests, then
 # this script returns 0. Otherwise, it returns a
 # non-zero exit value.
-#
-# [email protected]                            2011-02-23
-# [email protected]                          2017-04-11
 #######################################################
 from __future__ import absolute_import
 from __future__ import division
@@ -74,10 +71,10 @@ def _setEnvironmentVariables(var, value):
         os.environ[var] = value
 
 
-def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification, debug, color):
+def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification, debug, color, rewriteConfigurationFile):
     import buildingspy.development.regressiontest as u
 
-    ut = u.Tester(tool=tool, skip_verification=skip_verification, color=color)
+    ut = u.Tester(tool=tool, skip_verification=skip_verification, color=color, rewriteConfigurationFile=rewriteConfigurationFile)
     ut.batchMode(batch)
     ut.setLibraryRoot(path)
     if package is not None:
@@ -146,7 +143,9 @@ def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification
     unit_test_group.add_argument('-d', "--debug",
                                  action="store_true",
                                  help="Enable debug output.")
-
+    unit_test_group.add_argument("--rewrite-configuration-file",
+                                 help='If specified, rewrite the configuration file conf.yml (implemented for openmodelica only)',
+                                 action="store_true")
 
     html_group = parser.add_argument_group(
         "arguments to check html syntax only")
@@ -204,6 +203,6 @@ def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification
                            show_gui=args.show_gui,
                            skip_verification=args.skip_verification,
                            debug=args.debug,
-                           color=True
-                           )
+                           color=True,
+                           rewriteConfigurationFile=args.rewrite_configuration_file)
     exit(retVal)