Merge pull request #1054 from NREL/latest-os-hpxml

Latest OS-HPXML
NREL · Mar 15, 2023 · 4407140 · 4407140
2 parents db61108 + 984482f
commit 4407140
Show file tree

Hide file tree

Showing 69 changed files with 53,260 additions and 48,505 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -127,8 +127,8 @@ jobs:
           path: |
             project_national/national_baseline/results_csvs/results_up00.csv
             project_testing/testing_baseline/results_csvs/results_up00.csv
-            project_national/national_upgrades/results_csvs/results_up14.csv
-            project_testing/testing_upgrades/results_csvs/results_up14.csv
+            project_national/national_upgrades/results_csvs/results_up15.csv
+            project_testing/testing_upgrades/results_csvs/results_up15.csv
           name: buildstockbatch
 
   compare-tools:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 ## ResStock v3.1.0 (pending)
 
 Features
-- Ability to check buildstock csv against an options lookup as a command line utility ([#1042](https://github.com/NREL/resstock/pull/1042))
 - Include battery modeling capabilities for project_testing ([#1009](https://github.com/NREL/resstock/pull/1009))
+- Ability to check buildstock csv against an options lookup as a command line utility ([#1042](https://github.com/NREL/resstock/pull/1042))
+- Demonstrate new power outage modeling feature using upgrades specified in example project yml files ([#1054](https://github.com/NREL/resstock/pull/1054))
 
 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))
 
 ## ResStock v3.0.0
 ###### February 3, 2023 - [Diff](https://github.com/NREL/resstock/compare/v2.5.0...v3.0.0)

diff --git a/measures/ReportHPXMLOutput/measure.rb b/measures/ReportHPXMLOutput/measure.rb
@@ -257,6 +257,8 @@ def get_bldg_output(hpxml, bldg_type)
       end
     elsif bldg_type == BO::EnclosureDoorArea
       hpxml.doors.each do |door|
+        next unless door.is_thermal_boundary
+
         bldg_output += door.area
       end
     elsif bldg_type == BO::EnclosureDuctAreaUnconditioned

diff --git a/measures/ReportHPXMLOutput/measure.xml b/measures/ReportHPXMLOutput/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>report_hpxml_output</name>
   <uid>9561a0d7-60ad-48c5-8337-2461df044d80</uid>
-  <version_id>e91baa75-3050-466e-9449-f61616cff1f7</version_id>
-  <version_modified>20221010T224131Z</version_modified>
+  <version_id>5f0a106a-6e88-463f-96c0-88120538cf37</version_id>
+  <version_modified>20230314T222333Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>ReportHPXMLOutput</class_name>
   <display_name>HPXML Output Report</display_name>
@@ -73,7 +73,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>70B9BAD8</checksum>
+      <checksum>24F7911F</checksum>
     </file>
   </files>
 </measure>
diff --git a/measures/ServerDirectoryCleanup/measure.xml b/measures/ServerDirectoryCleanup/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>server_directory_cleanup</name>
   <uid>ec7d04ad-0b7b-495b-825a-e1b6d28d1d3f</uid>
-  <version_id>04aacca1-a5bc-4a91-9318-a28df1e492eb</version_id>
-  <version_modified>20230313T221238Z</version_modified>
+  <version_id>bc53c731-88c9-42f6-8a17-d46c890b2d49</version_id>
+  <version_modified>20230315T145357Z</version_modified>
   <xml_checksum>5F1EDF75</xml_checksum>
   <class_name>ServerDirectoryCleanup</class_name>
   <display_name>Server Directory Cleanup</display_name>

diff --git a/measures/UpgradeCosts/measure.xml b/measures/UpgradeCosts/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>upgrade_costs</name>
   <uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
-  <version_id>c16cac73-b95c-479f-96be-9d784eb550e0</version_id>
-  <version_modified>20230104T191300Z</version_modified>
+  <version_id>acc6eb43-ca31-4f88-a84b-fff517bfc643</version_id>
+  <version_modified>20230314T222333Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>
@@ -203,5 +203,41 @@
       <usage_type>test</usage_type>
       <checksum>58C11733</checksum>
     </file>
+    <file>
+      <filename>MF_1story_UB_Furnace_AC1_FuelTankWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B8E0C23B</checksum>
+    </file>
+    <file>
+      <filename>MF_2story_UB_ASHP2_HPWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7E63F36B</checksum>
+    </file>
+    <file>
+      <filename>MF_2story_UB_Furnace_AC1_FuelTankWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BA8C2BF2</checksum>
+    </file>
+    <file>
+      <filename>Upgrade_MF_1story_UB_Furnace_AC1_FuelTankWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>D9285198</checksum>
+    </file>
+    <file>
+      <filename>Upgrade_MF_2story_UB_ASHP2_HPWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B77AAC8A</checksum>
+    </file>
+    <file>
+      <filename>Upgrade_MF_2story_UB_Furnace_AC1_FuelTankWH.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E3CB8D81</checksum>
+    </file>
   </files>
 </measure>