Merge pull request #1031 from NREL/recs2020_develop

Update to RECS 2020 data

.github/pull_request_template.md

@@ -8,6 +8,7 @@ Not all may apply:
 
 - [ ] Tests (and test files) have been updated
 - [ ] Documentation has been updated
+  - [ ] If related to resstock-estimation, checklist includes data dictionary, source report, options_lookup
 - [ ] Changelog has been updated
 - [ ] `openstudio tasks.rb update_measures` has been run
 - [ ] No unexpected regression test changes on CI (checked comparison artifacts)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 Features
 - Add 2022 Cambium emissions data ([#1038](https://github.com/NREL/resstock/pull/1038))
+- Update characteristics to use EIA 2020 RECS ([#1031](https://github.com/NREL/resstock/pull/1031))
 
 Fixes
 
@@ -18,6 +19,7 @@ Features
 - Add data dictionary files for describing various outputs. Use these files to (1) check against integration test results, and (2) generate documentation tables ([#1058](https://github.com/NREL/resstock/pull/1058))
 - OS-HPXML now supports use of optional heat pump capacity retention temperature and fraction arguments (applicable to both ASHP and MSHP) ([#1072](https://github.com/NREL/resstock/pull/1072))
 - Update to OpenStudio v3.6.1 ([#1076](https://github.com/NREL/resstock/pull/1076))
+- Add Energystar Climate Zone for window upgrade specification ([#1080](https://github.com/NREL/resstock/pull/1080))
 
 Fixes
 - Pulls in upstream OS-HPXML fix related to [avoiding possible OpenStudio temporary directory collision](https://github.com/NREL/OpenStudio-HPXML/pull/1316) causing random errors ([#1054](https://github.com/NREL/resstock/pull/1054))

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

@@ -15,9 +15,12 @@ build_existing_model.census_division_recs,:ref:`census_division_recs`
 build_existing_model.census_region,:ref:`census_region`
 build_existing_model.city,:ref:`city`
 build_existing_model.clothes_dryer,:ref:`clothes_dryer`
+build_existing_model.clothes_dryer_usage_level,:ref:`clothes_dryer_usage_level`
 build_existing_model.clothes_washer,:ref:`clothes_washer`
 build_existing_model.clothes_washer_presence,:ref:`clothes_washer_presence`
+build_existing_model.clothes_washer_usage_level,:ref:`clothes_washer_usage_level`
 build_existing_model.cooking_range,:ref:`cooking_range`
+build_existing_model.cooking_range_usage_level,:ref:`cooking_range_usage_level`
 build_existing_model.cooling_setpoint,:ref:`cooling_setpoint`
 build_existing_model.cooling_setpoint_has_offset,:ref:`cooling_setpoint_has_offset`
 build_existing_model.cooling_setpoint_offset_magnitude,:ref:`cooling_setpoint_offset_magnitude`
@@ -27,11 +30,13 @@ build_existing_model.county,:ref:`county`
 build_existing_model.county_and_puma,:ref:`county_and_puma`
 build_existing_model.dehumidifier,:ref:`dehumidifier`
 build_existing_model.dishwasher,:ref:`dishwasher`
+build_existing_model.dishwasher_usage_level,:ref:`dishwasher_usage_level`
 build_existing_model.door_area,:ref:`door_area`
 build_existing_model.doors,:ref:`doors`
 build_existing_model.ducts,:ref:`ducts`
 build_existing_model.eaves,:ref:`eaves`
 build_existing_model.electric_vehicle,:ref:`electric_vehicle`
+build_existing_model.energystar_climate_zone_2023,:ref:`energystar_climate_zone_2023`
 build_existing_model.federal_poverty_level,:ref:`federal_poverty_level`
 build_existing_model.generation_and_emissions_assessment_region,:ref:`generation_and_emissions_assessment_region`
 build_existing_model.geometry_attic_type,:ref:`geometry_attic_type`
@@ -122,6 +127,7 @@ build_existing_model.radiant_barrier,:ref:`radiant_barrier`
 build_existing_model.range_spot_vent_hour,:ref:`range_spot_vent_hour`
 build_existing_model.reeds_balancing_area,:ref:`reeds_balancing_area`
 build_existing_model.refrigerator,:ref:`refrigerator`
+build_existing_model.refrigerator_usage_level,:ref:`refrigerator_usage_level`
 build_existing_model.roof_material,:ref:`roof_material`
 build_existing_model.solar_hot_water,:ref:`solar_hot_water`
 build_existing_model.state,:ref:`state`

measures/ApplyUpgrade/measure.rb

@@ -382,15 +382,17 @@ def run(model, runner, user_arguments)
     measures['BuildResidentialHPXML'][0]['simulation_control_run_period_calendar_year'] = values['simulation_control_run_period_calendar_year']
 
     # Emissions
-    measures['BuildResidentialHPXML'][0]['emissions_scenario_names'] = values['emissions_scenario_names']
-    measures['BuildResidentialHPXML'][0]['emissions_types'] = values['emissions_types']
-    measures['BuildResidentialHPXML'][0]['emissions_electricity_units'] = values['emissions_electricity_units']
-    measures['BuildResidentialHPXML'][0]['emissions_electricity_values_or_filepaths'] = values['emissions_electricity_values_or_filepaths']
-    measures['BuildResidentialHPXML'][0]['emissions_fossil_fuel_units'] = values['emissions_fossil_fuel_units']
-    measures['BuildResidentialHPXML'][0]['emissions_natural_gas_values'] = values['emissions_natural_gas_values']
-    measures['BuildResidentialHPXML'][0]['emissions_propane_values'] = values['emissions_propane_values']
-    measures['BuildResidentialHPXML'][0]['emissions_fuel_oil_values'] = values['emissions_fuel_oil_values']
-    measures['BuildResidentialHPXML'][0]['emissions_wood_values'] = values['emissions_wood_values']
+    if values.keys.include?('emissions_electricity_values_or_filepaths')
+      measures['BuildResidentialHPXML'][0]['emissions_scenario_names'] = values['emissions_scenario_names']
+      measures['BuildResidentialHPXML'][0]['emissions_types'] = values['emissions_types']
+      measures['BuildResidentialHPXML'][0]['emissions_electricity_units'] = values['emissions_electricity_units']
+      measures['BuildResidentialHPXML'][0]['emissions_electricity_values_or_filepaths'] = values['emissions_electricity_values_or_filepaths']
+      measures['BuildResidentialHPXML'][0]['emissions_fossil_fuel_units'] = values['emissions_fossil_fuel_units']
+      measures['BuildResidentialHPXML'][0]['emissions_natural_gas_values'] = values['emissions_natural_gas_values']
+      measures['BuildResidentialHPXML'][0]['emissions_propane_values'] = values['emissions_propane_values']
+      measures['BuildResidentialHPXML'][0]['emissions_fuel_oil_values'] = values['emissions_fuel_oil_values']
+      measures['BuildResidentialHPXML'][0]['emissions_wood_values'] = values['emissions_wood_values']
+    end
 
     # Utility Bills
     measures['BuildResidentialHPXML'][0]['utility_bill_scenario_names'] = values['utility_bill_scenario_names']

measures/ApplyUpgrade/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>39d68fca-e8bb-4b12-97bd-414df1c3a3b1</version_id>
-  <version_modified>20230310T232749Z</version_modified>
+  <version_id>51fe0034-de6b-4aa6-91d1-2a15d5571e5e</version_id>
+  <version_modified>2023-05-31T22:39:26Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -6321,6 +6321,17 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>1.9.0</identifier>
+        <min_compatible>1.9.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>D4B768A3</checksum>
+    </file>
     <file>
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
@@ -6333,16 +6344,5 @@
       <usage_type>test</usage_type>
       <checksum>672FDD8F</checksum>
     </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>1.9.0</identifier>
-        <min_compatible>1.9.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>CEBAEE16</checksum>
-    </file>
   </files>
 </measure>