Merge pull request #31 from airboxlab/eplus_24_2

EnergyPlus 24.2
airboxlab · Oct 22, 2024 · 098c88b · 098c88b
2 parents 272cfc5 + 3379241
commit 098c88b
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Poetry
         uses: abatilo/[email protected]
         with:
-          poetry-version: "1.5.1"
+          poetry-version: "1.7.1"
 
       - name: Setup python
         uses: actions/setup-python@v5
@@ -33,12 +33,14 @@ jobs:
 
       - name: Install EnergyPlus
         run: |
-          ENERGYPLUS_VERSION="23.2.0"
-          ENERGYPLUS_SHA="7636e6b3e9"
-          ENERGYPLUS_DOWNLOAD_URL="https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}/EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_SHA}-Linux-Ubuntu22.04-x86_64.sh"
+          ENERGYPLUS_DOWNLOAD_URL="https://github.com/NREL/EnergyPlus/releases/download/v24.2.0a/EnergyPlus-24.2.0-94a887817b-Linux-Ubuntu22.04-x86_64.sh"
           wget --quiet "${ENERGYPLUS_DOWNLOAD_URL}" -O /tmp/eplus_install.sh
           (echo "y"; echo ""; echo "y";) | sudo bash /tmp/eplus_install.sh
 
+      - name: Check EnergyPlus installation
+        run: |
+          energyplus -v
+
       - name: Execute tests
         env:
           PYTHON_KEYRING_BACKEND: keyring.backends.null.Keyring

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:22.04
 LABEL org.opencontainers.image.source="https://github.com/airboxlab/rllib-energyplus"
 LABEL org.opencontainers.image.description="EnergyPlus Env for Reinforcement Learning in Building Energy Management Systems"
 
-ARG EPLUS_VERSION=23-2-0
-ARG EPLUS_DL_URL=https://github.com/NREL/EnergyPlus/releases/download/v23.2.0/EnergyPlus-23.2.0-7636e6b3e9-Linux-Ubuntu22.04-x86_64.sh
+ARG EPLUS_VERSION=24-2-0
+ARG EPLUS_DL_URL=https://github.com/NREL/EnergyPlus/releases/download/v24.2.0a/EnergyPlus-24.2.0-94a887817b-Linux-Ubuntu22.04-x86_64.sh
 
 ENV DEBIAN_FRONTEND=noninteractive \
     HOME=/home/ray \
@@ -16,8 +16,8 @@ SHELL ["/bin/bash", "-c"]
 COPY requirements.txt /root/rllib-energyplus/
 
 RUN \
-    # install E+
-    apt-get update -qq && apt-get install -y wget git && \
+    # install E+. E+ 24.2.0 requires libgomp1
+    apt-get update -qq && apt-get install -y wget git libgomp1 && \
     cd /tmp && \
     wget --quiet "${EPLUS_DL_URL}" && \
     export eplus_install="$(echo "${EPLUS_DL_URL}" | rev | cut -d'/' -f1 | rev)" && \

diff --git a/rleplus/examples/amphitheater/model.idf b/rleplus/examples/amphitheater/model.idf
@@ -1,4 +1,4 @@
-  Version,23.2;
+  Version,24.2;
 
   Timestep,4;
 
@@ -8232,12 +8232,8 @@
     Autosize,                !- Nominal Supply Air Flow Rate {m3/s}
     0.76,                    !- Sensible Effectiveness at 100% Heating Air Flow {dimensionless}
     0.68,                    !- Latent Effectiveness at 100% Heating Air Flow {dimensionless}
-    0.81,                    !- Sensible Effectiveness at 75% Heating Air Flow {dimensionless}
-    0.73,                    !- Latent Effectiveness at 75% Heating Air Flow {dimensionless}
     0.76,                    !- Sensible Effectiveness at 100% Cooling Air Flow {dimensionless}
     0.68,                    !- Latent Effectiveness at 100% Cooling Air Flow {dimensionless}
-    0.81,                    !- Sensible Effectiveness at 75% Cooling Air Flow {dimensionless}
-    0.73,                    !- Latent Effectiveness at 75% Cooling Air Flow {dimensionless}
     Node 7,                  !- Supply Air Inlet Node Name
     Node 20,                 !- Supply Air Outlet Node Name
     Node 21,                 !- Exhaust Air Inlet Node Name
@@ -8249,7 +8245,85 @@
     1.7,                     !- Threshold Temperature {C}
     ,                        !- Initial Defrost Time Fraction {dimensionless}
     ,                        !- Rate of Defrost Time Fraction Increase {1/K}
