Merge remote-tracking branch 'upstream/master'

.github/workflows/formatting.yml

@@ -24,7 +24,7 @@ jobs:
     # Skip if the commit message contains "ci skip"
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       # Checks-out repository under $GITHUB_WORKSPACE, so job can access it
@@ -33,7 +33,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64'      # optional x64 or x86. Defaults to x64 if not specified
 
       - name: "Install pip"

.travis.yml

@@ -30,17 +30,18 @@ services:
 
 env:
   global:
-    - BUILDINGSPY_VERSION=BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c
-    - OMC_VERSION=ubuntu-2004-omc:1.20.0_dev-314-g3033f43-1
-    - OPTIMICA_VERSION=travis-ubuntu-1804-optimica:2022-05-09-master-4b0cd2bf71
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64
-    - ENERGYPLUS_VERSION=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
+    - [email protected]
+    - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
+    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4
+    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1
+    - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
+    - ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64
     - MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6
     - MODELICA_JSON_HOME=${TRAVIS_BUILD_DIR}/modelica-json
 
   jobs:
     - TEST_ARG="make test-cdl-conformance"
-    - TEST_ARG="make test-energyplus-validations test-dymola-spawn-spaces test-openmodelica-spawn-spaces" #target test-optimica-spawn-fmu removed as it requires a local installation of OCT
+    - TEST_ARG="make test-energyplus-validations test-dymola-spawn-spaces test-openmodelica-spawn-spaces test-openmodelica-cdl" #target test-optimica-spawn-fmu removed as it requires a local installation of OCT
     - TEST_ARG="make test-bestest"
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
@@ -60,12 +61,21 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Applications,Experimental}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Applications,Experimental}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Applications,Experimental}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Applications\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Applications\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
@@ -75,9 +85,9 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.FixedResistances\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.FixedResistances\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.FixedResistances\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Interfaces}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Interfaces}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Interfaces}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
@@ -96,6 +106,9 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Utilities\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Utilities\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Utilities\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Templates\""
+    - TEST_ARG="make test-openmodelica  PACKAGE=\"Buildings.Templates\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Templates\""
 
 before_install:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
@@ -107,11 +120,17 @@ before_install:
        docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION};
        cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
     fi;
+# The Spawn idf reference results are generated with EnergyPlus 9.6.0,
+# while others use a more recent EnergyPlus, hence we install both
   - if [[ "$TEST_ARG" == *test-energyplus* ]]; then
-      wget --no-verbose https://github.com/NREL/EnergyPlus/releases/download/v9.6.0/${ENERGYPLUS_VERSION}.tar.gz;
-      tar xzf ${ENERGYPLUS_VERSION}.tar.gz;
-      rm ${ENERGYPLUS_VERSION}.tar.gz;
-      echo "Installed EnergyPlus in ${PWD}/${ENERGYPLUS_VERSION}";
+      wget --no-verbose https://github.com/NREL/EnergyPlus/releases/download/v9.6.0/${ENERGYPLUS_9_6_0}.tar.gz;
+      tar xzf ${ENERGYPLUS_9_6_0}.tar.gz;
+      rm ${ENERGYPLUS_9_6_0}.tar.gz;
+      echo "Installed EnergyPlus in ${PWD}/${ENERGYPLUS_9_6_0}";
+      wget --no-verbose https://github.com/NREL/EnergyPlus/releases/download/v23.1.0/${ENERGYPLUS_23_1_0}.tar.gz;
+      tar xzf ${ENERGYPLUS_23_1_0}.tar.gz;
+      rm ${ENERGYPLUS_23_1_0}.tar.gz;
+      echo "Installed EnergyPlus in ${PWD}/${ENERGYPLUS_23_1_0}";
     fi;
   - if [[ "$TEST_ARG" == *test-cdl-conformance* ]]; then
       wget --no-verbose https://github.com/lbl-srg/modelica-json/archive/${MODELICA_JSON_VERSION}.tar.gz;
@@ -139,13 +158,19 @@ install:
   - pip3 install --only-binary=numpy,scipy,matplotlib numpy==1.21.4 scipy==1.7.3 matplotlib==3.5.1
   - pip3 install git+https://github.com/lbl-srg/${BUILDINGSPY_VERSION}
   - if [[ "$TEST_ARG" == *test-energyplus* ]]; then
-      export PATH=${PATH}:${TRAVIS_BUILD_DIR}/${ENERGYPLUS_VERSION};
+      export ENERGYPLUS_9_6_0=${ENERGYPLUS_9_6_0};
+      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.{Applications,Experimental}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
+  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
       echo "Installing Spawn binaries";
       Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
     fi;
+  - if [[ "$TEST_ARG" == *SINGLEPROC* ]]; then
+      export NPROC=1;
+    else
+      export NPROC=10;
+    fi;
 
 # Execute tests
 script: