Merge branch 'develop' into electric_vehicles

.github/workflows/config.yml

@@ -8,11 +8,11 @@ on:
   workflow_dispatch:
 
 env:
-  OPENSTUDIO_VER: "3.8.0"
-  OPENSTUDIO_SHA: "f953b6fcaf"
-  OPENSTUDIO_PLATFORM: "Ubuntu-20.04-x86_64"
-  OPENSTUDIO_EXT: "deb"
-  OPENSTUDIO_URL: "https://github.com/NREL/OpenStudio/releases/download/v3.8.0"
+  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
 
 jobs:
   format-files:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [format-files]
     container:
-      image: docker://nrel/openstudio:3.8.0
+      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:3.8.0
+      image: docker://nrel/openstudio:3.9.0
     steps:
       - uses: actions/checkout@v4
         with:

docs/read_the_docs/source/changelog/changelog_dev.rst

@@ -6,6 +6,23 @@ Development Changelog
     :version: v3.4.0
     :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
@@ -110,3 +127,17 @@ Development Changelog
         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).

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:
 

docs/read_the_docs/source/workflow_outputs/csv_tables/other_outputs.csv

@@ -50,6 +50,7 @@ build_existing_model.weather_file_latitude,Latitude from the EPW weather file.
 build_existing_model.weather_file_longitude,Longitude from the EPW weather file.
 build_existing_model.heating_unavailable_period,Heating unavailable period.
 build_existing_model.cooling_unavailable_period,Cooling unavailable period.
+build_existing_model.unit_height_above_grade,Height of the lowest conditioned floor above grade for the unit.
 apply_upgrade.applicable,The measure was applied to the workflow.
 apply_upgrade.upgrade_name,User-specificed name that describes the upgrade.
 apply_upgrade.reference_scenario,The upgrade_name which should act as a reference to this upgrade to calculate savings.

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.

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

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>