Skip adding shared water heating load onto panel.

NREL · Oct 28, 2024 · 80a2ea5 · 80a2ea5
1 parent c9ef334
commit 80a2ea5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/HPXMLtoOpenStudio/measure.xml b/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>a60c276a-887a-4d9f-bfb7-a251d9b1d5a1</version_id>
-  <version_modified>2024-10-28T17:55:13Z</version_modified>
+  <version_id>bdfb5a0a-53e1-4906-acd4-799991d1f8d2</version_id>
+  <version_modified>2024-10-28T21:43:04Z</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>39AE738F</checksum>
+      <checksum>7D2B2B63</checksum>
     </file>
     <file>
       <filename>electric_panel.rb</filename>

diff --git a/HPXMLtoOpenStudio/resources/defaults.rb b/HPXMLtoOpenStudio/resources/defaults.rb
@@ -6003,10 +6003,10 @@ def self.get_panel_load_watts_breaker_spaces_values(hpxml_bldg, panel_load)
       end
 
     elsif type == HPXML::ElectricPanelLoadTypeWaterHeater
-
       hpxml_bldg.water_heating_systems.each do |water_heating_system|
         next if !system_ids.include?(water_heating_system.id)
         next if water_heating_system.fuel_type != HPXML::FuelTypeElectricity
+        next if water_heating_system.is_shared_system
 
         if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeStorage
           watts += UnitConversions.convert(water_heating_system.heating_capacity, 'btu/hr', 'w') # FIXME: use this instead per Work Plan.docx?
@@ -6124,6 +6124,8 @@ def self.get_panel_load_watts_breaker_spaces_values(hpxml_bldg, panel_load)
         next if plug_load.plug_load_type != HPXML::PlugLoadTypeElectricVehicleCharging
         next if !system_ids.include?(plug_load.id)
 
+        # FIXME: next if MF?
+
         if voltage == 120 # Level 1
           watts += 1650
         else # Level 2