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

Latest OS-HPXML
NREL · Aug 18, 2022 · 6346b77 · 6346b77
2 parents 52b53f0 + cc6c63d
commit 6346b77
Show file tree

Hide file tree

Showing 53 changed files with 272 additions and 301 deletions.
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>3ef1d4d9-38b2-43e5-9b98-8240c7a8bf73</version_id>
-  <version_modified>20220817T223140Z</version_modified>
+  <version_id>8563ad85-03da-4290-874d-412993187788</version_id>
+  <version_modified>20220818T192129Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>
@@ -34,184 +34,154 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <filename>upgrade_costs_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>4EABC096</checksum>
+    </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.1.0</identifier>
+        <min_compatible>3.1.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>7CB40E44</checksum>
+    </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5EC2B4D7</checksum>
+      <checksum>E2781C40</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D1C1B3AD</checksum>
+      <checksum>ECD707DC</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EE3CC9A0</checksum>
+      <checksum>43C24A36</checksum>
     </file>
     <file>
       <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>95D1DCFA</checksum>
+      <checksum>FE68B1FD</checksum>
     </file>
     <file>
       <filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B2808DC9</checksum>
+      <checksum>6D3BE450</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CDC62E86</checksum>
+      <checksum>AC402107</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E14290C6</checksum>
+      <checksum>21131744</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B4C82AD8</checksum>
+      <checksum>47934044</checksum>
     </file>
     <file>
       <filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>AA7568D2</checksum>
+      <checksum>8688EC0A</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A3A583D8</checksum>
+      <checksum>64DF8224</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5DA5472C</checksum>
+      <checksum>85C46CF2</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8B31393C</checksum>
+      <checksum>D4A19414</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>95114CB1</checksum>
+      <checksum>C2BCE7DF</checksum>
     </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EFDDF947</checksum>
-    </file>
-    <file>
-      <filename>upgrade_costs_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>4EABC096</checksum>
-    </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.1.0</identifier>
-        <min_compatible>3.1.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>7CB40E44</checksum>
+      <checksum>A697FC80</checksum>
     </file>
     <file>
       <filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>471EF712</checksum>
+      <checksum>791BAED2</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>10BCBA58</checksum>
+      <checksum>803F1879</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5021CF1A</checksum>
+      <checksum>F537066D</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>08F8E2E4</checksum>
+      <checksum>A86EC369</checksum>
     </file>
     <file>
       <filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>316C81E3</checksum>
+      <checksum>53458E45</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>86E2725E</checksum>
+      <checksum>DA5EDD11</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8B619173</checksum>
+      <checksum>6E1EA535</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D2401E4C</checksum>
-    </file>
-    <file>
-      <filename>in.epw</filename>
-      <filetype>epw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E23378AA</checksum>
-    </file>
-    <file>
-      <filename>in.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>6A86BAAA</checksum>
-    </file>
-    <file>
-      <filename>in.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>FE8D9010</checksum>
-    </file>
-    <file>
-      <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>7767FDDF</checksum>
-    </file>
-    <file>
-      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1F1F953A</checksum>
+      <checksum>0FF62C85</checksum>
     </file>
   </files>
 </measure>
diff --git a/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw
@@ -155,7 +155,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -307,8 +307,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw
@@ -154,7 +154,7 @@
         "hot_tub_heater_usage_multiplier": 1.0,
         "hot_tub_present": false,
         "hot_tub_pump_usage_multiplier": 1.0,
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.xml",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.xml",
         "kitchen_fans_quantity": 0,
         "lighting_present": true,
         "lighting_exterior_fraction_cfl": 0.4,
@@ -306,8 +306,8 @@
     },
     {
       "arguments": {
-        "hpxml_path": "../../../measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.xml",
-        "output_dir": "../../../measures/UpgradeCosts/tests",
+        "hpxml_path": "measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.xml",
+        "output_dir": "measures/UpgradeCosts/tests",
         "debug": "true"
       },
       "measure_dir_name": "HPXMLtoOpenStudio"