Hard set multiple buildings to a max of 2.

NREL · Aug 15, 2023 · 1ba3f66 · 1ba3f66
1 parent 9e83c7d
commit 1ba3f66
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 35 deletions.
diff --git a/measures/BuildExistingModel/measure.rb b/measures/BuildExistingModel/measure.rb
@@ -336,6 +336,7 @@ def run(model, runner, user_arguments)
         geometry_building_num_units = Integer(get_value_from_workflow_step_value(step_value))
       end
     end
+    geometry_building_num_units = 2 if geometry_building_num_units > 1 # FIXME
 
     (1..geometry_building_num_units).each do |unit_number|
       measures['BuildResidentialHPXML'] = [{ 'hpxml_path' => hpxml_path }]

diff --git a/measures/BuildExistingModel/measure.xml b/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>08f524d7-5d05-4660-a3ba-51e5d9bd2a4b</version_id>
-  <version_modified>2023-08-15T16:32:42Z</version_modified>
+  <version_id>ec376ad1-cb44-498f-8787-6e238e2e3019</version_id>
+  <version_modified>2023-08-15T20:15:52Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildExistingModel</class_name>
   <display_name>Build Existing Model</display_name>
@@ -320,7 +320,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F9C26E2C</checksum>
+      <checksum>96E57326</checksum>
     </file>
   </files>
 </measure>
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>93e601e4-d978-4e10-bdd3-80d29a626909</version_id>
-  <version_modified>2023-08-15T15:56:24Z</version_modified>
+  <version_id>0f87432a-dc65-49b1-a4fa-83201e9c47e9</version_id>
+  <version_modified>2023-08-15T20:14:04Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>
@@ -119,12 +119,6 @@
       <usage_type>test</usage_type>
       <checksum>B9183037</checksum>
     </file>
-    <file>
-      <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F99EFD8E</checksum>
-    </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
@@ -149,12 +143,6 @@
       <usage_type>test</usage_type>
       <checksum>ABFCA3DB</checksum>
     </file>
-    <file>
-      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E5B84130</checksum>
-    </file>
     <file>
       <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
@@ -209,24 +197,6 @@
       <usage_type>test</usage_type>
       <checksum>B165DD4B</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>DE84FF97</checksum>
-    </file>
-    <file>
-      <filename>in.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1730FDEE</checksum>
-    </file>
     <file>
       <filename>upgrade_costs_test.rb</filename>
       <filetype>rb</filetype>

diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -184,6 +184,8 @@ upgrades:
     options:
       - &hvac_heating_efficiency_ashp_seer_22_10_hspf
         option: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
+        apply_logic:
+          - HVAC Has Ducts|Yes
         costs:
           - value: 50.0
             multiplier: Size, Heating System Primary (kBtu/h)

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -217,6 +217,8 @@ upgrades:
     options:
       - &hvac_heating_efficiency_ashp_seer_22_10_hspf
         option: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
+        apply_logic:
+          - HVAC Has Ducts|Yes
         costs:
           - value: 50.0
             multiplier: Size, Heating System Primary (kBtu/h)