Merge commit '708b394caf0da70e4ced22b71ba6e6aa6bfb9154' into ll/test_…

…panel_cap
NREL · Nov 7, 2024 · fe58d8a · fe58d8a
2 parents db77049 + 708b394
commit fe58d8a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/measure.rb b/resources/hpxml-measures/BuildResidentialHPXML/measure.rb
@@ -7280,10 +7280,11 @@ def self.set_electric_panel(hpxml_bldg, args)
       end
     end
 
-    if !args[:electric_panel_load_other_power].nil?
+    if !args[:electric_panel_load_other_power].nil? || !args[:electric_panel_load_other_addition].nil?
       panel_loads.add(type: HPXML::ElectricPanelLoadTypeOther,
                       power: args[:electric_panel_load_other_power],
-                      addition: args[:electric_panel_load_other_addition])
+                      addition: args[:electric_panel_load_other_addition],
+                      system_idrefs: [])
     end
   end
 

diff --git a/resources/hpxml-measures/BuildResidentialHPXML/measure.xml b/resources/hpxml-measures/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>c29a0741-2ea5-45a3-9c4e-b209c66a9331</version_id>
-  <version_modified>2024-11-05T21:47:42Z</version_modified>
+  <version_id>90d400d1-feed-4bb9-95aa-5fc13a5c0c23</version_id>
+  <version_modified>2024-11-07T19:42:16Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -8224,7 +8224,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9341DD30</checksum>
+      <checksum>F3BD873E</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>

diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml b/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>edd22c6f-5c7c-4de2-b298-d550a68c3e84</version_id>
-  <version_modified>2024-11-07T17:13:31Z</version_modified>
+  <version_id>993b9729-0a93-4aaa-944d-8eeb8dc67490</version_id>
+  <version_modified>2024-11-07T19:42:18Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -327,7 +327,7 @@
       <filename>defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>D66B2552</checksum>
+      <checksum>D18C348D</checksum>
     </file>
     <file>
       <filename>electric_panel.rb</filename>

diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb
@@ -3331,7 +3331,6 @@ def self.apply_electric_panels(hpxml_bldg, unit_num)
                         system_idrefs_isdefaulted: true)
       end
 
-      # for garbage disposal and garage door opener
       if panel_loads.count { |pl| pl.type == HPXML::ElectricPanelLoadTypeOther } == 0
         panel_loads.add(type: HPXML::ElectricPanelLoadTypeOther,
                         type_isdefaulted: true)