Merge pull request #1104 from NREL/ll/duct_location

add Duct Location and Duct Leakage to Outside
NREL · Aug 9, 2023 · 8b7cf22 · 8b7cf22
2 parents 91b3bb3 + 345ef1c
commit 8b7cf22
Show file tree

Hide file tree

Showing 67 changed files with 85,682 additions and 85,011 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -8,7 +8,8 @@ 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
+  - [ ] If related to resstock-estimation, checklist includes [data dictionary](https://github.com/NREL/resstock/tree/develop/resources/data/dictionary), [source report](https://github.com/NREL/resstock/tree/develop/project_national/resources/source_report.csv), [options_lookup](https://github.com/NREL/resstock/blob/develop/resources/options_lookup.tsv).
+  - [ ] If changes to project_testing tsvs, checklist includes [yml_precomputed](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed), [yml_precomputed_outdated](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed_outdated), [yml_precomputed_weight](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed_weight)
 - [ ] Changelog has been updated
 - [ ] `openstudio tasks.rb update_measures` has been run
 - [ ] No unexpected regression test changes on CI (checked comparison artifacts)
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -320,19 +320,6 @@ jobs:
           path: resources
           name: options_lookup
 
-      - name: Build documentation
-        run: |
-          ruby docs/read_the_docs/source/workflow_inputs/create_characteristics_rst.rb
-          ruby docs/read_the_docs/source/workflow_outputs/csv_tables.rb
-          cd docs/read_the_docs
-          make html SPHINXOPTS="-W --keep-going -n"
-
-      - name: Save Docs
-        uses: actions/upload-artifact@v3
-        with:
-          name: documentation
-          path: docs/read_the_docs/_build/html/
-
       - name: Commit latest results
         shell: bash        
         run: |
@@ -354,3 +341,16 @@ jobs:
             echo "Pushing to branch: $branch_name"
             git push -u origin $branch_name
           fi
+
+      - name: Build documentation
+        run: |
+          ruby docs/read_the_docs/source/workflow_inputs/create_characteristics_rst.rb
+          ruby docs/read_the_docs/source/workflow_outputs/csv_tables.rb
+          cd docs/read_the_docs
+          make html SPHINXOPTS="-W --keep-going -n"
+
+      - name: Save Docs
+        uses: actions/upload-artifact@v3
+        with:
+          name: documentation
+          path: docs/read_the_docs/_build/html/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Fixes
 - Model a wood storage water heater when "Other Fuel" is sampled from Water Heater Efficiency.tsv (allowing downstream modeling of clothes washer/dryer). Similarly, model a wood wall/floor furnace when "Other" is sampled from HVAC Heating Efficiency.tsv ([#947](https://github.com/NREL/resstock/pull/947))
 - Update ResStockArguments to support nonzero fraction of heat load served by the secondary heating system ([#1090](https://github.com/NREL/resstock/pull/1090))
 - Fix square footage for a MF dwelling unit in the "3000-3999" CFA bin (from 33171 to 3171) ([#1115](https://github.com/NREL/resstock/pull/1115))
+- Fix/clarify duct location assignment by defining Duct Location.tsv, making Duct Leakage and Insulation (formerly Duct) depend on Duct Location, and making HVAC Has Ducts depend on HVAC Has Shared Systems. Includes fixes on standalone and shared heating system assignment for Other Fuel. ([#1112](https://github.com/NREL/resstock/pull/1104), [#1112](https://github.com/NREL/resstock/pull/1112))
 
 ## ResStock v3.1.0
 ###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)

diff --git a/measures/ResStockArguments/measure.xml b/measures/ResStockArguments/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>res_stock_arguments</name>
   <uid>c984bb9e-4ac4-4930-a399-9d23f8f6936a</uid>
-  <version_id>2b2588b3-4f9a-4495-934d-9c654f5693c9</version_id>
-  <version_modified>2023-07-14T22:34:18Z</version_modified>
+  <version_id>96e03c00-108a-4f14-ae2d-26c8a1200ac6</version_id>
+  <version_modified>2023-08-08T01:14:10Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>ResStockArguments</class_name>
   <display_name>ResStock Arguments</display_name>
@@ -167,6 +167,10 @@
           <value>apartment unit</value>
           <display_name>apartment unit</display_name>
         </choice>
+        <choice>
+          <value>manufactured home</value>
+          <display_name>manufactured home</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -320,6 +324,14 @@
           <value>AboveApartment</value>
           <display_name>AboveApartment</display_name>
         </choice>
+        <choice>
+          <value>BellyAndWingWithSkirt</value>
+          <display_name>BellyAndWingWithSkirt</display_name>
+        </choice>
+        <choice>
+          <value>BellyAndWingNoSkirt</value>
+          <display_name>BellyAndWingNoSkirt</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -1315,17 +1327,13 @@
           <display_name>Stove</display_name>
         </choice>
         <choice>
-          <value>PortableHeater</value>
-          <display_name>PortableHeater</display_name>
+          <value>SpaceHeater</value>
+          <display_name>SpaceHeater</display_name>
         </choice>
         <choice>
           <value>Fireplace</value>
           <display_name>Fireplace</display_name>
         </choice>
-        <choice>
-          <value>FixedHeater</value>
-          <display_name>FixedHeater</display_name>
-        </choice>
         <choice>
           <value>Shared Boiler w/ Baseboard</value>
           <display_name>Shared Boiler w/ Baseboard</display_name>
@@ -1857,17 +1865,13 @@
           <display_name>Stove</display_name>
         </choice>
         <choice>
-          <value>PortableHeater</value>
-          <display_name>PortableHeater</display_name>
+          <value>SpaceHeater</value>
+          <display_name>SpaceHeater</display_name>
         </choice>
         <choice>
           <value>Fireplace</value>
           <display_name>Fireplace</display_name>
         </choice>
-        <choice>
-          <value>FixedHeater</value>
-          <display_name>FixedHeater</display_name>
-        </choice>
       </choices>
     </argument>
     <argument>
@@ -2022,6 +2026,13 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>ducts_supply_surface_area_fraction</name>
+      <display_name>ducts_supply_surface_area_fraction</display_name>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>ducts_return_location</name>
       <display_name>ducts_return_location</display_name>
@@ -2053,6 +2064,13 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>ducts_return_surface_area_fraction</name>
+      <display_name>ducts_return_surface_area_fraction</display_name>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>ducts_number_of_return_registers</name>
       <display_name>ducts_number_of_return_registers</display_name>
@@ -5125,7 +5143,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4BDB3CDC</checksum>
+      <checksum>45217B29</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>

diff --git a/measures/UpgradeCosts/measure.xml b/measures/UpgradeCosts/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>upgrade_costs</name>
   <uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
-  <version_id>4311142d-f830-44fe-b61a-8119e617015b</version_id>
-  <version_modified>2023-07-26T21:20:25Z</version_modified>
+  <version_id>510b2ab3-8f45-4f46-a902-9d36ad003999</version_id>
+  <version_modified>2023-08-01T18:01:52Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>