Merge branch 'v24.1.0-IOFreeze' into v24.1.0-IOFreeze-low-speed

NREL · Mar 7, 2024 · 5c31398 · 5c31398
2 parents c3b3e59 + ebce271
commit 5c31398
Show file tree

Hide file tree

Showing 28 changed files with 2,041 additions and 298 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -625,7 +625,7 @@ endif()
 if(UNIX)
   if(APPLE)
     if (ARCH MATCHES "arm64")
-      set(ENERGYPLUS_EXPECTED_HASH 72948a3f884ce9fe44145210eceb8259)
+      set(ENERGYPLUS_EXPECTED_HASH f27b5abefcbe850f9107b1a84ec313b2)
       set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
     else()
       set(ENERGYPLUS_EXPECTED_HASH 17819846a562cd7d39bb1c3fa57fe448)
@@ -638,7 +638,7 @@ if(UNIX)
   else()
     if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
       if (ARCH MATCHES "arm64")
-        set(ENERGYPLUS_EXPECTED_HASH 363c537aff1f9c664192451139a85964)
+        set(ENERGYPLUS_EXPECTED_HASH 33fc7793ff2f6c2e87461b006580b2d8)
       else()
         set(ENERGYPLUS_EXPECTED_HASH 2aa4ab0527c569751b20d836266dd9b8)
       endif()

