Merge pull request #3011 from quintel/heat-final-fixes

Fixes for several issues with new heat modelling in built environment

datasets/nl2019/nl2019.full.ad

@@ -63,9 +63,9 @@
 - non_energetic_emissions_other_ghg_waste_management = 2.88588392
 - solar_pv_profile_1_share = 1
 - solar_pv_profile_2_share = 0
-- aquathermal_potential_for_surface_water = 150
-- aquathermal_potential_for_waste_water = 56
-- aquathermal_potential_for_drink_water = 6
+- aquathermal_potential_for_surface_water = 151.5
+- aquathermal_potential_for_waste_water = 69.9
+- aquathermal_potential_for_drink_water = 5
 - hydrogen_electrolysis_solar_pv_capacity_ratio = 0.427
 - present_number_of_buildings = 912497
 - present_number_of_residences = 7936906
@@ -74,41 +74,41 @@
 - present_number_of_apartments_1965_1984 = 764434
 - present_number_of_apartments_1985_2004 = 619871
 - present_number_of_apartments_2005_present = 488170
-- present_number_of_detached_houses_before_1945 = 303284
-- present_number_of_detached_houses_1945_1964 = 298740
-- present_number_of_detached_houses_1965_1984 = 565690
-- present_number_of_detached_houses_1985_2004 = 379710
-- present_number_of_detached_houses_2005_present = 178722
-- present_number_of_semi_detached_houses_before_1945 = 342679
-- present_number_of_semi_detached_houses_1945_1964 = 309325
-- present_number_of_semi_detached_houses_1965_1984 = 875089
-- present_number_of_semi_detached_houses_1985_2004 = 600576
-- present_number_of_semi_detached_houses_2005_present = 250132
-- present_number_of_terraced_houses_before_1945 = 285225
-- present_number_of_terraced_houses_1945_1964 = 143135
-- present_number_of_terraced_houses_1965_1984 = 231185
-- present_number_of_terraced_houses_1985_2004 = 252567
-- present_number_of_terraced_houses_2005_present = 118330
+- present_number_of_detached_houses_before_1945 = 285225
+- present_number_of_detached_houses_1945_1964 = 143135
+- present_number_of_detached_houses_1965_1984 = 231185
+- present_number_of_detached_houses_1985_2004 = 252567
+- present_number_of_detached_houses_2005_present = 118330
+- present_number_of_semi_detached_houses_before_1945 = 303284
+- present_number_of_semi_detached_houses_1945_1964 = 298740
+- present_number_of_semi_detached_houses_1965_1984 = 565690
+- present_number_of_semi_detached_houses_1985_2004 = 379710
+- present_number_of_semi_detached_houses_2005_present = 178722
+- present_number_of_terraced_houses_before_1945 = 342679
+- present_number_of_terraced_houses_1945_1964 = 309325
+- present_number_of_terraced_houses_1965_1984 = 875089
+- present_number_of_terraced_houses_1985_2004 = 600576
+- present_number_of_terraced_houses_2005_present = 250132
 - present_share_of_apartments_before_1945_in_useful_demand_for_space_heating = 0.0625040726869224
 - present_share_of_apartments_1945_1964_in_useful_demand_for_space_heating = 0.0474523564642453
 - present_share_of_apartments_1965_1984_in_useful_demand_for_space_heating = 0.0953994416233717
 - present_share_of_apartments_1985_2004_in_useful_demand_for_space_heating = 0.0770344579668123
 - present_share_of_apartments_2005_present_in_useful_demand_for_space_heating = 0.0612550022813887
-- present_share_of_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0387108078042949
-- present_share_of_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0383527943771621
-- present_share_of_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.072780744915689
-- present_share_of_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.048605443601013
-- present_share_of_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0227994495913242
-- present_share_of_semi_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0425312979748771
-- present_share_of_semi_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0394372730348244
-- present_share_of_semi_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.112216227322524
-- present_share_of_semi_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.0761178811197236
-- present_share_of_semi_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0314951939462689
-- present_share_of_terraced_houses_before_1945_in_useful_demand_for_space_heating = 0.0370316563248165
-- present_share_of_terraced_houses_1945_1964_in_useful_demand_for_space_heating = 0.0185715330739085
-- present_share_of_terraced_houses_1965_1984_in_useful_demand_for_space_heating = 0.0297821990506175
-- present_share_of_terraced_houses_1985_2004_in_useful_demand_for_space_heating = 0.0327032751808859
-- present_share_of_terraced_houses_2005_present_in_useful_demand_for_space_heating = 0.0152188916593297
+- present_share_of_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0370316563248165
+- present_share_of_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0185715330739085
+- present_share_of_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.0297821990506175
+- present_share_of_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.0327032751808859
+- present_share_of_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0152188916593297
+- present_share_of_semi_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0387108078042949
+- present_share_of_semi_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0383527943771621
+- present_share_of_semi_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.072780744915689
+- present_share_of_semi_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.048605443601013
+- present_share_of_semi_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0227994495913242
+- present_share_of_terraced_houses_before_1945_in_useful_demand_for_space_heating = 0.0425312979748771
+- present_share_of_terraced_houses_1945_1964_in_useful_demand_for_space_heating = 0.0394372730348244
+- present_share_of_terraced_houses_1965_1984_in_useful_demand_for_space_heating = 0.112216227322524
+- present_share_of_terraced_houses_1985_2004_in_useful_demand_for_space_heating = 0.0761178811197236
+- present_share_of_terraced_houses_2005_present_in_useful_demand_for_space_heating = 0.0314951939462689
 - typical_useful_demand_for_space_heating_apartments_before_1945 = 309.2785
 - typical_useful_demand_for_space_heating_apartments_1945_1964 = 225.7048
 - typical_useful_demand_for_space_heating_apartments_1965_1984 = 193.542