-    Yes;                     !- Economizer Lockout
+    Yes,                     !- Economizer Lockout
+    Air-to-Air Plate HX_1,   !- Sensible Effectiveness of Heating Air Flow Curve Name
+    Air-to-Air Plate HX_2,   !- Latent Effectiveness of Heating Air Flow Curve Name
+    Air-to-Air Plate HX_3,   !- Sensible Effectiveness of Cooling Air Flow Curve Name
+    Air-to-Air Plate HX_4;   !- Latent Effectiveness of Cooling Air Flow Curve Name
+
+  Table:Lookup,
+    Air-to-Air Plate HX_1,   !- Name
+    effectiveness_IndependentVariableList,  !- Independent Variable List Name
+    DivisorOnly,             !- Normalization Method
+    0.76,                    !- Normalization Divisor
+    0.0,                     !- Minimum Output
+    10.0,                    !- Maximum Output
+    Dimensionless,           !- Output Unit Type
+    ,                        !- External File Name
+    ,                        !- External File Column Number
+    ,                        !- External File Starting Row Number
+    0.81,                    !- Output Value 1
+    0.76;                    !- Output Value 2
+
+  Table:Lookup,
+    Air-to-Air Plate HX_2,   !- Name
+    effectiveness_IndependentVariableList,  !- Independent Variable List Name
+    DivisorOnly,             !- Normalization Method
+    0.68,                    !- Normalization Divisor
+    0.0,                     !- Minimum Output
+    10.0,                    !- Maximum Output
+    Dimensionless,           !- Output Unit Type
+    ,                        !- External File Name
+    ,                        !- External File Column Number
+    ,                        !- External File Starting Row Number
+    0.73,                    !- Output Value 1
+    0.68;                    !- Output Value 2
+
+  Table:Lookup,
+    Air-to-Air Plate HX_3,   !- Name
+    effectiveness_IndependentVariableList,  !- Independent Variable List Name
+    DivisorOnly,             !- Normalization Method
+    0.76,                    !- Normalization Divisor
+    0.0,                     !- Minimum Output
+    10.0,                    !- Maximum Output
+    Dimensionless,           !- Output Unit Type
+    ,                        !- External File Name
+    ,                        !- External File Column Number
+    ,                        !- External File Starting Row Number
+    0.81,                    !- Output Value 1
+    0.76;                    !- Output Value 2
+
+  Table:Lookup,
+    Air-to-Air Plate HX_4,   !- Name
+    effectiveness_IndependentVariableList,  !- Independent Variable List Name
+    DivisorOnly,             !- Normalization Method
+    0.68,                    !- Normalization Divisor
+    0.0,                     !- Minimum Output
+    10.0,                    !- Maximum Output
+    Dimensionless,           !- Output Unit Type
+    ,                        !- External File Name
+    ,                        !- External File Column Number
+    ,                        !- External File Starting Row Number
+    0.73,                    !- Output Value 1
+    0.68;                    !- Output Value 2
+
+  Table:IndependentVariableList,
+    effectiveness_IndependentVariableList,  !- Name
+    HxAirFlowRatio;          !- Independent Variable 1 Name
+
+  Table:IndependentVariable,
+    HxAirFlowRatio,          !- Name
+    Linear,                  !- Interpolation Method
+    Linear,                  !- Extrapolation Method
+    0.0,                     !- Minimum Value
+    10.0,                    !- Maximum Value
+    ,                        !- Normalization Reference Value
+    Dimensionless,           !- Unit Type
+    ,                        !- External File Name
+    ,                        !- External File Column Number
+    ,                        !- External File Starting Row Number
+    0.75,                    !- Value 1
+    1.0;                     !- Value 2
 
   SetpointManager:MixedAir,
     Node 20 OS Default SPM,  !- Name
@@ -8658,7 +8732,7 @@
     SecondarySchool Bldg Light,  !- Schedule Name
     Watts/Area,              !- Design Level Calculation Method
     ,                        !- Lighting Level {W}
-    2.17969185938372,        !- Watts per Zone Floor Area {W/m2}
+    2.17969185938372,        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     ,                        !- Return Air Fraction
     ,                        !- Fraction Radiant
@@ -8684,7 +8758,7 @@
     SecondarySchool Bldg Equip,  !- Schedule Name
     Watts/Area,              !- Design Level Calculation Method
     ,                        !- Design Level {W}
-    0.58555672666901,        !- Watts per Zone Floor Area {W/m2}
+    0.58555672666901,        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     ,                        !- Fraction Latent
     ,                        !- Fraction Radiant