diff --git a/BuildResidentialHPXML/measure.rb b/BuildResidentialHPXML/measure.rb
index dfe0503989..d655379991 100644
--- a/BuildResidentialHPXML/measure.rb
+++ b/BuildResidentialHPXML/measure.rb
@@ -1717,6 +1717,8 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
water_heater_efficiency_type_choices = OpenStudio::StringVector.new
water_heater_efficiency_type_choices << 'EnergyFactor'
water_heater_efficiency_type_choices << 'UniformEnergyFactor'
+ water_heater_efficiency_type_choices << 'ThermalEfficiency'
+ water_heater_efficiency_type_choices << 'HeatPumpCOP'
water_heater_usage_bin_choices = OpenStudio::StringVector.new
water_heater_usage_bin_choices << HPXML::WaterHeaterUsageBinVerySmall
@@ -1724,6 +1726,11 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
water_heater_usage_bin_choices << HPXML::WaterHeaterUsageBinMedium
water_heater_usage_bin_choices << HPXML::WaterHeaterUsageBinHigh
+ water_heater_standby_loss_units_choices = OpenStudio::StringVector.new
+ water_heater_standby_loss_units_choices << HPXML::UnitsDegFPerHour
+ water_heater_standby_loss_units_choices << HPXML::UnitsPercentPerHour
+ water_heater_standby_loss_units_choices << HPXML::UnitsBtuPerHour
+
arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('water_heater_type', water_heater_type_choices, true)
arg.setDisplayName('Water Heater: Type')
arg.setDescription("The type of water heater. Use 'none' if there is no water heater.")
@@ -1749,13 +1756,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('water_heater_efficiency_type', water_heater_efficiency_type_choices, true)
arg.setDisplayName('Water Heater: Efficiency Type')
- arg.setDescription('The efficiency type of water heater. Does not apply to space-heating boilers.')
+ arg.setDescription("The efficiency type of water heater. Does not apply to space-heating boilers. For commercial water heaters, 'ThermalEfficiency' must be used for non-heat pump water heaters and 'HeatPumpCOP' must be used for heat pump water heaters.")
arg.setDefaultValue('EnergyFactor')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('water_heater_efficiency', true)
arg.setDisplayName('Water Heater: Efficiency')
- arg.setDescription('Rated Energy Factor or Uniform Energy Factor. Does not apply to space-heating boilers.')
+ arg.setDescription('Rated Energy Factor or Uniform Energy Factor or Thermal Efficiency. Does not apply to space-heating boilers.')
arg.setDefaultValue(0.67)
args << arg
@@ -1776,10 +1783,14 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg.setUnits('Btu/hr')
args << arg
+ arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('water_heater_standby_loss_units', water_heater_standby_loss_units_choices, false)
+ arg.setDisplayName('Water Heater: Standby Loss Units')
+ arg.setDescription("The standby loss units of water heater. Only applies to space-heating boilers and commercial water heaters w/ thermal efficiency inputs. Must be '#{HPXML::UnitsDegFPerHour}' for space-heating boilers and must be '#{HPXML::UnitsBtuPerHour}' or '#{HPXML::UnitsPercentPerHour}' (entered as a fraction, e.g., 1.20%/hr = 0.0120) for commercial water heaters w/ thermal efficiency inputs.")
+ args << arg
+
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('water_heater_standby_loss', false)
arg.setDisplayName('Water Heater: Standby Loss')
arg.setDescription('The standby loss of water heater. Only applies to space-heating boilers. If not provided, the OS-HPXML default is used.')
- arg.setUnits('deg-F/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('water_heater_jacket_rvalue', false)
@@ -5200,6 +5211,19 @@ def self.set_water_heating_systems(hpxml, args)
if water_heater_type != HPXML::WaterHeaterTypeTankless
usage_bin = args[:water_heater_usage_bin].get if args[:water_heater_usage_bin].is_initialized
end
+ elsif args[:water_heater_efficiency_type] == 'ThermalEfficiency' && args[:water_heater_type] != HPXML::WaterHeaterTypeHeatPump
+ thermal_efficiency = args[:water_heater_efficiency]
+ if args[:water_heater_standby_loss_units].is_initialized && args[:water_heater_standby_loss].is_initialized
+ standby_loss_units = args[:water_heater_standby_loss_units].get
+ standby_loss_value = args[:water_heater_standby_loss].get
+ end
+ elsif args[:water_heater_efficiency_type] == 'HeatPumpCOP' && args[:water_heater_type] == HPXML::WaterHeaterTypeHeatPump
+ heat_pump_cop = args[:water_heater_efficiency]
+ end
+ else
+ if args[:water_heater_standby_loss].is_initialized
+ standby_loss_units = args[:water_heater_standby_loss_units].get
+ standby_loss_value = args[:water_heater_standby_loss].get
end
end
@@ -5225,15 +5249,6 @@ def self.set_water_heating_systems(hpxml, args)
end
end
- if [HPXML::WaterHeaterTypeCombiTankless, HPXML::WaterHeaterTypeCombiStorage].include? water_heater_type
- if args[:water_heater_standby_loss].is_initialized
- if args[:water_heater_standby_loss].get > 0
- standby_loss_units = HPXML::UnitsDegFPerHour
- standby_loss_value = args[:water_heater_standby_loss].get
- end
- end
- end
-
if not [HPXML::WaterHeaterTypeTankless, HPXML::WaterHeaterTypeCombiTankless].include? water_heater_type
if args[:water_heater_jacket_rvalue].is_initialized
if args[:water_heater_jacket_rvalue].get > 0
@@ -5288,6 +5303,8 @@ def self.set_water_heating_systems(hpxml, args)
fraction_dhw_load_served: 1.0,
energy_factor: energy_factor,
uniform_energy_factor: uniform_energy_factor,
+ thermal_efficiency: thermal_efficiency,
+ heat_pump_cop: heat_pump_cop,
usage_bin: usage_bin,
recovery_efficiency: recovery_efficiency,
uses_desuperheater: uses_desuperheater,
diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
index a532112d46..7a7db598f5 100644
--- a/BuildResidentialHPXML/measure.xml
+++ b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
3.0
build_residential_hpxml
a13a8983-2b01-4930-8af2-42030b6e4233
- 9a3394b8-30aa-4f07-a4c7-dfa6bbf1ba4b
- 20220929T155118Z
+ 1c9724ae-7bd0-45d7-baa5-69e468fcd7d8
+ 20220929T200809Z
2C38F48B
BuildResidentialHPXML
HPXML Builder
@@ -3580,7 +3580,7 @@
water_heater_efficiency_type
Water Heater: Efficiency Type
- The efficiency type of water heater. Does not apply to space-heating boilers.
+ The efficiency type of water heater. Does not apply to space-heating boilers. For commercial water heaters, 'ThermalEfficiency' must be used for non-heat pump water heaters and 'HeatPumpCOP' must be used for heat pump water heaters.
Choice
true
false
@@ -3594,12 +3594,20 @@
UniformEnergyFactor
UniformEnergyFactor
+
+ ThermalEfficiency
+ ThermalEfficiency
+
+
+ HeatPumpCOP
+ HeatPumpCOP
+
water_heater_efficiency
Water Heater: Efficiency
- Rated Energy Factor or Uniform Energy Factor. Does not apply to space-heating boilers.
+ Rated Energy Factor or Uniform Energy Factor or Thermal Efficiency. Does not apply to space-heating boilers.
Double
true
false
@@ -3649,12 +3657,33 @@
false
false
+
+ water_heater_standby_loss_units
+ Water Heater: Standby Loss Units
+ The standby loss units of water heater. Only applies to space-heating boilers and commercial water heaters w/ thermal efficiency inputs. Must be 'F/hr' for space-heating boilers and must be 'Btu/hr' or '%/hr' (entered as a fraction, e.g., 1.20%/hr = 0.0120) for commercial water heaters w/ thermal efficiency inputs.
+ Choice
+ false
+ false
+
+
+ F/hr
+ F/hr
+
+
+ %/hr
+ %/hr
+
+
+ Btu/hr
+ Btu/hr
+
+
+
water_heater_standby_loss
Water Heater: Standby Loss
The standby loss of water heater. Only applies to space-heating boilers. If not provided, the OS-HPXML default is used.
Double
- deg-F/hr
false
false
@@ -6413,7 +6442,7 @@
measure.rb
rb
script
- C00BFDD4
+ 2E6C3073
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index db7dfee38c..3947bf3561 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.0
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- 65d82b9f-532d-400b-8f27-183b6b08f5f9
- 20220929T155120Z
+ 907297dd-8a60-448d-88d5-9ac75c8c5666
+ 20220929T200811Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -374,22 +374,28 @@
FC171B98
- simcontrols.rb
- rb
+ hpxml_schema/HPXMLDataTypes.xsd
+ xsd
resource
- 3AFD26FF
+ 5559DDD1
- schedules.rb
- rb
+ hpxml_schematron/HPXMLvalidator.xml
+ xml
resource
- 93E95B59
+ 373D02F9
- location.rb
+ hpxml_schema/HPXMLBaseElements.xsd
+ xsd
+ resource
+ 32481882
+
+
+ waterheater.rb
rb
resource
- DF9CC863
+ 4851D42B
test_pv.rb
@@ -409,6 +415,12 @@
test
F8FA0CA7
+
+ simcontrols.rb
+ rb
+ resource
+ 3AFD26FF
+
test_location.rb
rb
@@ -439,6 +451,12 @@
test
869F95B2
+
+ output.rb
+ rb
+ resource
+ 0D0399FA
+
test_water_heater.rb
rb
@@ -452,16 +470,22 @@
D8E236C3
- test_weather.rb
+ schedules.rb
rb
- test
- 89B1B71D
+ resource
+ 93E95B59
- test_hvac.rb
+ airflow.rb
+ rb
+ resource
+ A2B7F8E1
+
+
+ test_airflow.rb
rb
test
- B13FEA8C
+ 15015829
test_enclosure.rb
@@ -470,28 +494,34 @@
085C4908
- output.rb
+ weather.rb
rb
resource
- 0D0399FA
+ 84489603
- test_airflow.rb
+ location.rb
+ rb
+ resource
+ DF9CC863
+
+
+ test_weather.rb
rb
test
- 15015829
+ 89B1B71D
- weather.rb
+ test_hvac.rb
rb
- resource
- 84489603
+ test
+ B13FEA8C
- airflow.rb
+ materials.rb
rb
resource
- A2B7F8E1
+ 24DCB986
hotwater_appliances.rb
@@ -500,10 +530,10 @@
1BAC39B2
- materials.rb
+ hvac.rb
rb
resource
- 24DCB986
+ 41063A6B
constructions.rb
@@ -512,16 +542,16 @@
6F6B5865
- test_validation.rb
+ test_hvac_sizing.rb
rb
test
- 675AC983
+ CEA9E398
- hvac.rb
+ hvac_sizing.rb
rb
resource
- 41063A6B
+ 42C2E302
@@ -535,64 +565,34 @@
927B84D4
- test_hvac_sizing.rb
+ test_defaults.rb
rb
test
- CEA9E398
+ 48381849
- hvac_sizing.rb
+ hpxml.rb
rb
resource
- 42C2E302
+ 32854C0C
- waterheater.rb
+ hpxml_defaults.rb
rb
resource
- 65181200
+ C705D4F4
- hpxml_schema/HPXMLBaseElements.xsd
- xsd
- resource
- 32481882
-
-
- hpxml_schema/HPXMLDataTypes.xsd
- xsd
- resource
- 5559DDD1
-
-
- hpxml_schematron/HPXMLvalidator.xml
- xml
- resource
- 6FFC25E9
-
-
- test_defaults.rb
+ test_validation.rb
rb
test
- 48381849
-
-
- hpxml_defaults.rb
- rb
- resource
- 23576669
+ A1169205
hpxml_schematron/EPvalidator.xml
xml
resource
- 6499B5B3
-
-
- hpxml.rb
- rb
- resource
- 3450451E
+ 0FBDC13B
diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
index 46fa573fea..a369385ac3 100644
--- a/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -4642,8 +4642,8 @@ def from_oga(hpxml)
end
class WaterHeatingSystem < BaseElement
- ATTRS = [:id, :year_installed, :fuel_type, :water_heater_type, :location, :performance_adjustment,
- :tank_volume, :fraction_dhw_load_served, :heating_capacity, :energy_factor, :usage_bin,
+ ATTRS = [:id, :year_installed, :fuel_type, :water_heater_type, :location, :performance_adjustment, :heat_pump_cop,
+ :tank_volume, :fraction_dhw_load_served, :heating_capacity, :energy_factor, :thermal_efficiency, :usage_bin,
:uniform_energy_factor, :first_hour_rating, :recovery_efficiency, :uses_desuperheater, :jacket_r_value,
:related_hvac_idref, :third_party_certification, :standby_loss_units, :standby_loss_value,
:temperature, :is_shared_system, :number_of_units_served, :tank_model_type, :operating_mode]
@@ -4695,9 +4695,11 @@ def to_oga(doc)
XMLHelper.add_element(water_heating_system, 'HeatingCapacity', @heating_capacity, :float, @heating_capacity_isdefaulted) unless @heating_capacity.nil?
XMLHelper.add_element(water_heating_system, 'EnergyFactor', @energy_factor, :float, @energy_factor_isdefaulted) unless @energy_factor.nil?
XMLHelper.add_element(water_heating_system, 'UniformEnergyFactor', @uniform_energy_factor, :float) unless @uniform_energy_factor.nil?
+ XMLHelper.add_element(water_heating_system, 'HeatPumpCOP', @heat_pump_cop, :float) unless @heat_pump_cop.nil?
XMLHelper.add_element(water_heating_system, 'FirstHourRating', @first_hour_rating, :float) unless @first_hour_rating.nil?
XMLHelper.add_element(water_heating_system, 'UsageBin', @usage_bin, :string, @usage_bin_isdefaulted) unless @usage_bin.nil?
XMLHelper.add_element(water_heating_system, 'RecoveryEfficiency', @recovery_efficiency, :float, @recovery_efficiency_isdefaulted) unless @recovery_efficiency.nil?
+ XMLHelper.add_element(water_heating_system, 'ThermalEfficiency', @thermal_efficiency, :float, @thermal_efficiency_isdefaulted) unless @thermal_efficiency.nil?
if not @jacket_r_value.nil?
water_heater_insulation = XMLHelper.add_element(water_heating_system, 'WaterHeaterInsulation')
jacket = XMLHelper.add_element(water_heater_insulation, 'Jacket')
@@ -4738,9 +4740,11 @@ def from_oga(water_heating_system)
@heating_capacity = XMLHelper.get_value(water_heating_system, 'HeatingCapacity', :float)
@energy_factor = XMLHelper.get_value(water_heating_system, 'EnergyFactor', :float)
@uniform_energy_factor = XMLHelper.get_value(water_heating_system, 'UniformEnergyFactor', :float)
+ @heat_pump_cop = XMLHelper.get_value(water_heating_system, 'HeatPumpCOP', :float)
@first_hour_rating = XMLHelper.get_value(water_heating_system, 'FirstHourRating', :float)
@usage_bin = XMLHelper.get_value(water_heating_system, 'UsageBin', :string)
@recovery_efficiency = XMLHelper.get_value(water_heating_system, 'RecoveryEfficiency', :float)
+ @thermal_efficiency = XMLHelper.get_value(water_heating_system, 'ThermalEfficiency', :float)
@jacket_r_value = XMLHelper.get_value(water_heating_system, 'WaterHeaterInsulation/Jacket/JacketRValue', :float)
@standby_loss_units = XMLHelper.get_value(water_heating_system, 'StandbyLoss/Units', :string)
@standby_loss_value = XMLHelper.get_value(water_heating_system, 'StandbyLoss/Value', :float)
diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 4107bd0753..0f40d1f263 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -489,9 +489,13 @@ def self.apply_building_construction(hpxml, cfa, nbeds, infil_volume)
end
hpxml.water_heating_systems.each do |water_heating_system|
if not water_heating_system.energy_factor.nil?
- next if water_heating_system.energy_factor >= 0.63
+ next if water_heating_system.energy_factor >= 0.64
elsif not water_heating_system.uniform_energy_factor.nil?
- next if Waterheater.calc_ef_from_uef(water_heating_system) >= 0.63
+ next if Waterheater.calc_ef_from_uef(water_heating_system) >= 0.64
+ elsif not water_heating_system.thermal_efficiency.nil?
+ next if water_heating_system.thermal_efficiency >= 0.80 # FIXME: Need to review
+ elsif not water_heating_system.heat_pump_cop.nil?
+ next
end
hpxml.building_construction.has_flue_or_chimney = true
@@ -1683,7 +1687,7 @@ def self.apply_water_heaters(hpxml, nbeds, eri_version, schedules_file)
water_heating_system.tank_volume = Waterheater.get_default_tank_volume(water_heating_system.fuel_type, nbeds, hpxml.building_construction.number_of_bathrooms)
water_heating_system.tank_volume_isdefaulted = true
end
- if water_heating_system.energy_factor.nil? && water_heating_system.uniform_energy_factor.nil?
+ if water_heating_system.energy_factor.nil? && water_heating_system.uniform_energy_factor.nil? && water_heating_system.thermal_efficiency.nil? && water_heating_system.heat_pump_cop.nil?
water_heating_system.energy_factor = Waterheater.get_default_water_heater_efficiency_by_year_installed(water_heating_system.year_installed, water_heating_system.fuel_type)
water_heating_system.energy_factor_isdefaulted = true
end
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index 908ef69fa5..4c52e300ea 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -1517,10 +1517,13 @@
Expected FuelType to be 'natural gas' or 'fuel oil' or 'fuel oil 1' or 'fuel oil 2' or 'fuel oil 4' or 'fuel oil 5/6' or 'diesel' or 'propane' or 'kerosene' or 'coal' or 'coke' or 'bituminous coal' or 'anthracite coal' or 'electricity' or 'wood' or 'wood pellets'
Expected 0 or 1 element(s) for xpath: TankVolume
Expected 0 or 1 element(s) for xpath: HeatingCapacity
- Expected 1 or more element(s) for xpath: UniformEnergyFactor | EnergyFactor | YearInstalled
- Expected 0 or 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor
+ Expected 1 or more element(s) for xpath: UniformEnergyFactor | EnergyFactor | ThermalEfficiency | YearInstalled
+ Expected 0 or 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor | ThermalEfficiency
Expected UniformEnergyFactor to be less than 1
Expected EnergyFactor to be less than 1
+ Expected ThermalEfficiency to be less than 1
+ Expected 0 or 2 element(s) for xpath: ThermalEfficiency | StandbyLoss[Units="Btu/hr" or Units="%/hr"]/Value
+ Expected StandbyLoss[Units="%/hr"]/Value to be less than 0.1
Expected 0 or more element(s) for xpath: UsageBin | FirstHourRating
Expected 0 or 1 element(s) for xpath: RecoveryEfficiency
Expected RecoveryEfficiency to be greater than EnergyFactor
@@ -1531,6 +1534,7 @@
UniformEnergyFactor should typically be greater than or equal to 0.45.
EnergyFactor should typically be greater than or equal to 0.45.
+ ThermalEfficiency should typically be greater than or equal to 0.45.
Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1541,12 +1545,16 @@
Expected 1 element(s) for xpath: FuelType
Expected FuelType to be 'natural gas' or 'fuel oil' or 'fuel oil 1' or 'fuel oil 2' or 'fuel oil 4' or 'fuel oil 5/6' or 'diesel' or 'propane' or 'kerosene' or 'coal' or 'coke' or 'bituminous coal' or 'anthracite coal' or 'electricity' or 'wood' or 'wood pellets'
Expected 0 or 1 element(s) for xpath: PerformanceAdjustment
- Expected 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor
+ Expected 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor | ThermalEfficiency
Expected UniformEnergyFactor to be less than 1
Expected EnergyFactor to be less than 1
+ Expected ThermalEfficiency to be less than 1
+ Expected 0 or 2 element(s) for xpath: ThermalEfficiency | StandbyLoss[Units="Btu/hr" or Units="%/hr"]/Value
+ Expected StandbyLoss[Units="%/hr"]/Value to be less than 0.1
UniformEnergyFactor should typically be greater than or equal to 0.45.
EnergyFactor should typically be greater than or equal to 0.45.
+ ThermalEfficiency should typically be greater than or equal to 0.45.
@@ -1555,10 +1563,11 @@
Expected 1 element(s) for xpath: FuelType[text()="electricity"]
Expected 1 element(s) for xpath: TankVolume
- Expected 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor
+ Expected 1 element(s) for xpath: UniformEnergyFactor | EnergyFactor | HeatPumpCOP
Expected 0 or more element(s) for xpath: UsageBin | FirstHourRating
Expected UniformEnergyFactor to be greater than 1
Expected EnergyFactor to be greater than 1
+ Expected HeatPumpCOP to be greater than 1
Expected 0 or 1 element(s) for xpath: WaterHeaterInsulation/Jacket/JacketRValue
Expected 0 or 1 element(s) for xpath: extension/OperatingMode
Expected extension/OperatingMode to be 'standard' or 'heat pump only'
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/HPXMLvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/HPXMLvalidator.xml
index 49f64f4abe..1be96ec5f9 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/HPXMLvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/HPXMLvalidator.xml
@@ -399,10 +399,13 @@
Expected EnergyFactor to be greater than 0
Expected UniformEnergyFactor to be less than or equal to 5
Expected UniformEnergyFactor to be greater than 0
+ Expected HeatPumpCOP to be greater than 0
Expected FirstHourRating to be greater than 0
Expected UsageBin to be 'very small' or 'low' or 'medium' or 'high'
Expected RecoveryEfficiency to be less than or equal to 5
Expected RecoveryEfficiency to be greater than 0
+ Expected ThermalEfficiency to be less than or equal to 1
+ Expected ThermalEfficiency to be greater than 0
Expected SystemIdentifier with id attribute
Expected idref attribute for RelatedHVACSystem
diff --git a/HPXMLtoOpenStudio/resources/waterheater.rb b/HPXMLtoOpenStudio/resources/waterheater.rb
index 89a154e77b..5cb86a84f7 100644
--- a/HPXMLtoOpenStudio/resources/waterheater.rb
+++ b/HPXMLtoOpenStudio/resources/waterheater.rb
@@ -15,7 +15,7 @@ def self.apply_tank(model, runner, loc_space, loc_schedule, water_heating_system
new_manager.addToNode(loop.supplyOutletNode)
act_vol = calc_storage_tank_actual_vol(water_heating_system.tank_volume, water_heating_system.fuel_type)
- u, ua, eta_c = calc_tank_UA(act_vol, water_heating_system, solar_fraction)
+ u, ua, eta_c = calc_tank_ua(act_vol, water_heating_system, solar_fraction)
new_heater = create_new_heater(name: Constants.ObjectNameWaterHeater,
water_heating_system: water_heating_system,
act_vol: act_vol,
@@ -51,7 +51,7 @@ def self.apply_tankless(model, runner, loc_space, loc_schedule, water_heating_sy
new_manager.addToNode(loop.supplyOutletNode)
act_vol = 1.0
- _u, ua, eta_c = calc_tank_UA(act_vol, water_heating_system, solar_fraction)
+ _u, ua, eta_c = calc_tank_ua(act_vol, water_heating_system, solar_fraction)
new_heater = create_new_heater(name: Constants.ObjectNameWaterHeater,
water_heating_system: water_heating_system,
act_vol: act_vol,
@@ -193,8 +193,8 @@ def self.apply_combi(model, runner, loc_space, loc_schedule, water_heating_syste
end
act_vol = calc_storage_tank_actual_vol(water_heating_system.tank_volume, nil)
- a_side = calc_tank_areas(act_vol)[1]
- ua = calc_indirect_ua_with_standbyloss(act_vol, water_heating_system, a_side, solar_fraction)
+ _, a_side = calc_tank_areas(act_vol)
+ ua = calc_tank_ua_from_standby_loss(act_vol, water_heating_system, a_side, solar_fraction)
else
ua = 0.0
act_vol = 1.0
@@ -753,7 +753,7 @@ def self.setup_hpwh_dxcoil(model, water_heating_system, weather, obj_name_hpwh,
# Calculate the COP based on EF
if not water_heating_system.energy_factor.nil?
- uef = (0.60522 + water_heating_system.energy_factor) / 1.2101
+ uef = (0.60522 + water_heating_system.energy_factor) / 1.2101 # Inverse of calc_ef_from_uef()
cop = 1.174536058 * uef # Based on simulation of the UEF test procedure at varying COPs
elsif not water_heating_system.uniform_energy_factor.nil?
uef = water_heating_system.uniform_energy_factor
@@ -766,6 +766,8 @@ def self.setup_hpwh_dxcoil(model, water_heating_system, weather, obj_name_hpwh,
elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinHigh
cop = 1.1022 * uef - 0.0877
end
+ elsif not water_heating_system.heat_pump_cop.nil?
+ cop = water_heating_system.heat_pump_cop
end
coil = OpenStudio::Model::CoilWaterHeatingAirToWaterHeatPumpWrapped.new(model)
@@ -775,7 +777,7 @@ def self.setup_hpwh_dxcoil(model, water_heating_system, weather, obj_name_hpwh,
coil.setRatedSensibleHeatRatio(shr)
coil.setRatedEvaporatorInletAirDryBulbTemperature(rated_edb)
coil.setRatedEvaporatorInletAirWetBulbTemperature(UnitConversions.convert(twb_adj, 'F', 'C'))
- coil.setRatedCondenserWaterTemperature(48.89)
+ coil.setRatedCondenserWaterTemperature(48.89) # FIXME: Need to change for commercial water heater?
coil.setRatedEvaporatorAirFlowRate(UnitConversions.convert(airflow_rate, 'ft^3/min', 'm^3/s'))
coil.setEvaporatorFanPowerIncludedinRatedCOP(true)
coil.setEvaporatorAirTemperatureTypeforCurveObjects('WetBulbTemperature')
@@ -1288,7 +1290,7 @@ def self.calc_ef_from_uef(water_heating_system)
def self.calc_tank_areas(act_vol, height = nil)
if height.nil?
- height = get_tank_height()
+ height = 4.0 # ft
end
diameter = 2.0 * (UnitConversions.convert(act_vol, 'gal', 'ft^3') / (height * Math::PI))**0.5 # feet
a_top = Math::PI * diameter**2.0 / 4.0 # sqft
@@ -1298,26 +1300,40 @@ def self.calc_tank_areas(act_vol, height = nil)
return surface_area, a_side
end
- def self.get_tank_height()
- return 4.0 # feet
- end
-
- def self.calc_indirect_ua_with_standbyloss(act_vol, water_heating_system, a_side, solar_fraction)
+ def self.calc_tank_ua_from_standby_loss(act_vol, water_heating_system, a_side, solar_fraction)
standby_loss_units = water_heating_system.standby_loss_units
standby_loss_value = water_heating_system.standby_loss_value
+ water_heater_type = water_heating_system.water_heater_type
+
+ if water_heater_type == HPXML::WaterHeaterTypeCombiStorage
+ # Indirect water heater
+ if not [HPXML::UnitsDegFPerHour].include? standby_loss_units
+ fail "Unexpected standby loss units '#{standby_loss_units}' for indirect water heater. Should be '#{HPXML::UnitsDegFPerHour}'."
+ end
- if not [HPXML::UnitsDegFPerHour].include? standby_loss_units
- fail "Unexpected standby loss units '#{standby_loss_units}' for indirect water heater. Should be '#{HPXML::UnitsDegFPerHour}'."
+ t_amb = 70.0 # F
+ elsif not water_heating_system.thermal_efficiency.nil?
+ # Commercial water heater
+ if not [HPXML::UnitsBtuPerHour, HPXML::UnitsPercentPerHour].include? standby_loss_units
+ fail "Unexpected standby loss units '#{standby_loss_units}' for commercial water heater. Should be '#{HPXML::UnitsBtuPerHour}' or '#{HPXML::UnitsPercentPerHour}'."
+ end
+
+ t_amb = 67.5 # F, FIXME: Verify
end
# Test conditions
cp = 0.999 # Btu/lb-F
rho = 8.216 # lb/gal
- t_amb = 70.0 # F
t_tank_avg = 135.0 # F, Test begins at 137-138F stop at 133F
# UA calculation
- q = standby_loss_value * cp * act_vol * rho # Btu/hr
+ if standby_loss_units == HPXML::UnitsDegFPerHour
+ q = standby_loss_value * cp * act_vol * rho # F/hr -> Btu/hr
+ elsif standby_loss_units == HPXML::UnitsBtuPerHour
+ q = standby_loss_value # Btu/hr
+ elsif standby_loss_units == HPXML::UnitsPercentPerHour
+ q = standby_loss_value * act_vol * rho * (t_tank_avg - t_amb) # %/hr -> Btu/hr, FIXME: Review
+ end
ua = q / (t_tank_avg - t_amb) # Btu/hr-F
# jacket
@@ -1484,66 +1500,78 @@ def self.calc_storage_tank_actual_vol(vol, fuel)
return act_vol
end
- def self.calc_tank_UA(act_vol, water_heating_system, solar_fraction)
- # If using EF:
- # Calculates the U value, UA of the tank and conversion efficiency (eta_c)
- # based on the Energy Factor and recovery efficiency of the tank
- # Source: Burch and Erickson 2004 - http://www.nrel.gov/docs/gen/fy04/36035.pdf
- # IF using UEF:
- # Calculates the U value, UA of the tank and conversion efficiency (eta_c)
- # based on the Uniform Energy Factor, First Hour Rating, and Recovery Efficiency of the tank
- # Source: Maguire and Roberts 2020 - https://www.ashrae.org/file%20library/conferences/specialty%20conferences/2020%20building%20performance/papers/d-bsc20-c039.pdf
+ def self.calc_tank_ua(act_vol, water_heating_system, solar_fraction)
if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeTankless
if not water_heating_system.energy_factor.nil?
eta_c = water_heating_system.energy_factor * water_heating_system.performance_adjustment
elsif not water_heating_system.uniform_energy_factor.nil?
eta_c = water_heating_system.uniform_energy_factor * water_heating_system.performance_adjustment
+ elsif not water_heating_system.thermal_efficiency.nil?
+ # FIXME: Performance adjustment?
+ eta_c = water_heating_system.thermal_efficiency
end
- ua = 0.0
+ ua = 0.0 # FIXME: AHRI has non-zero standby loss values for instantaneous tankless water heaters
surface_area = 1.0
- else
- density = 8.2938 # lb/gal
- cp = 1.0007 # Btu/lb-F
- t_in = 58.0 # F
- t_env = 67.5 # F
-
- if not water_heating_system.energy_factor.nil?
- t = 135.0 # F
- volume_drawn = 64.3 # gal/day
- elsif not water_heating_system.uniform_energy_factor.nil?
- t = 125.0 # F
- if water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinVerySmall
- volume_drawn = 10.0 # gal
- elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinLow
- volume_drawn = 38.0 # gal
- elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinMedium
- volume_drawn = 55.0 # gal
- elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinHigh
- volume_drawn = 84.0 # gal
- end
- end
+ else # Storage water heater
+ if not water_heating_system.thermal_efficiency.nil?
+ eta_c = water_heating_system.thermal_efficiency
+
+ # FIXME: Need to update calculation here
+ act_vol = calc_storage_tank_actual_vol(water_heating_system.tank_volume, water_heating_system.fuel_type)
+ surface_area, a_side = calc_tank_areas(act_vol)
+ ua = calc_tank_ua_from_standby_loss(act_vol, water_heating_system, a_side, solar_fraction)
+ else
+ # EF:
+ # Calculates the U value, UA of the tank and conversion efficiency (eta_c)
+ # based on the Energy Factor and Recovery Efficiency of the tank
+ # Source: Burch and Erickson 2004 - http://www.nrel.gov/docs/gen/fy04/36035.pdf
+ # UEF:
+ # Calculates the U value, UA of the tank and conversion efficiency (eta_c)
+ # based on the Uniform Energy Factor, First Hour Rating, and Recovery Efficiency of the tank
+ # Source: Maguire and Roberts 2020 - https://www.ashrae.org/file%20library/conferences/specialty%20conferences/2020%20building%20performance/papers/d-bsc20-c039.pdf
+ density = 8.2938 # lb/gal
+ cp = 1.0007 # Btu/lb-F
+ t_in = 58.0 # F
+ t_env = 67.5 # F
- draw_mass = volume_drawn * density # lb
- q_load = draw_mass * cp * (t - t_in) # Btu/day
- pow = water_heating_system.heating_capacity # Btu/h
- surface_area, a_side = calc_tank_areas(act_vol)
- if water_heating_system.fuel_type != HPXML::FuelTypeElectricity
if not water_heating_system.energy_factor.nil?
- ua = (water_heating_system.recovery_efficiency / water_heating_system.energy_factor - 1.0) / ((t - t_env) * (24.0 / q_load - 1.0 / (pow * water_heating_system.energy_factor))) # Btu/hr-F
- eta_c = (water_heating_system.recovery_efficiency + ua * (t - t_env) / pow) # conversion efficiency is supposed to be calculated with initial tank ua
+ t = 135.0 # F
+ volume_drawn = 64.3 # gal/day
elsif not water_heating_system.uniform_energy_factor.nil?
- ua = ((water_heating_system.recovery_efficiency / water_heating_system.uniform_energy_factor) - 1.0) / ((t - t_env) * (24.0 / q_load) - ((t - t_env) / (pow * water_heating_system.uniform_energy_factor))) # Btu/hr-F
- eta_c = water_heating_system.recovery_efficiency + ((ua * (t - t_env)) / pow) # conversion efficiency is slightly larger than recovery efficiency
+ t = 125.0 # F
+ if water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinVerySmall
+ volume_drawn = 10.0 # gal
+ elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinLow
+ volume_drawn = 38.0 # gal
+ elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinMedium
+ volume_drawn = 55.0 # gal
+ elsif water_heating_system.usage_bin == HPXML::WaterHeaterUsageBinHigh
+ volume_drawn = 84.0 # gal
+ end
end
- else # is Electric
- if not water_heating_system.energy_factor.nil?
- ua = q_load * (1.0 / water_heating_system.energy_factor - 1.0) / ((t - t_env) * 24.0)
- elsif not water_heating_system.uniform_energy_factor.nil?
- ua = q_load * (1.0 / water_heating_system.uniform_energy_factor - 1.0) / ((24.0 * (t - t_env)) * (0.8 + 0.2 * ((t_in - t_env) / (t - t_env))))
+
+ draw_mass = volume_drawn * density # lb
+ q_load = draw_mass * cp * (t - t_in) # Btu/day
+ pow = water_heating_system.heating_capacity # Btu/h
+ surface_area, a_side = calc_tank_areas(act_vol)
+ if water_heating_system.fuel_type != HPXML::FuelTypeElectricity
+ if not water_heating_system.energy_factor.nil?
+ ua = (water_heating_system.recovery_efficiency / water_heating_system.energy_factor - 1.0) / ((t - t_env) * (24.0 / q_load - 1.0 / (pow * water_heating_system.energy_factor))) # Btu/hr-F
+ eta_c = (water_heating_system.recovery_efficiency + ua * (t - t_env) / pow) # conversion efficiency is supposed to be calculated with initial tank ua
+ elsif not water_heating_system.uniform_energy_factor.nil?
+ ua = ((water_heating_system.recovery_efficiency / water_heating_system.uniform_energy_factor) - 1.0) / ((t - t_env) * (24.0 / q_load) - ((t - t_env) / (pow * water_heating_system.uniform_energy_factor))) # Btu/hr-F
+ eta_c = water_heating_system.recovery_efficiency + ((ua * (t - t_env)) / pow) # conversion efficiency is slightly larger than recovery efficiency
+ end
+ else # is Electric
+ if not water_heating_system.energy_factor.nil?
+ ua = q_load * (1.0 / water_heating_system.energy_factor - 1.0) / ((t - t_env) * 24.0)
+ elsif not water_heating_system.uniform_energy_factor.nil?
+ ua = q_load * (1.0 / water_heating_system.uniform_energy_factor - 1.0) / ((24.0 * (t - t_env)) * (0.8 + 0.2 * ((t_in - t_env) / (t - t_env))))
+ end
+ eta_c = 1.0
end
- eta_c = 1.0
+ ua = apply_tank_jacket(water_heating_system, ua, a_side)
end
- ua = apply_tank_jacket(water_heating_system, ua, a_side)
end
ua *= (1.0 - solar_fraction)
if water_heating_system.is_shared_system
@@ -1744,9 +1772,14 @@ def self.set_wh_parasitic_parameters(water_heating_system, water_heater, is_dsh_
# Fuel storage water heater
# EF cutoffs derived from Figure 2 of http://title24stakeholders.com/wp-content/uploads/2017/10/2013_CASE-Report_High-efficiency-Water-Heater-Ready.pdf
# FUTURE: Add an optional HPXML input for water heater type for a user to specify this (and default based on EF as below)
- ef = water_heating_system.energy_factor
- if ef.nil?
- ef = calc_ef_from_uef(water_heating_system)
+ if (not water_heating_system.energy_factor.nil?) || (not water_heating_system.uniform_energy_factor.nil?)
+ ef = water_heating_system.energy_factor
+ if ef.nil?
+ ef = calc_ef_from_uef(water_heating_system)
+ end
+ elsif not water_heating_system.thermal_efficiency.nil?
+ # FIXME
+ ef = 0.75
end
if ef < 0.64
skinlossfrac = 0.64 # Natural draft
diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb
index 649bc6dc13..7900608d53 100644
--- a/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -171,6 +171,8 @@ def test_schematron_error_messages
'invalid-number-of-conditioned-floors' => ['Expected NumberofConditionedFloors to be greater than or equal to NumberofConditionedFloorsAboveGrade [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]'],
'invalid-number-of-units-served' => ['Expected NumberofUnitsServed to be greater than 1 [context: /HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem[IsSharedSystem="true"], id: "WaterHeatingSystem1"]'],
'invalid-shared-vent-in-unit-flowrate' => ['Expected RatedFlowRate to be greater than extension/InUnitFlowRate [context: /HPXML/Building/BuildingDetails/Systems/MechanicalVentilation/VentilationFans/VentilationFan[UsedForWholeBuildingVentilation="true" and IsSharedSystem="true"], id: "VentilationFan1"]'],
+ 'invalid-standby-losses-storage' => ['Expected StandbyLoss[Units="%/hr"]/Value to be less than 0.1'],
+ 'invalid-standby-losses-instantaneous' => ['Expected StandbyLoss[Units="%/hr"]/Value to be less than 0.1'],
'invalid-timestep' => ['Expected Timestep to be 60, 30, 20, 15, 12, 10, 6, 5, 4, 3, 2, or 1'],
'invalid-timezone-utcoffset-low' => ['Expected TimeZone/UTCOffset to be greater than or equal to -12'],
'invalid-timezone-utcoffset-high' => ['Expected TimeZone/UTCOffset to be less than or equal to 14'],
@@ -430,6 +432,14 @@ def test_schematron_error_messages
elsif ['invalid-shared-vent-in-unit-flowrate'].include? error_case
hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-mechvent.xml'))
hpxml.ventilation_fans[0].rated_flow_rate = 80
+ elsif ['invalid-standby-losses-storage'].include? error_case
+ hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-elec-et.xml'))
+ hpxml.water_heating_systems[0].standby_loss_units = HPXML::UnitsPercentPerHour
+ hpxml.water_heating_systems[0].standby_loss_value = 0.88
+ elsif ['invalid-standby-losses-instantaneous'].include? error_case
+ hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tankless-gas-et.xml'))
+ hpxml.water_heating_systems[0].standby_loss_units = HPXML::UnitsPercentPerHour
+ hpxml.water_heating_systems[0].standby_loss_value = 0.88
elsif ['invalid-timestep'].include? error_case
hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
hpxml.header.timestep = 45
diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst
index 5f53bd3a1a..523a7c0f58 100644
--- a/docs/source/workflow_inputs.rst
+++ b/docs/source/workflow_inputs.rst
@@ -524,7 +524,7 @@ Building construction is entered in ``/HPXML/Building/BuildingDetails/BuildingSu
- heating system is non-electric Furnace, Boiler, WallFurnace, FloorFurnace, Stove, PortableHeater, or FixedHeater and AFUE/Percent is less than 0.89,
- heating system is non-electric Fireplace, or
- - water heater is non-electric with energy factor (or equivalent calculated from uniform energy factor) less than 0.63.
+ - water heater is non-electric with energy factor (or equivalent calculated from uniform energy factor) less than 0.64.
HPXML Climate Zones
-------------------
@@ -2151,23 +2151,25 @@ Conventional Storage
If a conventional storage water heater is specified, additional information is entered in ``WaterHeatingSystem``.
- ================================================================ ================= ============= =============== ======== ======== ====================================================
- Element Type Units Constraints Required Default Notes
- ================================================================ ================= ============= =============== ======== ======== ====================================================
- ``FuelType`` string See [#]_ Yes Fuel type
- ``TankVolume`` double gal > 0 No See [#]_ Nominal tank volume
- ``HeatingCapacity`` double Btu/hr > 0 No See [#]_ Heating capacity
- ``UniformEnergyFactor`` or ``EnergyFactor`` or ``YearInstalled`` double or integer frac or # < 1 or > 1600 Yes See [#]_ EnergyGuide label rated efficiency or Year installed
- ``UsageBin`` or ``FirstHourRating`` string or double str or gal/hr See [#]_ or > 0 No See [#]_ EnergyGuide label usage bin/first hour rating
- ``RecoveryEfficiency`` double frac 0 - 1 [#]_ No See [#]_ Recovery efficiency
- ``WaterHeaterInsulation/Jacket/JacketRValue`` double F-ft2-hr/Btu >= 0 No 0 R-value of additional tank insulation wrap
- ``extension/TankModelType`` string See [#]_ No mixed Tank model type
- ================================================================ ================= ============= =============== ======== ======== ====================================================
+ ========================================================================================= ================= ============== =============== ======== ======== ====================================================
+ Element Type Units Constraints Required Default Notes
+ ========================================================================================= ================= ============== =============== ======== ======== ====================================================
+ ``FuelType`` string See [#]_ Yes Fuel type
+ ``TankVolume`` double gal > 0 No See [#]_ Nominal tank volume
+ ``HeatingCapacity`` double Btu/hr > 0 No See [#]_ Heating capacity
+ ``UniformEnergyFactor`` or ``EnergyFactor`` or ``ThermalEfficiency`` or ``YearInstalled`` double or integer frac or # < 1 or > 1600 Yes See [#]_ EnergyGuide label rated efficiency or Year installed [#]_
+ ``UsageBin`` or ``FirstHourRating`` string or double str or gal/hr See [#]_ or > 0 No See [#]_ EnergyGuide label usage bin/first hour rating
+ ``RecoveryEfficiency`` double frac 0 - 1 [#]_ No See [#]_ Recovery efficiency
+ ``StandbyLoss[Units="Btu/hr" or Units="%/hr"]/Value`` double Btu/hr or %/hr > 0 See [#]_ Storage tank standby losses
+ ``WaterHeaterInsulation/Jacket/JacketRValue`` double F-ft2-hr/Btu >= 0 No 0 R-value of additional tank insulation wrap
+ ``extension/TankModelType`` string See [#]_ No mixed Tank model type
+ ========================================================================================= ================= ============== =============== ======== ======== ====================================================
.. [#] FuelType choices are "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "anthracite coal", "electricity", "wood", or "wood pellets".
.. [#] If TankVolume not provided, defaults based on Table 8 in the `2014 BAHSP `_.
.. [#] If HeatingCapacity not provided, defaults based on Table 8 in the `2014 BAHSP `_.
- .. [#] If UniformEnergyFactor and EnergyFactor not provided, defaults to EnergyFactor from the lookup table that can be found at ``HPXMLtoOpenStudio/resources/data/water_heater_efficiency.csv`` based on YearInstalled.
+ .. [#] If UniformEnergyFactor and EnergyFactor and ThermalEfficiency not provided, defaults to EnergyFactor from the lookup table that can be found at ``HPXMLtoOpenStudio/resources/data/water_heater_efficiency.csv`` based on YearInstalled.
+ .. [#] UniformEnergyFactor and EnergyFactor are the rating metric for residential water heaters while ThermalEfficiency is the rating metric for commercial water heaters.
.. [#] UsageBin choices are "very small", "low", "medium", or "high".
.. [#] UsageBin/FirstHourRating are only used for water heaters that use UniformEnergyFactor.
If neither UsageBin nor FirstHourRating provided, UsageBin defaults to "medium".
@@ -2179,6 +2181,7 @@ If a conventional storage water heater is specified, additional information is e
- **Non-electric, EnergyFactor < 0.75**: 0.252 * EnergyFactor + 0.608
- **Non-electric, EnergyFactor >= 0.75**: 0.561 * EnergyFactor + 0.439
+ .. [#] StandbyLoss required for a commercial water heater (i.e., when ThermalEfficiency is provided).
.. [#] TankModelType choices are "mixed" or "stratified".
Tankless
@@ -2186,34 +2189,38 @@ Tankless
If an instantaneous tankless water heater is specified, additional information is entered in ``WaterHeatingSystem``.
- =========================================== ======= ============ =========== ============ ======== ==========================================================
- Element Type Units Constraints Required Default Notes
- =========================================== ======= ============ =========== ============ ======== ==========================================================
- ``FuelType`` string See [#]_ Yes Fuel type
- ``PerformanceAdjustment`` double frac No See [#]_ Multiplier on efficiency, typically to account for cycling
- ``UniformEnergyFactor`` or ``EnergyFactor`` double frac < 1 Yes EnergyGuide label rated efficiency
- =========================================== ======= ============ =========== ============ ======== ==========================================================
+ ==================================================================== ======= ============== =========== ============ ======== ==========================================================
+ Element Type Units Constraints Required Default Notes
+ ==================================================================== ======= ============== =========== ============ ======== ==========================================================
+ ``FuelType`` string See [#]_ Yes Fuel type
+ ``PerformanceAdjustment`` double frac No See [#]_ Multiplier on efficiency, typically to account for cycling
+ ``UniformEnergyFactor`` or ``EnergyFactor`` or ``ThermalEfficiency`` double frac < 1 Yes EnergyGuide label rated efficiency [#]_
+ ``StandbyLoss[Units="Btu/hr" or Units="%/hr"]/Value`` double Btu/hr or %/hr > 0 See [#]_ Storage tank standby losses
+ ==================================================================== ======= ============== =========== ============ ======== ==========================================================
.. [#] FuelType choices are "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "anthracite coal", "electricity", "wood", or "wood pellets".
.. [#] If PerformanceAdjustment not provided, defaults to 0.94 (UEF) or 0.92 (EF) based on `ANSI/RESNET/ICC 301-2019 `_.
+ .. [#] UniformEnergyFactor and EnergyFactor are the rating metric for residential water heaters while ThermalEfficiency is the rating metric for commercial water heaters.
+ .. [#] StandbyLoss required for a commercial water heater (i.e., when ThermalEfficiency is provided).
Heat Pump
~~~~~~~~~
If a heat pump water heater is specified, additional information is entered in ``WaterHeatingSystem``.
- ============================================= ================ ============= =============== ======== ======== =============================================
- Element Type Units Constraints Required Default Notes
- ============================================= ================ ============= =============== ======== ======== =============================================
- ``FuelType`` string See [#]_ Yes Fuel type
- ``TankVolume`` double gal > 0 Yes Nominal tank volume
- ``UniformEnergyFactor`` or ``EnergyFactor`` double frac > 1 Yes EnergyGuide label rated efficiency
- ``UsageBin`` or ``FirstHourRating`` string or double str or gal/hr See [#]_ or > 0 No See [#]_ EnergyGuide label usage bin/first hour rating
- ``WaterHeaterInsulation/Jacket/JacketRValue`` double F-ft2-hr/Btu >= 0 No 0 R-value of additional tank insulation wrap
- ``extension/OperatingMode`` string See [#]_ No standard Operating mode [#]_
- ============================================= ================ ============= =============== ======== ======== =============================================
+ ============================================================== ================ ============= =============== ======== ======== =============================================
+ Element Type Units Constraints Required Default Notes
+ ============================================================== ================ ============= =============== ======== ======== =============================================
+ ``FuelType`` string See [#]_ Yes Fuel type
+ ``TankVolume`` double gal > 0 Yes Nominal tank volume
+ ``UniformEnergyFactor`` or ``EnergyFactor`` or ``HeatPumpCOP`` double frac > 1 Yes EnergyGuide label rated efficiency [#]_
+ ``UsageBin`` or ``FirstHourRating`` string or double str or gal/hr See [#]_ or > 0 No See [#]_ EnergyGuide label usage bin/first hour rating
+ ``WaterHeaterInsulation/Jacket/JacketRValue`` double F-ft2-hr/Btu >= 0 No 0 R-value of additional tank insulation wrap
+ ``extension/OperatingMode`` string See [#]_ No standard Operating mode [#]_
+ ============================================================== ================ ============= =============== ======== ======== =============================================
.. [#] FuelType only choice is "electricity".
+ .. [#] UniformEnergyFactor and EnergyFactor are the rating metric for residential water heaters while HeatPumpCOP is the rating metric for commercial water heaters.
.. [#] UsageBin choices are "very small", "low", "medium", or "high".
.. [#] UsageBin/FirstHourRating are only used for water heaters that use UniformEnergyFactor.
If neither UsageBin nor FirstHourRating provided, UsageBin defaults to "medium".
diff --git a/tasks.rb b/tasks.rb
index 8e24e680d8..8bf3d7bfe1 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -131,12 +131,15 @@ def create_hpxmls
'base-dhw-solar-indirect-flat-plate.xml' => 'base.xml',
'base-dhw-solar-thermosyphon-flat-plate.xml' => 'base-dhw-solar-indirect-flat-plate.xml',
'base-dhw-tank-coal.xml' => 'base-dhw-tank-gas.xml',
+ 'base-dhw-tank-elec-et.xml' => 'base.xml',
'base-dhw-tank-elec-uef.xml' => 'base.xml',
'base-dhw-tank-gas.xml' => 'base.xml',
+ 'base-dhw-tank-gas-et.xml' => 'base-dhw-tank-gas.xml',
'base-dhw-tank-gas-uef.xml' => 'base-dhw-tank-gas.xml',
'base-dhw-tank-gas-uef-fhr.xml' => 'base-dhw-tank-gas-uef.xml',
'base-dhw-tank-gas-outside.xml' => 'base-dhw-tank-gas.xml',
'base-dhw-tank-heat-pump.xml' => 'base.xml',
+ 'base-dhw-tank-heat-pump-cop.xml' => 'base-dhw-tank-heat-pump.xml',
'base-dhw-tank-heat-pump-outside.xml' => 'base-dhw-tank-heat-pump.xml',
'base-dhw-tank-heat-pump-uef.xml' => 'base-dhw-tank-heat-pump.xml',
'base-dhw-tank-heat-pump-with-solar.xml' => 'base-dhw-tank-heat-pump.xml',
@@ -154,6 +157,7 @@ def create_hpxmls
'base-dhw-tankless-electric-outside.xml' => 'base-dhw-tankless-electric.xml',
'base-dhw-tankless-electric-uef.xml' => 'base-dhw-tankless-electric.xml',
'base-dhw-tankless-gas.xml' => 'base.xml',
+ 'base-dhw-tankless-gas-et.xml' => 'base-dhw-tankless-gas.xml',
'base-dhw-tankless-gas-uef.xml' => 'base-dhw-tankless-gas.xml',
'base-dhw-tankless-gas-with-solar.xml' => 'base-dhw-tankless-gas.xml',
'base-dhw-tankless-gas-with-solar-fraction.xml' => 'base-dhw-tankless-gas.xml',
@@ -1370,6 +1374,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
args['water_heater_type'] = HPXML::WaterHeaterTypeCombiStorage
args['water_heater_tank_volume'] = 50
elsif ['base-dhw-indirect-standbyloss.xml'].include? hpxml_file
+ args['water_heater_standby_loss_units'] = HPXML::UnitsDegFPerHour
args['water_heater_standby_loss'] = 1.0
elsif ['base-dhw-indirect-with-solar-fraction.xml',
'base-dhw-solar-fraction.xml',
@@ -1421,6 +1426,12 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
args['solar_thermal_collector_loop_type'] = HPXML::SolarThermalLoopTypeThermosyphon
elsif ['base-dhw-tank-coal.xml'].include? hpxml_file
args['water_heater_fuel_type'] = HPXML::FuelTypeCoal
+ elsif ['base-dhw-tank-elec-et.xml'].include? hpxml_file
+ args['water_heater_tank_volume'] = 30
+ args['water_heater_efficiency_type'] = 'ThermalEfficiency'
+ args['water_heater_efficiency'] = 0.98
+ args['water_heater_standby_loss_units'] = HPXML::UnitsPercentPerHour
+ args['water_heater_standby_loss'] = 0.0088
elsif ['base-dhw-tank-elec-uef.xml'].include? hpxml_file
args['water_heater_tank_volume'] = 30
args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
@@ -1433,6 +1444,12 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
args['water_heater_tank_volume'] = 50
args['water_heater_efficiency'] = 0.59
args['water_heater_heating_capacity'] = 40000
+ elsif ['base-dhw-tank-gas-et.xml'].include? hpxml_file
+ args['water_heater_efficiency_type'] = 'ThermalEfficiency'
+ args['water_heater_efficiency'] = 0.80
+ args['water_heater_standby_loss_units'] = HPXML::UnitsBtuPerHour
+ args['water_heater_standby_loss'] = 1200.0
+ args.delete('water_heater_heating_capacity')
elsif ['base-dhw-tank-gas-uef.xml'].include? hpxml_file
args['water_heater_tank_volume'] = 30
args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
@@ -1443,6 +1460,9 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
args['water_heater_type'] = HPXML::WaterHeaterTypeHeatPump
args['water_heater_tank_volume'] = 80
args['water_heater_efficiency'] = 2.3
+ elsif ['base-dhw-tank-heat-pump-cop.xml'].include? hpxml_file
+ args['water_heater_efficiency_type'] = 'HeatPumpCOP'
+ args['water_heater_efficiency'] = 3.1
elsif ['base-dhw-tank-heat-pump-uef.xml'].include? hpxml_file
args['water_heater_tank_volume'] = 50
args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
@@ -1469,6 +1489,11 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
args['water_heater_fuel_type'] = HPXML::FuelTypeNaturalGas
args.delete('water_heater_tank_volume')
args['water_heater_efficiency'] = 0.82
+ elsif ['base-dhw-tankless-gas-et.xml'].include? hpxml_file
+ args['water_heater_efficiency_type'] = 'ThermalEfficiency'
+ args['water_heater_efficiency'] = 0.82
+ args['water_heater_standby_loss_units'] = HPXML::UnitsBtuPerHour
+ args['water_heater_standby_loss'] = 672.6
elsif ['base-dhw-tankless-gas-uef.xml'].include? hpxml_file
args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
args['water_heater_efficiency'] = 0.93
diff --git a/workflow/sample_files/base-dhw-tank-elec-et.xml b/workflow/sample_files/base-dhw-tank-elec-et.xml
new file mode 100644
index 0000000000..fdd99cfe19
--- /dev/null
+++ b/workflow/sample_files/base-dhw-tank-elec-et.xml
@@ -0,0 +1,581 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+ 60
+
+
+ base.xml
+
+
+
+ Bills
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ suburban
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+
+ 3.0
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+ 21600.0
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.4
+ asphalt or fiberglass shingles
+ 0.7
+ 0.92
+ 6.0
+ false
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ 0.7
+ 0.92
+
+
+ 23.0
+
+
+
+
+
+
+ outside
+ living space
+
+
+
+ 1200.0
+ wood siding
+ 0.7
+ 0.92
+
+ gypsum board
+
+
+
+ 23.0
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ 0.7
+ 0.92
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ 8.0
+ 1200.0
+ 8.0
+ 7.0
+
+ gypsum board
+
+
+
+
+ continuous - exterior
+ 8.9
+ 0.0
+ 8.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ living space
+ 1350.0
+
+ gypsum board
+
+
+
+ 39.3
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 4.0
+ 150.0
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 36000.0
+
+ AFUE
+ 0.92
+
+ 1.0
+
+
+
+
+ central air conditioner
+ electricity
+ 24000.0
+ single stage
+ 1.0
+
+ SEER
+ 13.0
+
+ 0.73
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ electricity
+ storage water heater
+ living space
+ 30.0
+ 1.0
+ 18767.0
+ 0.98
+
+ %/hr
+ 0.0088
+
+ 125.0
+
+
+
+
+
+ 50.0
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ true
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ living space
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ living space
+ electricity
+ 3.73
+ true
+ 150.0
+
+
+
+ living space
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ living space
+ 650.0
+ true
+
+
+
+ living space
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ garage
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ garage
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+ garage
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+ kWh/year
+ 620.0
+
+
+
+
+ other
+
+ kWh/year
+ 2457.0
+
+
+ 0.855
+ 0.045
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/sample_files/base-dhw-tank-gas-et.xml b/workflow/sample_files/base-dhw-tank-gas-et.xml
new file mode 100644
index 0000000000..2a80762c22
--- /dev/null
+++ b/workflow/sample_files/base-dhw-tank-gas-et.xml
@@ -0,0 +1,581 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+ 60
+
+
+ base-dhw-tank-gas.xml
+
+
+
+ Bills
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ suburban
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+
+ 3.0
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+ 21600.0
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.4
+ asphalt or fiberglass shingles
+ 0.7
+ 0.92
+ 6.0
+ false
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ 0.7
+ 0.92
+
+
+ 23.0
+
+
+
+
+
+
+ outside
+ living space
+
+
+
+ 1200.0
+ wood siding
+ 0.7
+ 0.92
+
+ gypsum board
+
+
+
+ 23.0
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ 0.7
+ 0.92
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ 8.0
+ 1200.0
+ 8.0
+ 7.0
+
+ gypsum board
+
+
+
+
+ continuous - exterior
+ 8.9
+ 0.0
+ 8.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ living space
+ 1350.0
+
+ gypsum board
+
+
+
+ 39.3
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 4.0
+ 150.0
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 36000.0
+
+ AFUE
+ 0.92
+
+ 1.0
+
+
+
+
+ central air conditioner
+ electricity
+ 24000.0
+ single stage
+ 1.0
+
+ SEER
+ 13.0
+
+ 0.73
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ natural gas
+ storage water heater
+ living space
+ 50.0
+ 1.0
+ 0.76
+ 0.8
+
+ Btu/hr
+ 1200.0
+
+ 125.0
+
+
+
+
+
+ 50.0
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ true
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ living space
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ living space
+ electricity
+ 3.73
+ true
+ 150.0
+
+
+
+ living space
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ living space
+ 650.0
+ true
+
+
+
+ living space
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ garage
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ garage
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+ garage
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+ kWh/year
+ 620.0
+
+
+
+
+ other
+
+ kWh/year
+ 2457.0
+
+
+ 0.855
+ 0.045
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/sample_files/base-dhw-tank-heat-pump-cop.xml b/workflow/sample_files/base-dhw-tank-heat-pump-cop.xml
new file mode 100644
index 0000000000..25df30c848
--- /dev/null
+++ b/workflow/sample_files/base-dhw-tank-heat-pump-cop.xml
@@ -0,0 +1,576 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+ 60
+
+
+ base-dhw-tank-heat-pump.xml
+
+
+
+ Bills
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ suburban
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+
+ 3.0
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+ 21600.0
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.4
+ asphalt or fiberglass shingles
+ 0.7
+ 0.92
+ 6.0
+ false
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ 0.7
+ 0.92
+
+
+ 23.0
+
+
+
+
+
+
+ outside
+ living space
+
+
+
+ 1200.0
+ wood siding
+ 0.7
+ 0.92
+
+ gypsum board
+
+
+
+ 23.0
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ 0.7
+ 0.92
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ 8.0
+ 1200.0
+ 8.0
+ 7.0
+
+ gypsum board
+
+
+
+
+ continuous - exterior
+ 8.9
+ 0.0
+ 8.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ living space
+ 1350.0
+
+ gypsum board
+
+
+
+ 39.3
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 4.0
+ 150.0
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 36000.0
+
+ AFUE
+ 0.92
+
+ 1.0
+
+
+
+
+ central air conditioner
+ electricity
+ 24000.0
+ single stage
+ 1.0
+
+ SEER
+ 13.0
+
+ 0.73
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ electricity
+ heat pump water heater
+ living space
+ 80.0
+ 1.0
+ 3.1
+ 125.0
+
+
+
+
+
+ 50.0
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ true
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ living space
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ living space
+ electricity
+ 3.73
+ true
+ 150.0
+
+
+
+ living space
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ living space
+ 650.0
+ true
+
+
+
+ living space
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ garage
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ garage
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+ garage
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+ kWh/year
+ 620.0
+
+
+
+
+ other
+
+ kWh/year
+ 2457.0
+
+
+ 0.855
+ 0.045
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/sample_files/base-dhw-tankless-gas-et.xml b/workflow/sample_files/base-dhw-tankless-gas-et.xml
new file mode 100644
index 0000000000..867de2ecb4
--- /dev/null
+++ b/workflow/sample_files/base-dhw-tankless-gas-et.xml
@@ -0,0 +1,579 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+ 60
+
+
+ base-dhw-tankless-gas.xml
+
+
+
+ Bills
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ suburban
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+
+ 3.0
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+ 21600.0
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.4
+ asphalt or fiberglass shingles
+ 0.7
+ 0.92
+ 6.0
+ false
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ 0.7
+ 0.92
+
+
+ 23.0
+
+
+
+
+
+
+ outside
+ living space
+
+
+
+ 1200.0
+ wood siding
+ 0.7
+ 0.92
+
+ gypsum board
+
+
+
+ 23.0
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ 0.7
+ 0.92
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ 8.0
+ 1200.0
+ 8.0
+ 7.0
+
+ gypsum board
+
+
+
+
+ continuous - exterior
+ 8.9
+ 0.0
+ 8.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ living space
+ 1350.0
+
+ gypsum board
+
+
+
+ 39.3
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 4.0
+ 150.0
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 36000.0
+
+ AFUE
+ 0.92
+
+ 1.0
+
+
+
+
+ central air conditioner
+ electricity
+ 24000.0
+ single stage
+ 1.0
+
+ SEER
+ 13.0
+
+ 0.73
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ natural gas
+ instantaneous water heater
+ living space
+ 1.0
+ 0.82
+
+ Btu/hr
+ 672.6
+
+ 125.0
+
+
+
+
+
+ 50.0
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ true
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ living space
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ living space
+ electricity
+ 3.73
+ true
+ 150.0
+
+
+
+ living space
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ living space
+ 650.0
+ true
+
+
+
+ living space
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ garage
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ garage
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+ garage
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+ kWh/year
+ 620.0
+
+
+
+
+ other
+
+ kWh/year
+ 2457.0
+
+
+ 0.855
+ 0.045
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/tests/base_results/results.csv b/workflow/tests/base_results/results.csv
index 4a97ea322d..2e7c30ffdb 100644
--- a/workflow/tests/base_results/results.csv
+++ b/workflow/tests/base_results/results.csv
@@ -92,11 +92,14 @@ base-dhw-solar-indirect-flat-plate.xml,48.542,48.542,28.763,28.763,19.779,0.0,0.
base-dhw-solar-thermosyphon-flat-plate.xml,48.518,48.518,28.393,28.393,20.125,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.332,4.389,0.852,1.543,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.125,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.846,14.482,9.355,0.688,0.0,8.386,0.0,0.0,2091.8,3018.2,22.275,18.169,0.0,3.574,3.649,0.514,7.127,0.632,-2.017,0.0,0.0,6.612,-0.118,4.808,0.0,0.729,0.0,4.397,-11.396,0.0,-0.066,-0.474,-0.053,2.76,-0.029,9.808,0.0,0.0,-5.886,-0.057,-1.183,-3.136,-0.167,0.0,3.179,9.965,1354.4,997.2,10470.8,2402.7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-coal.xml,62.818,62.818,26.99,26.99,20.361,0.0,0.0,0.0,0.0,15.467,0.0,0.0,0.336,4.5,0.879,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.361,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,15.467,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.066,14.941,9.234,3.619,0.0,0.0,0.0,0.0,1463.2,3069.5,22.729,18.631,0.0,3.572,3.65,0.514,7.13,0.633,-2.004,0.0,0.0,6.616,-0.12,5.894,0.0,0.729,0.0,4.451,-12.342,0.0,-0.074,-0.478,-0.054,2.748,-0.03,9.806,0.0,0.0,-5.9,-0.059,-1.469,-3.167,-0.168,0.0,3.267,10.697,1354.8,997.6,11399.9,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-detailed-setpoints.xml,56.111,56.111,35.985,35.985,20.126,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.332,4.376,0.849,9.152,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.126,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.846,14.423,9.207,0.623,0.0,0.0,0.0,0.0,2474.4,3332.9,22.251,18.126,0.0,3.573,3.649,0.514,7.127,0.633,-2.015,0.0,0.0,6.612,-0.119,4.808,0.0,0.729,0.0,4.397,-11.395,0.0,-0.065,-0.473,-0.053,2.761,-0.029,9.812,0.0,0.0,-5.883,-0.058,-1.181,-3.132,-0.167,0.0,3.169,9.901,1354.8,997.6,11442.3,2625.7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-elec-et.xml,56.42,56.42,36.477,36.477,19.943,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.329,4.399,0.854,9.619,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.943,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.675,14.522,9.234,0.897,0.0,0.0,0.0,0.0,2213.0,3501.1,22.227,18.174,0.0,3.576,3.65,0.514,7.129,0.633,-2.014,0.0,0.0,6.614,-0.119,4.809,0.0,0.729,0.0,4.361,-11.543,0.0,-0.067,-0.475,-0.053,2.755,-0.03,9.804,0.0,0.0,-5.892,-0.057,-1.184,-3.144,-0.168,0.0,3.185,10.027,1354.8,997.6,11399.6,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-elec-uef.xml,56.156,56.156,36.074,36.074,20.081,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.331,4.381,0.85,9.235,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.081,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.805,14.447,9.234,0.69,0.0,0.0,0.0,0.0,2181.0,3495.7,22.261,18.138,0.0,3.574,3.649,0.514,7.128,0.632,-2.017,0.0,0.0,6.613,-0.118,4.808,0.0,0.729,0.0,4.388,-11.431,0.0,-0.066,-0.473,-0.053,2.76,-0.029,9.808,0.0,0.0,-5.886,-0.057,-1.182,-3.134,-0.167,0.0,3.174,9.933,1354.8,997.6,11399.5,2615.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-gas-et.xml,63.381,63.381,27.486,27.486,35.895,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.259,4.957,0.994,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,15.706,0.0,20.189,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,14.704,16.975,9.234,8.125,0.0,0.0,0.0,0.0,1455.4,3144.3,21.122,19.294,0.0,3.614,3.662,0.516,7.199,0.635,-1.914,0.0,0.0,6.666,-0.124,4.829,0.0,0.733,0.0,3.515,-15.014,0.0,-0.137,-0.529,-0.061,2.611,-0.045,9.697,0.0,0.0,-6.097,-0.061,-1.253,-3.45,-0.178,0.0,3.561,13.094,1354.8,997.6,11400.0,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-outside.xml,65.946,65.946,26.775,26.775,39.171,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.362,4.306,0.831,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.963,0.0,17.208,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.568,14.101,9.234,5.067,0.0,0.0,0.0,0.0,1465.3,3024.3,23.117,18.247,0.0,3.559,3.646,0.513,7.118,0.632,-2.033,0.0,0.0,6.62,-0.117,5.889,0.0,0.728,0.0,4.762,-11.071,0.0,-0.05,-0.459,-0.051,2.805,-0.025,9.845,0.0,0.0,-5.813,-0.057,-1.44,-3.054,-0.164,0.0,3.133,9.602,1354.8,997.6,11399.7,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-uef-fhr.xml,62.489,62.489,26.952,26.952,35.537,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.34,4.466,0.87,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.636,0.0,14.901,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.324,14.792,9.234,2.976,0.0,0.0,0.0,0.0,1463.6,3061.7,22.795,18.567,0.0,3.569,3.649,0.514,7.127,0.632,-2.008,0.0,0.0,6.614,-0.119,5.892,0.0,0.728,0.0,4.504,-12.119,0.0,-0.07,-0.475,-0.054,2.758,-0.03,9.813,0.0,0.0,-5.888,-0.058,-1.465,-3.148,-0.168,0.0,3.244,10.509,1354.8,997.6,11399.8,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-uef.xml,62.489,62.489,26.952,26.952,35.537,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.34,4.466,0.87,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.636,0.0,14.901,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.324,14.792,9.234,2.976,0.0,0.0,0.0,0.0,1463.6,3061.7,22.795,18.567,0.0,3.569,3.649,0.514,7.127,0.632,-2.008,0.0,0.0,6.614,-0.119,5.892,0.0,0.728,0.0,4.504,-12.119,0.0,-0.07,-0.475,-0.054,2.758,-0.03,9.813,0.0,0.0,-5.888,-0.058,-1.465,-3.148,-0.168,0.0,3.244,10.509,1354.8,997.6,11399.8,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas.xml,62.818,62.818,26.99,26.99,35.828,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.336,4.5,0.879,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.361,0.0,15.467,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.066,14.941,9.234,3.619,0.0,0.0,0.0,0.0,1463.2,3069.5,22.729,18.631,0.0,3.572,3.65,0.514,7.13,0.633,-2.004,0.0,0.0,6.616,-0.12,5.894,0.0,0.729,0.0,4.451,-12.342,0.0,-0.074,-0.478,-0.054,2.748,-0.03,9.806,0.0,0.0,-5.9,-0.059,-1.469,-3.167,-0.168,0.0,3.267,10.697,1354.8,997.6,11399.9,2615.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-heat-pump-cop.xml,54.228,54.228,29.414,29.414,24.814,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.409,3.877,0.729,3.122,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.814,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.236,12.423,9.282,1.723,0.0,0.0,0.0,0.0,1846.8,2999.9,23.108,18.152,0.0,3.538,3.641,0.513,7.103,0.63,-2.098,0.0,0.0,6.651,-0.106,4.798,0.0,0.727,0.0,5.257,-7.78,0.0,0.003,-0.417,-0.045,2.935,-0.015,9.928,0.0,0.0,-5.589,-0.048,-1.117,-2.835,-0.155,0.0,2.781,7.37,1354.8,997.6,11032.9,2531.7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-operating-modes.xml,54.059,54.059,28.567,28.567,25.493,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.421,3.817,0.714,2.339,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.493,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.86,12.157,9.291,1.305,0.0,0.0,0.0,0.0,1856.6,3331.2,24.727,18.065,0.0,3.535,3.641,0.513,7.107,0.63,-2.112,0.0,0.0,6.66,-0.096,4.797,0.0,0.726,0.0,5.383,-7.285,0.0,0.014,-0.406,-0.044,2.975,-0.013,9.948,0.0,0.0,-5.534,-0.038,-1.104,-2.781,-0.153,0.0,2.749,7.025,1354.8,997.6,10960.4,2515.1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-schedules.xml,54.193,54.193,28.741,28.741,25.453,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.42,3.831,0.718,2.496,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.453,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.832,12.208,9.374,1.413,0.0,0.0,0.0,0.0,1846.3,2970.3,25.942,17.88,0.0,3.525,3.638,0.512,7.101,0.631,-2.067,0.0,0.0,6.646,-0.112,4.8,0.0,0.727,0.0,5.388,-7.316,0.0,0.013,-0.403,-0.043,2.97,-0.01,10.01,0.0,0.0,-5.522,-0.055,-1.092,-2.746,-0.154,0.0,2.743,7.02,1354.8,997.6,10201.3,2340.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-setpoints.xml,54.193,54.193,28.741,28.741,25.453,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.42,3.831,0.718,2.496,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.453,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.832,12.208,9.374,1.413,0.0,0.0,0.0,0.0,1846.3,2970.3,25.942,17.88,0.0,3.525,3.638,0.512,7.101,0.631,-2.067,0.0,0.0,6.646,-0.112,4.8,0.0,0.727,0.0,5.388,-7.316,0.0,0.013,-0.403,-0.043,2.97,-0.01,10.01,0.0,0.0,-5.522,-0.055,-1.092,-2.746,-0.154,0.0,2.743,7.02,1354.8,997.6,10201.3,2340.9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -114,6 +117,7 @@ base-dhw-tankless-detailed-setpoints.xml,58.688,58.688,26.776,26.776,31.912,0.0,
base-dhw-tankless-electric-outside.xml,56.755,56.755,36.211,36.211,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,9.435,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,0.0,0.0,0.0,2018.8,3384.4,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,1354.8,997.6,11397.0,2615.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-electric-uef.xml,56.649,56.649,36.104,36.104,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,9.328,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,0.0,0.0,0.0,2012.3,3379.9,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,1354.8,997.6,11397.0,2615.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-electric.xml,56.755,56.755,36.211,36.211,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,9.435,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,0.0,0.0,0.0,2018.8,3384.4,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,1354.8,997.6,11397.0,2615.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tankless-gas-et.xml,57.8,57.8,26.776,26.776,31.024,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,10.479,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,0.0,0.0,0.0,1461.9,3001.3,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,1354.8,997.6,11397.0,2615.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-uef.xml,57.15,57.15,26.776,26.776,30.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,9.83,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,0.0,0.0,0.0,1461.9,3001.3,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,1354.8,997.6,11397.0,2615.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-with-solar-fraction.xml,51.308,51.308,26.776,26.776,24.532,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.339,4.325,0.836,0.0,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.545,0.0,3.987,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.239,14.202,9.234,0.0,0.0,6.002,0.0,0.0,1461.9,3001.3,22.377,18.019,0.0,3.571,3.649,0.514,7.124,0.633,-2.024,0.0,0.0,6.618,-0.121,4.809,0.0,0.729,0.0,4.479,-11.069,0.0,-0.058,-0.467,-0.052,2.777,-0.027,9.821,0.0,0.0,-5.854,-0.06,-1.172,-3.1,-0.166,0.0,3.135,9.604,474.2,349.2,3988.9,915.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-with-solar.xml,49.036,49.036,27.207,27.207,21.829,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.333,4.432,0.862,0.0,0.0,0.304,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.191,0.0,1.637,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.908,14.662,9.416,0.0,0.0,8.085,0.0,0.0,1461.7,3067.4,22.41,18.324,0.0,3.574,3.65,0.514,7.129,0.633,-2.014,0.0,0.0,6.616,-0.118,4.809,0.0,0.729,0.0,4.41,-11.362,0.0,-0.069,-0.475,-0.053,2.756,-0.03,9.803,0.0,0.0,-5.891,-0.057,-1.184,-3.151,-0.168,0.0,3.212,10.147,1345.1,989.5,10036.1,2303.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/workflow/tests/base_results/results_bills.csv b/workflow/tests/base_results/results_bills.csv
index ca7bc1ff0a..82901c1867 100644
--- a/workflow/tests/base_results/results_bills.csv
+++ b/workflow/tests/base_results/results_bills.csv
@@ -92,11 +92,14 @@ base-dhw-solar-indirect-flat-plate.xml,1387.65,144.0,957.84,1101.84,144.0,141.81
base-dhw-solar-thermosyphon-flat-plate.xml,1377.8,144.0,945.5,1089.5,144.0,144.3,288.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-coal.xml,1564.79,144.0,898.8,1042.8,144.0,145.99,289.99,232.0,232.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-detailed-setpoints.xml,1630.62,144.0,1198.32,1342.32,144.0,144.3,288.3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-elec-et.xml,1645.71,144.0,1214.72,1358.72,144.0,142.99,286.99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-elec-uef.xml,1633.28,144.0,1201.3,1345.3,144.0,143.98,287.98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-gas-et.xml,1460.67,144.0,915.31,1059.31,144.0,257.36,401.36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-outside.xml,1460.48,144.0,891.63,1035.63,144.0,280.85,424.85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-uef-fhr.xml,1440.33,144.0,897.53,1041.53,144.0,254.8,398.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas-uef.xml,1440.33,144.0,897.53,1041.53,144.0,254.8,398.8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-gas.xml,1443.68,144.0,898.8,1042.8,144.0,256.88,400.88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tank-heat-pump-cop.xml,1445.43,144.0,979.51,1123.51,144.0,177.92,321.92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-operating-modes.xml,1422.07,144.0,951.29,1095.29,144.0,182.78,326.78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-schedules.xml,1427.59,144.0,957.09,1101.09,144.0,182.5,326.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tank-heat-pump-detailed-setpoints.xml,1427.59,144.0,957.09,1101.09,144.0,182.5,326.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -114,6 +117,7 @@ base-dhw-tankless-detailed-setpoints.xml,1408.47,144.0,891.66,1035.66,144.0,228.
base-dhw-tankless-electric-outside.xml,1641.15,144.0,1205.84,1349.84,144.0,147.31,291.31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-electric-uef.xml,1637.6,144.0,1202.29,1346.29,144.0,147.31,291.31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-electric.xml,1641.15,144.0,1205.84,1349.84,144.0,147.31,291.31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-dhw-tankless-gas-et.xml,1402.1,144.0,891.66,1035.66,144.0,222.44,366.44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-uef.xml,1397.44,144.0,891.66,1035.66,144.0,217.78,361.78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-with-solar-fraction.xml,1355.55,144.0,891.66,1035.66,144.0,175.89,319.89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
base-dhw-tankless-gas-with-solar.xml,1350.53,144.0,906.02,1050.02,144.0,156.51,300.51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/workflow/tests/base_results/results_hvac_sizing.csv b/workflow/tests/base_results/results_hvac_sizing.csv
index 8a42192b97..b56b66709d 100644
--- a/workflow/tests/base_results/results_hvac_sizing.csv
+++ b/workflow/tests/base_results/results_hvac_sizing.csv
@@ -92,11 +92,14 @@ base-dhw-solar-indirect-flat-plate.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.
base-dhw-solar-thermosyphon-flat-plate.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-coal.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-detailed-setpoints.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
+base-dhw-tank-elec-et.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-elec-uef.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
+base-dhw-tank-gas-et.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-gas-outside.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-gas-uef-fhr.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-gas-uef.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-gas.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
+base-dhw-tank-heat-pump-cop.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-heat-pump-detailed-operating-modes.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-heat-pump-detailed-schedules.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tank-heat-pump-detailed-setpoints.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
@@ -114,6 +117,7 @@ base-dhw-tankless-detailed-setpoints.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,
base-dhw-tankless-electric-outside.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tankless-electric-uef.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tankless-electric.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
+base-dhw-tankless-gas-et.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tankless-gas-uef.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tankless-gas-with-solar-fraction.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0
base-dhw-tankless-gas-with-solar.xml,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,36000.0,0.0,795.0,24000.0,998.0