diff --git a/simulation/agents.py b/simulation/agents.py index f57af89..303861b 100644 --- a/simulation/agents.py +++ b/simulation/agents.py @@ -539,9 +539,9 @@ def install_heating_system( if self.boiler_upgrade_grant_available: if heating_system == HeatingSystem.HEAT_PUMP_AIR_SOURCE: - self.boiler_upgrade_grant_used = 5_000 + self.boiler_upgrade_grant_used = 7_500 if heating_system == HeatingSystem.HEAT_PUMP_GROUND_SOURCE: - self.boiler_upgrade_grant_used = 6_000 + self.boiler_upgrade_grant_used = 7_500 def reset_previous_heating_decision_log(self) -> None: diff --git a/simulation/costs.py b/simulation/costs.py index 71734e7..ac9a310 100644 --- a/simulation/costs.py +++ b/simulation/costs.py @@ -288,9 +288,7 @@ def estimate_rhi_annual_payment( annual_heat_kwh_delta_capped = ( rhi_kwh_cap if annual_heat_kwh_delta > rhi_kwh_cap - else 0 - if annual_heat_kwh_delta < 0 - else annual_heat_kwh_delta + else 0 if annual_heat_kwh_delta < 0 else annual_heat_kwh_delta ) rhi_annual_payment_gbp = int( @@ -327,7 +325,7 @@ def estimate_boiler_upgrade_scheme_grant( return 0 if heating_system == HeatingSystem.HEAT_PUMP_AIR_SOURCE: - return 5_000 + return 7_500 if heating_system == HeatingSystem.HEAT_PUMP_GROUND_SOURCE: - return 6_000 + return 7_500 diff --git a/simulation/tests/test_costs.py b/simulation/tests/test_costs.py index 4e069b8..f2eb43e 100644 --- a/simulation/tests/test_costs.py +++ b/simulation/tests/test_costs.py @@ -251,13 +251,13 @@ def test_boiler_upgrade_scheme_grant_is_non_zero_for_heat_pumps_when_grant_is_ac estimate_boiler_upgrade_scheme_grant( HeatingSystem.HEAT_PUMP_AIR_SOURCE, model ) - == 5_000 + == 7_500 ) assert ( estimate_boiler_upgrade_scheme_grant( HeatingSystem.HEAT_PUMP_GROUND_SOURCE, model ) - == 6_000 + == 7_500 ) def test_air_source_heat_pump_unit_and_install_costs_floored_at_gas_boiler_cost_for_households_with_air_source_heat_pump( diff --git a/simulation/tests/test_model.py b/simulation/tests/test_model.py index 462ee5c..032be17 100644 --- a/simulation/tests/test_model.py +++ b/simulation/tests/test_model.py @@ -39,10 +39,10 @@ def test_increment_timestep_updates_boiler_upgrade_scheme_cumulative_spend_gbp( assert model.boiler_upgrade_scheme_cumulative_spend_gbp == 0 household_using_boiler_upgrade_grant_ASHP = household_factory() - household_using_boiler_upgrade_grant_ASHP.boiler_upgrade_grant_used = 5_000 + household_using_boiler_upgrade_grant_ASHP.boiler_upgrade_grant_used = 7_500 household_using_boiler_upgrade_grant_GSHP = household_factory() - household_using_boiler_upgrade_grant_GSHP.boiler_upgrade_grant_used = 6_000 + household_using_boiler_upgrade_grant_GSHP.boiler_upgrade_grant_used = 7_500 model.add_agents( [