@@ -218,6 +218,3 @@
 - electric_vehicle_profile_3_share = 0
 - electric_vehicle_profile_4_share = 0
 - electric_vehicle_profile_5_share = 0
-- aquathermal_potential_for_surface_water = 150
-- aquathermal_potential_for_waste_water = 56
-- aquathermal_potential_for_drink_water = 6

graphs/energy/nodes/buildings/buildings_space_heater_coal.converter.ad

@@ -1,6 +1,6 @@
 - output.loss = elastic
 - output.useable_heat = 0.43
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -23,6 +23,7 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.133
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0
 
 - fever.share_in_group = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_collective_heatpump_water_water_ts_electricity.converter.ad

@@ -2,7 +2,7 @@
 - input.electricity = 0.26595744680851063
 - output.loss = elastic
 - output.useable_heat = 1.0
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings, lt_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings, lt_delivery_system_buildings]
 - use = energetic
 - presentation_group = heat_pumps
 - availability = 0.0
@@ -11,18 +11,19 @@
 - construction_time = 0.0
 - cost_of_installing = 0.0
 - decommissioning_costs = 0.0
-- fixed_operation_and_maintenance_costs_per_year = 67530.0
-- initial_investment = 953500.0
+- fixed_operation_and_maintenance_costs_per_year = 330.15
+- initial_investment = 13120.0
 - technical_lifetime = 15.0
 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0
 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0
 - wacc = 0.04
 - energy_balance_group = technologies
 - fever.defer_for = 4
 - fever.group = buildings_space_heating
-- fever.type = producer
 - fever.technology_curve_type = tech_day_night
+- fever.type = producer
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
-- heat_output_capacity = 2.25
+- heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_crude_oil.converter.ad

@@ -1,6 +1,6 @@
 - output.loss = elastic
 - output.useable_heat = 0.85
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -23,4 +23,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.142
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_district_heating_ht_steam_hot_water.ad

@@ -1,5 +1,5 @@
 - output.useable_heat = 1.0
