Merge branch 'develop' into ll/test_panel_cap

NREL · Nov 19, 2024 · fa5b7ae · fa5b7ae
2 parents a1aace1 + f88cb14
commit fa5b7ae
Show file tree

Hide file tree

Showing 97 changed files with 80,788 additions and 71,038 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -8,11 +8,11 @@ on:
   workflow_dispatch:
 
 env:
-  OPENSTUDIO_VER: 3.9.0-rc1
-  OPENSTUDIO_SHA: fb69e5479c
+  OPENSTUDIO_VER: 3.9.0
+  OPENSTUDIO_SHA: c77fbb9569
   OPENSTUDIO_PLATFORM: Ubuntu-22.04-x86_64
   OPENSTUDIO_EXT: deb
-  OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.9.0-rc1
+  OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.9.0
 
 jobs:
   format-files:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [format-files]
     container:
-      image: docker://nrel/openstudio:dev-3.9.0-rc1
+      image: docker://nrel/openstudio:3.9.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [unit-tests]
     container:
-      image: docker://nrel/openstudio:dev-3.9.0-rc1
+      image: docker://nrel/openstudio:3.9.0
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/docs/read_the_docs/source/changelog/changelog_dev.rst b/docs/read_the_docs/source/changelog/changelog_dev.rst
@@ -7,21 +7,41 @@ Development Changelog
     :released: pending
 
     .. change::
+        :tags: software, openstudio, feature
+        :pullreq: 1318
 
+        **Date**: 2024-11-19
+
+        Title:
+        Latest OS-HPXML
+
+        Description:
+        Update to OpenStudio-HPXML 1.9/OpenStudio 3.9/EnergyPlus 24.2.
+
+        OpenStudio-HPXML: `pull request 1883 <https://github.com/NREL/OpenStudio-HPXML/pull/1883>`_
+
+        Assignees: Joe Robertson, Scott Horowitz
+
+
+    .. change::
         :tags: bugfix, characteristics
         :pullreq: 1265
         :tickets: 1236
 
-        **Date**: 2024-08-06
+        **Date**: 2024-09-24
 
         Title:
         Fix Hot Water Fixtures multipliers
 
         Description:
         Mean-shift hot water usage multipliers distribution by increasing weighted average from 0.8 to 1.0 in Hot Water Fixtures.tsv.
 
+        resstock-estimation: `pull request 420 <https://github.com/NREL/resstock-estimation/pull/420>`_
+
         Assignees: Lixi Liu
 
+
+    .. change::
         :tags: workflow, infiltration, bugfix
         :pullreq: 1257
 
@@ -37,20 +57,25 @@ Development Changelog
 
         Assignees: Joe Robertson
 
+
     .. change::
         :tags: characteristics, floor area, bugfix
         :pullreq: 1301
+        :tickets: 1273
 
-        **Date**: 2024-09-18
+        **Date**: 2024-09-23
 
         Title:
         Fix RECS floor area bins
 
         Description:
         RECS have been using incorrect floor area bins when assigning some characteristics due to a bug on how floor area bin is calculated. This PR fixes the issue.
 
+        resstock-estimation: `pull request 424 <https://github.com/NREL/resstock-estimation/pull/424>`_
+
         Assignees: Rajendra Adhikari, Anthony Fontanini
 
+
     .. change::
         :tags: workflow, hot water, feature
         :pullreq: 1282
@@ -72,7 +97,7 @@ Development Changelog
         :tags: workflow, plug loads, feature
         :pullreq: 1298
 
-        **Date**: 2024-09-24
+        **Date**: 2024-09-26
 
         Title:
         Latest OS-HPXML
@@ -90,7 +115,7 @@ Development Changelog
         :tags: workflow, hvac, feature
         :pullreq: 1254
 
-        **Date**: 2024-09-218
+        **Date**: 2024-09-27
 
         Title:
         Heating and Cooling Unavailable Days
@@ -99,4 +124,20 @@ Development Changelog
         The purpose of this PR is to account for dwelling units whose HVAC system (heating/cooling) is unavailable for some number of days during the year (per RECS 2020).
         Specifically, this PR modifies HVAC heating/cooling seasons using number of unavailable days and BAHSP definition for heating/cooling months.
 
+        resstock-estimation: `pull request 416 <https://github.com/NREL/resstock-estimation/pull/416>`_
+
         Assignees: Joe Robertson
+
+
+    .. change::
+        :tags: workflow, hvac, feature
+        :pullreq: 1304
+        :tickets: 1303
+
+        **Date**: 2024-11-14
+
+        Title:
+        Assign above-grade height for apartment units
+
+        Description:
+        The purpose of this PR is to set a value in ResStockArguments for apartment units based on the type/size of MF building and where the unit is located (lower, middle, or upper story).
diff --git a/docs/read_the_docs/source/workflow_inputs/characteristics.rst b/docs/read_the_docs/source/workflow_inputs/characteristics.rst
@@ -36439,12 +36439,6 @@ Arguments
      - Double
      -
      - Average distance from the floor to the ceiling.
