diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml index 6dbc47c572..f740c98d86 100644 --- a/HPXMLtoOpenStudio/measure.xml +++ b/HPXMLtoOpenStudio/measure.xml @@ -3,8 +3,8 @@ 3.1 hpxm_lto_openstudio b1543b30-9465-45ff-ba04-1d1f85e763bc - 623db81b-5061-420a-960f-8d33a1ed0aa5 - 2024-10-21T17:55:08Z + d4204431-8a89-43a5-84d2-55a89309869f + 2024-10-21T19:45:04Z D8922A73 HPXMLtoOpenStudio HPXML to OpenStudio Translator @@ -327,7 +327,7 @@ defaults.rb rb resource - 60D12E27 + 2F35F039 electric_panel.rb diff --git a/HPXMLtoOpenStudio/resources/defaults.rb b/HPXMLtoOpenStudio/resources/defaults.rb index 33442141f8..52b316a26e 100644 --- a/HPXMLtoOpenStudio/resources/defaults.rb +++ b/HPXMLtoOpenStudio/resources/defaults.rb @@ -3264,6 +3264,7 @@ def self.apply_electric_panels(hpxml_bldg, unit_num) ventilation_fan_ids = [] hpxml_bldg.ventilation_fans.each do |ventilation_fan| next if !ventilation_fan.panel_loads.nil? + next if ![HPXML::LocationKitchen, HPXML::LocationBath].include?(ventilation_fan.fan_location) ventilation_fan_ids << ventilation_fan.id end @@ -3273,7 +3274,7 @@ def self.apply_electric_panels(hpxml_bldg, unit_num) end if panel_loads.count { |pl| pl.type == HPXML::ElectricPanelLoadTypeOther && pl.system_idrefs.empty? } == 0 - panel_loads.add(type: HPXML::ElectricPanelLoadTypeOther) # for garbage disposal and garage door opener + panel_loads.add(type: HPXML::ElectricPanelLoadTypeOther, system_idrefs: []) # for garbage disposal and garage door opener end if panel_loads.count { |pl| pl.type == HPXML::ElectricPanelLoadTypeLighting } == 0 electric_panel.panel_loads.add(type: HPXML::ElectricPanelLoadTypeLighting) @@ -3291,7 +3292,6 @@ def self.apply_electric_panels(hpxml_bldg, unit_num) panel_load.voltage_isdefaulted = true end if panel_load.watts.nil? - puts "#{panel_load.type} #{panel_load.system_idrefs}" panel_load.watts = get_panel_load_watts_default_values(hpxml_bldg, panel_load.type, panel_load.voltage, panel_load.system_idrefs) panel_load.watts_isdefaulted = true end @@ -5941,7 +5941,7 @@ def self.get_panel_load_watts_default_values(hpxml_bldg, type, voltage, system_i elsif type == HPXML::ElectricPanelLoadTypeLaundry return 1500 elsif type == HPXML::ElectricPanelLoadTypeOther - if system_ids.nil? || system_ids.empty? + if system_ids.empty? watts += 559 # Garbage disposal if hpxml_bldg.has_location(HPXML::LocationGarage) diff --git a/workflow/hpxml_inputs.json b/workflow/hpxml_inputs.json index ba13c38903..b134ff0f8a 100644 --- a/workflow/hpxml_inputs.json +++ b/workflow/hpxml_inputs.json @@ -1625,6 +1625,26 @@ "cooling_system_panel_load_breaker_spaces": 2, "cooling_system_panel_load_addition": false }, + "sample_files/base-detailed-electric-panel-upgrade.xml": { + "parent_hpxml": "sample_files/base-detailed-electric-panel.xml", + "heating_system_type": "none", + "cooling_system_type": "none", + "heat_pump_type": "air-to-air", + "heat_pump_heating_efficiency": 7.7, + "heat_pump_cooling_efficiency": 13, + "heat_pump_heating_capacity": 52280, + "heat_pump_cooling_capacity": 52280, + "heat_pump_backup_type": "integrated", + "heat_pump_backup_heating_efficiency": 1, + "heat_pump_backup_heating_capacity": 27960, + "heat_pump_panel_load_watts": 17943, + "heat_pump_panel_load_addition": true, + "water_heater_fuel_type": "electricity", + "cooking_range_oven_fuel_type": "electricity", + "clothes_dryer_fuel_type": "electricity", + "misc_plug_loads_vehicle_present": true, + "electric_panel_num_breaker_spaces": 7 + }, "sample_files/base-enclosure-2stories.xml": { "parent_hpxml": "sample_files/base.xml", "geometry_unit_num_floors_above_grade": 2, diff --git a/workflow/sample_files/base-detailed-electric-panel-upgrade.xml b/workflow/sample_files/base-detailed-electric-panel-upgrade.xml new file mode 100644 index 0000000000..49be58cb52 --- /dev/null +++ b/workflow/sample_files/base-detailed-electric-panel-upgrade.xml @@ -0,0 +1,600 @@ + + + + HPXML + tasks.rb + 2000-01-01T00:00:00-07:00 + create + + + + + 60 + + + + Bills + + + + + + + + +
+ CO +
+ + + proposed workscope + + + + + suburban + stand-alone + no units above or below + 180 + + electricity + natural gas + + + + single-family detached + 2.0 + 1.0 + 8.0 + 3 + 2 + 1228.0 + 9824.0 + + + + + 2006 + 5B + + + + USA_CO_Denver.Intl.AP.725650_TMY3 + + USA_CO_Denver.Intl.AP.725650_TMY3.epw + + + + + + + + 50.0 + + ACH + 3.0 + + 9824.0 + + + + + + + + false + + + false + + + + + + + + + + + true + + + + + + + + + + + attic - unvented + 686.5 + asphalt or fiberglass shingles + 0.7 + 0.92 + 6.0 + + + 2.3 + + + + + + + outside + basement - conditioned + 78.0 + wood siding + 0.7 + 0.92 + + + 23.0 + + + + + + + outside + conditioned space + + + + 809.3 + wood siding + 0.7 + 0.92 + + gypsum board + + + + 23.0 + + + + + outside + attic - unvented + gable + + + + 102.3 + wood siding + 0.7 + 0.92 + + + 4.0 + + + + + + + ground + basement - conditioned + 8.0 + 809.3 + 8.0 + 7.0 + + gypsum board + + + + + continuous - exterior + 8.9 + 0.0 + 8.0 + + + continuous - interior + 0.0 + + + + + + + + attic - unvented + conditioned space + ceiling + + + + 614.0 + + gypsum board + + + + 39.3 + + + + + + + basement - conditioned + 614.0 + 4.0 + 101.2 + + + + 0.0 + 0.0 + + + + + + 0.0 + 0.0 + + + + 0.0 + 0.0 + + + + + + + 108.0 + 0 + 0.33 + 0.45 + + + 0.7 + 0.85 + + 0.67 + + + + + 72.0 + 90 + 0.33 + 0.45 + + + 0.7 + 0.85 + + 0.67 + + + + + 108.0 + 180 + 0.33 + 0.45 + + + 0.7 + 0.85 + + 0.67 + + + + + 72.0 + 270 + 0.33 + 0.45 + + + 0.7 + 0.85 + + 0.67 + + + + + + + + 40.0 + 180 + 4.4 + + + + + + + + + + air-to-air + electricity + 52280.0 + 52280.0 + integrated + electricity + + Percent + 1.0 + + 27960.0 + 0.0 + 0.0 + + SEER + 13.0 + + + HSPF + 7.7 + + + + + + + + + + + regular velocity + + supply + + CFM25 + 75.0 + to outside + + + + return + + CFM25 + 25.0 + to outside + + + + + supply + 4.0 + attic - unvented + 150.0 + + + + return + 0.0 + attic - unvented + 50.0 + + + + + + + + + + 1 + kitchen + true + + + + 2 + bath + true + + + + + + + electricity + storage water heater + conditioned space + 40.0 + 1.0 + 18767.0 + 0.95 + 125.0 + + + + + + 50.0 + + + + 0.0 + + + + + shower head + true + + + + faucet + false + + + + + + 240 + 100.0 + + 7 + + + Heating + 17943.0 + true + + + + Cooling + 17943.0 + true + + + + Hot Water + + + + Clothes Dryer + + + + Range/Oven + + + + Electric Vehicle Charging + + + + Other + + + Other + + + + + + + + + + + + conditioned space + 1.21 + 380.0 + 0.12 + 1.09 + 27.0 + 6.0 + 3.2 + + + + conditioned space + electricity + 3.73 + true + 150.0 + + + + conditioned space + 650.0 + + + + conditioned space + electricity + false + + + + false + + + + + + interior + 0.4 + + + + + + + interior + 0.1 + + + + + + + interior + 0.25 + + + + + + + exterior + 0.4 + + + + + + + exterior + 0.1 + + + + + + + exterior + 0.25 + + + + + + + + + TV other + + kWh/year + 620.0 + + + + + other + + kWh/year + 2457.0 + + + 0.855 + 0.045 + + + + + electric vehicle charging + + + + + \ No newline at end of file