-- groups = [application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -25,4 +25,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_district_heating_lt_steam_hot_water.ad

@@ -1,5 +1,5 @@
 - output.useable_heat = 1.0
-- groups = [application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, lt_delivery_system_buildings]
+- groups = [demand_driven, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, lt_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -25,4 +25,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_district_heating_mt_steam_hot_water.ad

@@ -1,5 +1,5 @@
 - output.useable_heat = 1.0
-- groups = [application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, mt_delivery_system_buildings]
+- groups = [demand_driven, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, mt_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -25,4 +25,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_electricity.converter.ad

@@ -1,6 +1,6 @@
 - output.loss = elastic
 - output.useable_heat = 1.0
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -23,4 +23,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.081
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_heatpump_air_water_network_gas.converter.ad

@@ -2,7 +2,7 @@
 - input.network_gas = 0.5
 - output.loss = elastic
 - output.useable_heat = 1.0
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, lt_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, lt_delivery_system_buildings]
 - use = energetic
 - presentation_group = heat_pumps
 - availability = 0.0
@@ -11,20 +11,21 @@
 - construction_time = 0.0
 - cost_of_installing = 0.0
 - decommissioning_costs = 0.0
-- fixed_operation_and_maintenance_costs_per_year = 297861.543
-- initial_investment = 1929780.0
+- fixed_operation_and_maintenance_costs_per_year = 1456.21
+- initial_investment = 9434.48
 - technical_lifetime = 15.0
 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0
 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0
 - wacc = 0.04
 - energy_balance_group = technologies
 - fever.defer_for = 4
 - fever.group = buildings_space_heating
-- fever.type = producer
 - fever.technology_curve_type = tech_constant
+- fever.type = producer
 - network_gas.profile = self: heat_output_curve
 - network_gas.type = consumer
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
-- heat_output_capacity = 2.25141
+- heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_heatpump_surface_water_water_ts_electricity.ad

@@ -2,7 +2,7 @@
 - input.electricity = 0.303
 - output.loss = elastic
 - output.useable_heat = 1.0
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, merit_order_csv_include, costs_building_and_installations_buildings]
 - use = energetic
 - presentation_group = heat_pumps
 - availability = 0.0
@@ -11,18 +11,19 @@
 - construction_time = 0.0
 - cost_of_installing = 0.0
 - decommissioning_costs = 0.0
-- fixed_operation_and_maintenance_costs_per_year = 110639.0
-- initial_investment = 4744522.0
+- fixed_operation_and_maintenance_costs_per_year = 277.0
+- initial_investment = 11861.0
 - technical_lifetime = 30.0
 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0
 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0
 - wacc = 0.04
 - energy_balance_group = technologies
 - fever.defer_for = 4
 - fever.group = buildings_space_heating
-- fever.type = producer
 - fever.technology_curve_type = tech_constant
+- fever.type = producer
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
-- heat_output_capacity = 4.4
+- heat_output_capacity = 0.011
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_network_gas.converter.ad

@@ -1,6 +1,6 @@
 - output.loss = elastic
 - output.useable_heat = 1.067
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -25,4 +25,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.043
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

graphs/energy/nodes/buildings/buildings_space_heater_wood_pellets.converter.ad

@@ -1,6 +1,6 @@
 - output.loss = elastic
 - output.useable_heat = 0.82
-- groups = [heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
+- groups = [demand_driven, heat_production, application_group, aggregator_producer, wacc_proven_tech, costs_building_and_installations_buildings, ht_delivery_system_buildings]
 - use = energetic
 - presentation_group = traditional_heat
 - availability = 0.0
@@ -23,4 +23,5 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 0.137
+- households_supplied_per_unit = 1.0
 - takes_part_in_ets = 0.0

inputs/demand/households/households_technologies/households_heater_heatpump_air_water_electricity_heat_output_capacity.ad

@@ -1,9 +1,17 @@
 # Updates both space heating and hot water capacity
+# For heat pumps with fever defined input capacities, these capacities need to updated as well
 
 - query =
+    heat_capacity_present = QUERY_PRESENT(-> { V(households_space_heater_heatpump_air_water_electricity,heat_output_capacity) });
+    heat_capacity_future = DIVIDE(USER_INPUT(),1000.0);
+    heat_capacity_relative_change = DIVIDE(heat_capacity_future,heat_capacity_present);
+
     EACH(
       UPDATE(V(households_space_heater_heatpump_air_water_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)),
-      UPDATE(V(households_water_heater_heatpump_air_water_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0))
+      UPDATE(V(households_water_heater_heatpump_air_water_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)),
+
+      UPDATE_WITH_FACTOR(V(V(households_space_heater_heatpump_air_water_electricity, fever), capacity), "electricity", heat_capacity_relative_change),
+      UPDATE_WITH_FACTOR(V(V(households_water_heater_heatpump_air_water_electricity, fever), capacity), "electricity", heat_capacity_relative_change)
     )
 - priority = 0
 - max_value_gql = present:MAX(V(households_space_heater_heatpump_air_water_electricity,heat_output_capacity) * 1000.0,25.0)

inputs/demand/households/households_technologies/households_heater_heatpump_surface_water_water_ts_electricity_heat_output_capacity.ad

@@ -1,9 +1,17 @@
 # Updates both space heating and hot water capacity
+# For heat pumps with fever defined input capacities, these capacities need to updated as well
 
 - query =
+    heat_capacity_present = QUERY_PRESENT(-> { V(households_space_heater_heatpump_surface_water_water_ts_electricity,heat_output_capacity) });
+    heat_capacity_future = DIVIDE(USER_INPUT(),1000.0);
+    heat_capacity_relative_change = DIVIDE(heat_capacity_future,heat_capacity_present);
+
     EACH(
       UPDATE(V(households_space_heater_heatpump_surface_water_water_ts_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)),
-      UPDATE(V(households_water_heater_heatpump_surface_water_water_ts_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0))
+      UPDATE(V(households_water_heater_heatpump_surface_water_water_ts_electricity), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)),
+
+      UPDATE_WITH_FACTOR(V(V(households_space_heater_heatpump_surface_water_water_ts_electricity, fever), capacity), "electricity", heat_capacity_relative_change),
+      UPDATE_WITH_FACTOR(V(V(households_water_heater_heatpump_surface_water_water_ts_electricity, fever), capacity), "electricity", heat_capacity_relative_change)
     )
 - priority = 0
 - max_value_gql = present:MAX(V(households_space_heater_heatpump_surface_water_water_ts_electricity,heat_output_capacity) * 1000.0,25.0)