-   * - ``geometry_unit_height_above_grade``
-     - false
-     - ft
-     - Double
-     - auto
-     - Describes the above-grade height of apartment units on upper floors or homes above ambient or belly-and-wing foundations. It is defined as the height of the lowest conditioned floor above grade and is used to calculate the wind speed for the infiltration model. If not provided, the OS-HPXML default (see `HPXML Building Construction <https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-building-construction>`_) is used.
 
 Options
 *******
@@ -36461,38 +36455,32 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - ``geometry_unit_type``
      - ``geometry_unit_aspect_ratio``
      - ``geometry_average_ceiling_height``
-     - ``geometry_unit_height_above_grade``
 
    * - Mobile Home
      - 6.2%
      - manufactured home
      - 1.8
      - 8
-     - auto
    * - Multi-Family with 2 - 4 Units
      - 8%
      - apartment unit
      - 0.5556
      - 8
-     - auto
    * - Multi-Family with 5+ Units
      - 18%
      - apartment unit
      - 0.5556
      - 8
-     - auto
    * - Single-Family Attached
      - 5.9%
      - single-family attached
      - 0.5556
      - 8
-     - auto
    * - Single-Family Detached
      - 61%
      - single-family detached
      - 1.8
      - 8
-     - auto
 
 .. _geometry_floor_area:
 

diff --git a/docs/read_the_docs/source/workflow_outputs/csv_tables/other_timeseries.csv b/docs/read_the_docs/source/workflow_outputs/csv_tables/other_timeseries.csv
@@ -22,3 +22,20 @@ Weather: Wind Speed,weather__wind_speed__mph,mph,"Weather file data including ou
 Weather: Diffuse Solar Radiation,weather__diffuse_solar_radiation__btu/(hr*ft^2),Btu/(hr*ft^2),"Weather file data including outdoor temperatures, relative humidity, wind speed, and solar."
 Weather: Direct Solar Radiation,weather__direct_solar_radiation__btu/(hr*ft^2),Btu/(hr*ft^2),"Weather file data including outdoor temperatures, relative humidity, wind speed, and solar."
 Zone People Occupant Count: Conditioned Space,zone_people_occupant_count__conditioned_space,,User-requested EnergyPlus output variable.
+,schedules_ceiling_fan,frac,Ceiling fan energy use schedule.
+,schedules_clothes_dryer,frac,Clothes dryer energy use schedule.
+,schedules_clothes_washer,frac,Clothes washer energy use schedule.
+,schedules_cooking_range,frac,Cooking range & oven energy use schedule.
+,schedules_dishwasher,frac,Dishwasher energy use schedule.
+,schedules_hot_water_clothes_washer,frac,Clothes washer hot water use schedule.
+,schedules_hot_water_dishwasher,frac,Dishwasher hot water use schedule.
+,schedules_hot_water_fixtures,frac,"Fixtures (sinks, showers, baths) hot water use schedule."
+,schedules_lighting_garage,frac,Garage lighting energy use schedule.
+,schedules_lighting_interior,frac,Interior lighting energy use schedule.
+,schedules_no_space_cooling,,Unavailable period.
+,schedules_no_space_heating,,Unavailable period.
+,schedules_occupants,frac,Occupant heat gain schedule.
+,schedules_plug_loads_other,frac,Other plug load energy use schedule.
+,schedules_plug_loads_tv,frac,Television plug load energy use schedule.
+,schedules_power_outage,,Unavailable period.
+,schedules_vacancy,,Unavailable period.
diff --git a/measures/BuildExistingModel/measure.rb b/measures/BuildExistingModel/measure.rb
@@ -772,7 +772,7 @@ def run(model, runner, user_arguments)
       end
     end
 
-    # Report some additional location and model characteristics
+    # Report additional characteristics
     if File.exist?(hpxml_path)
       hpxml = HPXML.new(hpxml_path: hpxml_path)
     else
@@ -782,6 +782,10 @@ def run(model, runner, user_arguments)
 
     hpxml_bldg = hpxml.buildings[0]
 
+    # height above grade
+    unit_height_above_grade = hpxml_bldg.building_construction.unit_height_above_grade
+    register_value(runner, 'unit_height_above_grade', unit_height_above_grade)
+
     # infiltration
     air_infiltration_measurement = hpxml_bldg.air_infiltration_measurements[0]
     a_ext = 1.0

diff --git a/measures/BuildExistingModel/measure.xml b/measures/BuildExistingModel/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_existing_model</name>
   <uid>dedf59bb-3b88-4f16-8755-2c1ff5519cbf</uid>
-  <version_id>a901b49d-d749-45b2-94fc-d5122935fd30</version_id>
-  <version_modified>2024-10-04T15:40:23Z</version_modified>
+  <version_id>0e78d978-0224-4cf4-a57b-9c0cb5b7c5b4</version_id>
+  <version_modified>2024-11-08T15:53:00Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildExistingModel</class_name>
   <display_name>Build Existing Model</display_name>
@@ -349,7 +349,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E660DFB7</checksum>
+      <checksum>9AE772B3</checksum>
     </file>
   </files>
 </measure>