Merge pull request #1190 from NREL/remove_old_hpwh_options

Remove old HPWH options from options_lookup
NREL · Jan 12, 2024 · 984ff0e · 984ff0e
2 parents 2e0a82a + df60b91
commit 984ff0e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ Features
 - Updates and enhancements to the ground source heat pump model; ability to describe detailed geothermal loop inputs ([#1187](https://github.com/NREL/resstock/pull/1187))
 
 Fixes
--
+- Remove old HPWH options from options_lookup ([#1190](https://github.com/NREL/resstock/pull/1190))
 
 ## ResStock v3.2.0
 ###### December 19, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.1...v3.2.0)

diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv
@@ -12920,11 +12920,9 @@ Vintage ACS	1980-99
 Vintage ACS	2000-09
 Vintage ACS	2010s
 Vintage ACS	<1940
-Water Heater Efficiency	"Electric Heat Pump, 50 gal"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=50	water_heater_efficiency_type=EnergyFactor	water_heater_efficiency=2.3	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Electric Heat Pump, 50 gal, 140F"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=50	water_heater_efficiency_type=EnergyFactor	water_heater_efficiency=2.3	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=140	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Electric Heat Pump, 50 gal, 3.45 UEF"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=50	water_heater_efficiency_type=UniformEnergyFactor	water_heater_efficiency=3.45	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Electric Heat Pump, 66 gal, 3.35 UEF"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=66	water_heater_efficiency_type=UniformEnergyFactor	water_heater_efficiency=3.35	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
-Water Heater Efficiency	"Electric Heat Pump, 80 gal"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=80	water_heater_efficiency_type=EnergyFactor	water_heater_efficiency=2.3	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Electric Heat Pump, 80 gal, 3.45 UEF"	ResStockArguments	water_heater_type=heat pump water heater	water_heater_fuel_type=electricity	water_heater_tank_volume=80	water_heater_efficiency_type=UniformEnergyFactor	water_heater_efficiency=3.45	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Natural Gas Premium, Condensing"	ResStockArguments	water_heater_type=storage water heater	water_heater_fuel_type=natural gas	water_heater_tank_volume=auto	water_heater_efficiency_type=EnergyFactor	water_heater_efficiency=0.82	water_heater_recovery_efficiency=0.9	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto
 Water Heater Efficiency	"Natural Gas Tankless, Condensing"	ResStockArguments	water_heater_type=instantaneous water heater	water_heater_fuel_type=natural gas	water_heater_tank_volume=0	water_heater_efficiency_type=EnergyFactor	water_heater_efficiency=0.96	water_heater_recovery_efficiency=0	water_heater_standby_loss=0	water_heater_jacket_rvalue=0	water_heater_setpoint_temperature=125	water_heater_heating_capacity=auto	water_heater_has_flue_or_chimney=auto	water_heater_num_units_served=1	water_heater_operating_mode=auto	water_heater_tank_model_type=auto	water_heater_usage_bin=auto	water_heater_uses_desuperheater=auto