diff --git a/developer/doc/ReleaseNotes/OpenStudio_Release_Notes_3_8_0_TBD.md b/developer/doc/ReleaseNotes/OpenStudio_Release_Notes_3_8_0_TBD.md
@@ -86,8 +86,10 @@ You can also refer to the [OpenStudio SDK Python Binding Version Compatibility M
 *
 
 ## Known Issues / Limitations
-* In some cases you may need to install an extra dependency needed by EnergyPlus on Linux and Mac. See this EnergyPlus issue for details https://github.com/NREL/EnergyPlus/issues/10284 
-* While we udpated the gbXML schema to v7.03, the forward and reverse translation between gbXML and OSM does not support any new gbXML fields that may have been added.
+
+*
+*
+*
 
 **Full Changelog**: https://github.com/NREL/OpenStudio/compare/v3.7.0...v3.8.0
 

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -125,6 +125,7 @@ set(utilities_resources_src
   utilities/SqlFile/1ZoneEvapCooler-V22-2-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V23-1-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql
+  utilities/SqlFile/1ZoneEvapCooler-V24-1-0.sql
   utilities/xml/base.xml
   utilities/xml/hpxml_with_error.xml
   utilities/xml/schema/HPXML.xsd

diff --git a/resources/IdfFilesToTransition.lst.in b/resources/IdfFilesToTransition.lst.in
@@ -1,3 +1,4 @@
+${PROJECT_SOURCE_DIR}/resources/eefg/dummy.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/5ZoneAirCooled/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/AllFuelTypes/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/BestestEx/in.idf
@@ -13,16 +14,24 @@ ${PROJECT_SOURCE_DIR}/resources/energyplus/Components/idf_designday_4/Annual_Coo
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Daylighting_Office/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Daylighting_School/in.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/HospitalBaseline/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/FrameAndDivider/in.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/HospitalBaseline/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Office_With_Many_HVAC_Types/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/ScheduleFile/in.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/SmallOffice/SmallOffice.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/NewFileTemplate.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/SmallOffice/SmallOffice.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/CommentTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/DosLineEndingTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/MixedLineEndingTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/UnixLineEndingTest.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf
@@ -35,12 +44,3 @@ ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf
-${PROJECT_SOURCE_DIR}/resources/eefg/dummy.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/ScheduleFile/in.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/CommentTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/DosLineEndingTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/MixedLineEndingTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/UnixLineEndingTest.idf
diff --git a/resources/IdfFilesToTransition.lst.md b/resources/IdfFilesToTransition.lst.md
@@ -0,0 +1,7 @@
+- Run an initial build to produce build/resources/IdfFilesToTransition.lst from resources/IdfFilesToTransition.lst.in.
+- Install the appropriate version of EnergyPlus.
+- Open EnergyPlus/PreProcess/IDFVersionUpdater/IDFVersionUpdate.exe.
+- Choose File to Update... > build/resources/IdfFilesToTransition.lst.
+- New Version should auto-populate to version of EnergyPlus.
+- Create Intermediate Version Files > No.
+- Delete Original Files > Yes.
diff --git a/resources/IdfFilesToTransition.lst.txt b/resources/IdfFilesToTransition.lst.txt
diff --git a/resources/energyplus/ProposedEnergy+.idd b/resources/energyplus/ProposedEnergy+.idd
@@ -311,6 +311,7 @@
 !      percent/K              =>   percent/F           0.555555555555556
 !      person/m2              =>   person/ft2          0.0928939733269818
 !      s/m                    =>   s/ft                0.3048
+!      umol/m2-s              =>   umol/ft2-s          0.09290304
 !      V/K                    =>   V/F                 0.555555555555556
 !      W                      =>   Btu/h               3.4121412858518
 !      W/((m3/s)-Pa)          =>   W/((gal/min)-ftH20) 0.188582274697355
@@ -369,7 +370,6 @@
 !      kgWater/kgDryAir
 !      kmol
 !      kmol/s
-!      umol/m2s
 !      m3/m3
 !      micron
 !      minutes
@@ -380,7 +380,6 @@
 !      ppm
 !      rev/min
 !      s
-!      umol_m2s
 !      V
 !      VA
 !      W/m2, deg C or cd/m2
@@ -12152,10 +12151,10 @@ IndoorLivingWall,
        \ip-units ft2
   N2 , \field LED Nominal Intensity
        \note The value represents photosynthetic photon flux density (PPFD) of LED grow light.
-       \note PPFD is measured in micro-mole per m2 per second (umol_m2s) which establishes exactly how many photosynthetically active radiation (PAR) photons are landing on a specific area.
-       \units umol_m2s
+       \note PPFD is measured in micro-mole per m2 per second (umol/m2-s) which establishes exactly how many photosynthetically active radiation (PAR) photons are landing on a specific area.
+       \units umol/m2-s
        \type real
-       \ip-units umol_m2s
+       \ip-units umol/ft2-s
   N3 , \field LED Nominal Power
        \note This field defines nominal total LED power for an indoor living wall system.
        \units W
@@ -36942,37 +36941,13 @@ HeatExchanger:AirToAir:SensibleAndLatent,
       \minimum 0.0
       \maximum 1.0
       \default 0.0
-  N4, \field Sensible Effectiveness at 75% Heating Air Flow
+  N4, \field Sensible Effectiveness at 100% Cooling Air Flow
       \type real
       \units dimensionless
       \minimum 0.0
       \maximum 1.0
       \default 0.0
-  N5, \field Latent Effectiveness at 75% Heating Air Flow
-      \type real
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-      \default 0.0
-  N6, \field Sensible Effectiveness at 100% Cooling Air Flow
-      \type real
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-      \default 0.0
-  N7, \field Latent Effectiveness at 100% Cooling Air Flow
-      \type real
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-      \default 0.0
-  N8, \field Sensible Effectiveness at 75% Cooling Air Flow
-      \type real
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-      \default 0.0
-  N9, \field Latent Effectiveness at 75% Cooling Air Flow
+  N5, \field Latent Effectiveness at 100% Cooling Air Flow
       \type real
       \units dimensionless
       \minimum 0.0
@@ -36990,7 +36965,7 @@ HeatExchanger:AirToAir:SensibleAndLatent,
   A6, \field Exhaust Air Outlet Node Name
       \required-field
       \type node
-  N10,\field Nominal Electric Power
+  N6, \field Nominal Electric Power
       \type real
       \units W
       \ip-units W
@@ -37013,35 +36988,59 @@ HeatExchanger:AirToAir:SensibleAndLatent,
       \key ExhaustOnly
       \key MinimumExhaustTemperature
       \default None
-  N11,\field Threshold Temperature
+  N7, \field Threshold Temperature
       \type real
       \units C
       \default 1.7
       \note Supply (outdoor) air inlet temp threshold for exhaust air recirculation and
       \note exhaust only frost control types. Exhaust air outlet threshold Temperature for
       \note minimum exhaust temperature frost control type.
-  N12,\field Initial Defrost Time Fraction
+  N8, \field Initial Defrost Time Fraction
       \type real
       \units dimensionless
       \minimum 0.0
       \maximum 1.0
       \default 0.083
       \note Fraction of the time when frost control will be invoked at the threshold temperature.
       \note This field only used for exhaust air recirc and exhaust-only frost control types.
-  N13,\field Rate of Defrost Time Fraction Increase
+  N9, \field Rate of Defrost Time Fraction Increase
       \type real
       \units 1/K
       \minimum 0.0
       \default 0.012
       \note Rate of increase in defrost time fraction as actual temp falls below threshold temperature.
       \note This field only used for exhaust air recirc and exhaust-only frost control types.
-  A10;\field Economizer Lockout
+  A10,\field Economizer Lockout
       \type choice
       \key Yes
       \key No
       \default Yes
       \note Yes means that the heat exchanger will be locked out (off)
       \note when the economizer is operating or high humidity control is active
+  A11,\field Sensible Effectiveness of Heating Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the sensivle effectiveness for heating
+      \note will be the value in N2 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A12,\field Latent Effectiveness of Heating Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the latent effectiveness for heating
+      \note will be the value in N3 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A13,\field Sensible Effectiveness of Cooling Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the sensivle effectiveness for cooling
+      \note will be the value in N4 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A14;\field Latent Effectiveness of Cooling Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the latent effectiveness for cooling
+      \note will be the value in N5 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
 
 HeatExchanger:Desiccant:BalancedFlow,
       \memo This object models a balanced desiccant heat exchanger.

diff --git a/resources/model/OpenStudio.idd b/resources/model/OpenStudio.idd
@@ -24750,37 +24750,13 @@ OS:HeatExchanger:AirToAir:SensibleAndLatent,
       \units dimensionless
       \minimum 0.0
       \maximum 1.0
-  N4, \field Sensible Effectiveness at 75% Heating Air Flow
+  N4, \field Sensible Effectiveness at 100% Cooling Air Flow
       \type real
       \required-field
       \units dimensionless
       \minimum 0.0
       \maximum 1.0
-  N5, \field Latent Effectiveness at 75% Heating Air Flow
-      \type real
-      \required-field
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-  N6, \field Sensible Effectiveness at 100% Cooling Air Flow
-      \type real
-      \required-field
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-  N7, \field Latent Effectiveness at 100% Cooling Air Flow
-      \type real
-      \required-field
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-  N8, \field Sensible Effectiveness at 75% Cooling Air Flow
-      \type real
-      \required-field
-      \units dimensionless
-      \minimum 0.0
-      \maximum 1.0
-  N9, \field Latent Effectiveness at 75% Cooling Air Flow
+  N5, \field Latent Effectiveness at 100% Cooling Air Flow
       \type real
       \required-field
       \units dimensionless
@@ -24798,7 +24774,7 @@ OS:HeatExchanger:AirToAir:SensibleAndLatent,
   A7, \field Exhaust Air Outlet Node
       \type object-list
       \object-list ConnectionNames
-  N10,\field Nominal Electric Power
+  N6, \field Nominal Electric Power
       \type real
       \required-field
       \units W
@@ -24821,33 +24797,57 @@ OS:HeatExchanger:AirToAir:SensibleAndLatent,
       \key ExhaustAirRecirculation
       \key ExhaustOnly
       \key MinimumExhaustTemperature
-  N11,\field Threshold Temperature
+  N7, \field Threshold Temperature
       \type real
       \units C
       \default 1.7
       \note Supply (outdoor) air inlet temp threshold for exhaust air recirculation and
       \note exhaust only frost control types. Exhaust air outlet threshold Temperature for
       \note minimum exhaust temperature frost control type.
-  N12,\field Initial Defrost Time Fraction
+  N8, \field Initial Defrost Time Fraction
       \type real
       \units dimensionless
       \minimum 0.0
       \maximum 1.0
       \note Fraction of the time when frost control will be invoked at the threshold temperature.
       \note This field only used for exhaust air recirc and exhaust-only frost control types.
-  N13,\field Rate of Defrost Time Fraction Increase
+  N9, \field Rate of Defrost Time Fraction Increase
       \type real
       \units 1/K
       \minimum 0.0
       \note Rate of increase in defrost time fraction as actual temp falls below threshold temperature.
       \note This field only used for exhaust air recirc and exhaust-only frost control types.
-  A11;\field Economizer Lockout
+  A11,\field Economizer Lockout
       \type choice
       \required-field
       \key Yes
       \key No
       \note Yes means that the heat exchanger will be locked out (off)
       \note when the economizer is operating or high humidity control is active
+  A12,\field Sensible Effectiveness of Heating Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the sensivle effectiveness for heating
+      \note will be the value in N2 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A13,\field Latent Effectiveness of Heating Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the latent effectiveness for heating
+      \note will be the value in N3 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A14,\field Sensible Effectiveness of Cooling Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the sensivle effectiveness for cooling
+      \note will be the value in N4 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
+  A15;\field Latent Effectiveness of Cooling Air Flow Curve Name
+      \note optional
+      \note if this field has value, then the latent effectiveness for cooling
+      \note will be the value in N5 multiplied by this curve value
+      \type object-list
+      \object-list UnivariateFunctions
 
 OS:HeatExchanger:Desiccant:BalancedFlow,
       \memo This object models a balanced desiccant heat exchanger.

diff --git a/resources/utilities/Idf/FormatPropertyTest_Formatted.idf b/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
@@ -5,7 +5,7 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 ! \format singleLine
 
-  Version,23.2;
+  Version,24.1;
 
 !-   ===========  ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM ===========
 ! \format singleLine

diff --git a/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf b/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
@@ -5,7 +5,7 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 ! \format singleLine
 
-  Version,23.2;
+  Version,24.1;
 
 !-   ===========  ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM ===========
 ! \format singleLine

diff --git a/resources/utilities/Idf/MixedLineEndingTest.idf b/resources/utilities/Idf/MixedLineEndingTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,23.2;
+  Version,24.1;
 
 ! Timestep should be > 1.
 

diff --git a/resources/utilities/Idf/UnixLineEndingTest.idf b/resources/utilities/Idf/UnixLineEndingTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,23.2;
+  Version,24.1;
 
 ! Timestep should be > 1.