From b4435e6527c25d83a2e961ad74bf08c8cbbcecda Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 18 Sep 2026 17:08:37 +0200 Subject: [PATCH 1/5] Adding airconditioning heating nodes --- config/energy_node_positions.yml | 178 ++++++++++-------- ..._with_combined_network_gas@ambient_heat.ad | 2 + ...ning_with_heat_pump_boiler@ambient_heat.ad | 2 + ...ning_with_heat_pump_boiler@ambient_heat.ad | 2 + ...oning_with_heat_pump_boiler@electricity.ad | 5 + ...g_with_combined_network_gas@network_gas.ad | 5 + ...g_with_combined_network_gas@electricity.ad | 5 + ...oning_with_heat_pump_boiler@electricity.ad | 5 + ...g_with_combined_network_gas@network_gas.ad | 5 + ...ned_network_gas_aggregator@useable_heat.ad | 5 + ...ating_apartments_1945_1964@useable_heat.ad | 2 + ...ating_apartments_1965_1984@useable_heat.ad | 2 + ...ating_apartments_1985_2004@useable_heat.ad | 2 + ...ng_apartments_2005_present@useable_heat.ad | 2 + ...ing_apartments_before_1945@useable_heat.ad | 2 + ..._heating_apartments_future@useable_heat.ad | 2 + ..._detached_houses_1945_1964@useable_heat.ad | 2 + ..._detached_houses_1965_1984@useable_heat.ad | 2 + ..._detached_houses_1985_2004@useable_heat.ad | 2 + ...tached_houses_2005_present@useable_heat.ad | 2 + ...etached_houses_before_1945@useable_heat.ad | 2 + ...ing_detached_houses_future@useable_heat.ad | 2 + ..._detached_houses_1945_1964@useable_heat.ad | 2 + ..._detached_houses_1965_1984@useable_heat.ad | 2 + ..._detached_houses_1985_2004@useable_heat.ad | 2 + ...tached_houses_2005_present@useable_heat.ad | 2 + ...etached_houses_before_1945@useable_heat.ad | 2 + ...emi_detached_houses_future@useable_heat.ad | 2 + ..._terraced_houses_1945_1964@useable_heat.ad | 2 + ..._terraced_houses_1965_1984@useable_heat.ad | 2 + ..._terraced_houses_1985_2004@useable_heat.ad | 2 + ...rraced_houses_2005_present@useable_heat.ad | 2 + ...erraced_houses_before_1945@useable_heat.ad | 2 + ...ing_terraced_houses_future@useable_heat.ad | 2 + ...eat_pump_boiler_aggregator@useable_heat.ad | 5 + ...ating_apartments_1945_1964@useable_heat.ad | 2 + ...ating_apartments_1965_1984@useable_heat.ad | 2 + ...ating_apartments_1985_2004@useable_heat.ad | 2 + ...ng_apartments_2005_present@useable_heat.ad | 2 + ...ing_apartments_before_1945@useable_heat.ad | 2 + ..._heating_apartments_future@useable_heat.ad | 2 + ..._detached_houses_1945_1964@useable_heat.ad | 2 + ..._detached_houses_1965_1984@useable_heat.ad | 2 + ..._detached_houses_1985_2004@useable_heat.ad | 2 + ...tached_houses_2005_present@useable_heat.ad | 2 + ...etached_houses_before_1945@useable_heat.ad | 2 + ...ing_detached_houses_future@useable_heat.ad | 2 + ..._detached_houses_1945_1964@useable_heat.ad | 2 + ..._detached_houses_1965_1984@useable_heat.ad | 2 + ..._detached_houses_1985_2004@useable_heat.ad | 2 + ...tached_houses_2005_present@useable_heat.ad | 2 + ...etached_houses_before_1945@useable_heat.ad | 2 + ...emi_detached_houses_future@useable_heat.ad | 2 + ..._terraced_houses_1945_1964@useable_heat.ad | 2 + ..._terraced_houses_1965_1984@useable_heat.ad | 2 + ..._terraced_houses_1985_2004@useable_heat.ad | 2 + ...rraced_houses_2005_present@useable_heat.ad | 2 + ...erraced_houses_before_1945@useable_heat.ad | 2 + ...ing_terraced_houses_future@useable_heat.ad | 2 + ...ned_network_gas_aggregator@useable_heat.ad | 2 + ...eat_pump_boiler_aggregator@useable_heat.ad | 2 + ...ned_network_gas_aggregator@useable_heat.ad | 5 + ...t_water_after_solar_heater@useable_heat.ad | 2 + ...eat_pump_boiler_aggregator@useable_heat.ad | 5 + ...t_water_after_solar_heater@useable_heat.ad | 2 + ...ned_network_gas_aggregator@useable_heat.ad | 2 + ...eat_pump_boiler_aggregator@useable_heat.ad | 2 + ...rconditioning_with_combined_network_gas.ad | 47 +++++ ...ng_with_combined_network_gas_aggregator.ad | 2 + ...r_airconditioning_with_heat_pump_boiler.ad | 44 +++++ ...ioning_with_heat_pump_boiler_aggregator.ad | 2 + ...rconditioning_with_combined_network_gas.ad | 31 +++ ...ng_with_combined_network_gas_aggregator.ad | 2 + ...r_airconditioning_with_heat_pump_boiler.ad | 41 ++++ ...ioning_with_heat_pump_boiler_aggregator.ad | 2 + ...tioning_with_combined_network_gas_share.ad | 15 ++ ...onditioning_with_heat_pump_boiler_share.ad | 15 ++ 77 files changed, 461 insertions(+), 77 deletions(-) create mode 100644 graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad create mode 100644 graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad create mode 100644 graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_airconditioning_with_heat_pump_boiler@electricity.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_heat_pump_boiler@electricity.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad create mode 100644 graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad create mode 100644 graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad create mode 100644 graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad create mode 100644 graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad create mode 100644 graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator.ad create mode 100644 graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad create mode 100644 graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad create mode 100644 graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad create mode 100644 graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator.ad create mode 100644 inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad create mode 100644 inputs/demand/households/households_heating/households_heater_airconditioning_with_heat_pump_boiler_share.ad diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml index 207ae85c6f..5193a2c8e7 100644 --- a/config/energy_node_positions.yml +++ b/config/energy_node_positions.yml @@ -1804,16 +1804,16 @@ households_cooker_wood_pellets: "y": 3940 households_cooling_airconditioning_electricity: x: 1520 - "y": 1340 + "y": 1220 households_cooling_heatpump_air_water_electricity: x: 1520 - "y": 1460 + "y": 1340 households_cooling_heatpump_ground_water_electricity: x: 1520 - "y": 1400 + "y": 1280 households_cooling_heatpump_surface_water_water_ts_electricity: x: 1520 - "y": 1520 + "y": 1400 households_final_demand_bio_kerosene: x: 3680 "y": 2620 @@ -1846,10 +1846,10 @@ households_final_demand_for_cooking_wood_pellets: "y": 3940 households_final_demand_for_cooling_electricity: x: 2300 - "y": 1440 + "y": 1240 households_final_demand_for_cooling_network_gas: x: 2300 - "y": 1500 + "y": 1300 households_final_demand_for_hot_water_coal: x: 2320 "y": 3020 @@ -1973,111 +1973,123 @@ households_solar_pv_solar_radiation: households_solar_pvt_solar_radiation: x: 3920 "y": 2760 +households_space_heater_airconditioning_with_combined_network_gas: + x: 1520 + "y": 2520 +households_space_heater_airconditioning_with_combined_network_gas_aggregator: + x: 1180 + "y": 2520 +households_space_heater_airconditioning_with_heat_pump_boiler: + x: 1520 + "y": 2580 +households_space_heater_airconditioning_with_heat_pump_boiler_aggregator: + x: 1180 + "y": 2580 households_space_heater_coal: x: 1520 - "y": 1680 + "y": 1500 households_space_heater_coal_aggregator: x: 1180 - "y": 1680 + "y": 1500 households_space_heater_combined_hydrogen: x: 1520 - "y": 1920 + "y": 1740 households_space_heater_combined_hydrogen_aggregator: x: 1180 - "y": 1920 + "y": 1740 households_space_heater_combined_network_gas: x: 1520 - "y": 1860 + "y": 1680 households_space_heater_combined_network_gas_aggregator: x: 1180 - "y": 1860 + "y": 1680 households_space_heater_crude_oil: x: 1520 - "y": 1740 + "y": 1560 households_space_heater_crude_oil_aggregator: x: 1180 - "y": 1740 + "y": 1560 households_space_heater_deficit: x: 1340 - "y": 2680 + "y": 2620 households_space_heater_district_heating_ht_steam_hot_water: x: 1520 - "y": 2460 + "y": 2280 households_space_heater_district_heating_ht_steam_hot_water_aggregator: x: 1180 - "y": 2460 + "y": 2280 households_space_heater_district_heating_lt_steam_hot_water: x: 1520 - "y": 2340 + "y": 2160 households_space_heater_district_heating_lt_steam_hot_water_aggregator: x: 1180 - "y": 2340 + "y": 2160 households_space_heater_district_heating_mt_steam_hot_water: x: 1520 - "y": 2400 + "y": 2220 households_space_heater_district_heating_mt_steam_hot_water_aggregator: x: 1180 - "y": 2400 + "y": 2220 households_space_heater_electricity: x: 1520 - "y": 2040 + "y": 1860 households_space_heater_electricity_aggregator: x: 1180 - "y": 2040 + "y": 1860 households_space_heater_heatpump_air_water_electricity: x: 1520 - "y": 2100 + "y": 1920 households_space_heater_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 2100 + "y": 1920 households_space_heater_heatpump_ground_water_electricity: x: 1520 - "y": 2160 + "y": 1980 households_space_heater_heatpump_ground_water_electricity_aggregator: x: 1180 - "y": 2160 + "y": 1980 households_space_heater_heatpump_pvt_electricity: x: 1520 - "y": 2280 + "y": 2100 households_space_heater_heatpump_pvt_electricity_aggregator: x: 1180 - "y": 2280 + "y": 2100 households_space_heater_heatpump_surface_water_water_ts_electricity: x: 1520 - "y": 2220 + "y": 2040 households_space_heater_heatpump_surface_water_water_ts_electricity_aggregator: x: 1180 - "y": 2220 + "y": 2040 households_space_heater_hybrid_crude_oil_heatpump_air_water_electricity: x: 1520 - "y": 2580 + "y": 2400 households_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 2580 + "y": 2400 households_space_heater_hybrid_heatpump_air_water_electricity: x: 1520 - "y": 2520 + "y": 2340 households_space_heater_hybrid_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 2520 + "y": 2340 households_space_heater_hybrid_hydrogen_heatpump_air_water_electricity: x: 1520 - "y": 2640 + "y": 2460 households_space_heater_hybrid_hydrogen_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 2640 + "y": 2460 households_space_heater_network_gas: x: 1520 - "y": 1800 + "y": 1620 households_space_heater_network_gas_aggregator: x: 1180 - "y": 1800 + "y": 1620 households_space_heater_wood_pellets: x: 1520 - "y": 1980 + "y": 1800 households_space_heater_wood_pellets_aggregator: x: 1180 - "y": 1980 + "y": 1800 households_useful_demand_cooking_useable_heat: x: 800 "y": 4000 @@ -2165,114 +2177,126 @@ households_useful_demand_hot_water: households_useful_demand_light: x: 800 "y": 4240 +households_water_heater_airconditioning_with_combined_network_gas: + x: 1520 + "y": 3740 +households_water_heater_airconditioning_with_combined_network_gas_aggregator: + x: 1180 + "y": 3740 +households_water_heater_airconditioning_with_heat_pump_boiler: + x: 1520 + "y": 3800 +households_water_heater_airconditioning_with_heat_pump_boiler_aggregator: + x: 1180 + "y": 3800 households_water_heater_coal: x: 1520 - "y": 2820 + "y": 2720 households_water_heater_coal_aggregator: x: 1180 - "y": 2820 + "y": 2720 households_water_heater_combined_hydrogen: x: 1520 - "y": 3060 + "y": 2960 households_water_heater_combined_hydrogen_aggregator: x: 1180 - "y": 3060 + "y": 2960 households_water_heater_combined_network_gas: x: 1520 - "y": 3000 + "y": 2900 households_water_heater_combined_network_gas_aggregator: x: 1180 - "y": 3000 + "y": 2900 households_water_heater_crude_oil: x: 1520 - "y": 2880 + "y": 2780 households_water_heater_crude_oil_aggregator: x: 1180 - "y": 2880 + "y": 2780 households_water_heater_deficit: x: 1340 - "y": 3820 + "y": 3840 households_water_heater_district_heating_ht_steam_hot_water: x: 1520 - "y": 3600 + "y": 3500 households_water_heater_district_heating_ht_steam_hot_water_aggregator: x: 1180 - "y": 3600 + "y": 3500 households_water_heater_district_heating_lt_steam_hot_water: x: 1520 - "y": 3480 + "y": 3380 households_water_heater_district_heating_lt_steam_hot_water_aggregator: x: 1180 - "y": 3480 + "y": 3380 households_water_heater_district_heating_mt_steam_hot_water: x: 1520 - "y": 3540 + "y": 3440 households_water_heater_district_heating_mt_steam_hot_water_aggregator: x: 1180 - "y": 3540 + "y": 3440 households_water_heater_heatpump_air_water_electricity: x: 1520 - "y": 3300 + "y": 3200 households_water_heater_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 3300 + "y": 3200 households_water_heater_heatpump_ground_water_electricity: x: 1520 - "y": 3240 + "y": 3140 households_water_heater_heatpump_ground_water_electricity_aggregator: x: 1180 - "y": 3240 + "y": 3140 households_water_heater_heatpump_pvt_electricity: x: 1520 - "y": 3420 + "y": 3320 households_water_heater_heatpump_pvt_electricity_aggregator: x: 1180 - "y": 3420 + "y": 3320 households_water_heater_heatpump_surface_water_water_ts_electricity: x: 1520 - "y": 3360 + "y": 3260 households_water_heater_heatpump_surface_water_water_ts_electricity_aggregator: x: 1180 - "y": 3360 + "y": 3260 households_water_heater_hybrid_crude_oil_heatpump_air_water_electricity: x: 1520 - "y": 3780 + "y": 3680 households_water_heater_hybrid_crude_oil_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 3780 + "y": 3680 households_water_heater_hybrid_heatpump_air_water_electricity: x: 1520 - "y": 3660 + "y": 3560 households_water_heater_hybrid_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 3660 + "y": 3560 households_water_heater_hybrid_hydrogen_heatpump_air_water_electricity: x: 1520 - "y": 3720 + "y": 3620 households_water_heater_hybrid_hydrogen_heatpump_air_water_electricity_aggregator: x: 1180 - "y": 3720 + "y": 3620 households_water_heater_network_gas: x: 1520 - "y": 2940 + "y": 2840 households_water_heater_network_gas_aggregator: x: 1180 - "y": 2940 + "y": 2840 households_water_heater_resistive_electricity: x: 1520 - "y": 3180 + "y": 3080 households_water_heater_resistive_electricity_aggregator: x: 1180 - "y": 3180 + "y": 3080 households_water_heater_solar_thermal: x: 1520 - "y": 2760 + "y": 2660 households_water_heater_wood_pellets: x: 1520 - "y": 3120 + "y": 3020 households_water_heater_wood_pellets_aggregator: x: 1180 - "y": 3120 + "y": 3020 industry_aluminium_burner_network_gas: x: 1240 "y": 11460 diff --git a/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad b/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad b/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad b/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_airconditioning_with_heat_pump_boiler@ambient_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_airconditioning_with_heat_pump_boiler@electricity.ad b/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_airconditioning_with_heat_pump_boiler@electricity.ad new file mode 100644 index 0000000000..16ad6d5fd9 --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_airconditioning_with_heat_pump_boiler@electricity.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, hot_water_households] + +- parent_share = 0.0 diff --git a/graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad b/graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad new file mode 100644 index 0000000000..16ad6d5fd9 --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, hot_water_households] + +- parent_share = 0.0 diff --git a/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad b/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad new file mode 100644 index 0000000000..498108795b --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, space_heating_households] + +- parent_share = 0.0 diff --git a/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_heat_pump_boiler@electricity.ad b/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_heat_pump_boiler@electricity.ad new file mode 100644 index 0000000000..498108795b --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_heat_pump_boiler@electricity.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, space_heating_households] + +- parent_share = 0.0 diff --git a/graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad b/graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad new file mode 100644 index 0000000000..498108795b --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, space_heating_households] + +- parent_share = 0.0 diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad new file mode 100644 index 0000000000..28dfcb5816 --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [] + +~ child_share = 1.0 diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad new file mode 100644 index 0000000000..28dfcb5816 --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [] + +~ child_share = 1.0 diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad new file mode 100644 index 0000000000..ec1f08ed43 --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad @@ -0,0 +1,2 @@ +- type = flexible +- reversed = false diff --git a/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad new file mode 100644 index 0000000000..ec1f08ed43 --- /dev/null +++ b/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad @@ -0,0 +1,2 @@ +- type = flexible +- reversed = false diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad new file mode 100644 index 0000000000..28dfcb5816 --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [] + +~ child_share = 1.0 diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad new file mode 100644 index 0000000000..28dfcb5816 --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [] + +~ child_share = 1.0 diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad new file mode 100644 index 0000000000..ec1f08ed43 --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad @@ -0,0 +1,2 @@ +- type = flexible +- reversed = false diff --git a/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad new file mode 100644 index 0000000000..ec1f08ed43 --- /dev/null +++ b/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_heat_pump_boiler_aggregator@useable_heat.ad @@ -0,0 +1,2 @@ +- type = flexible +- reversed = false diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad new file mode 100644 index 0000000000..b96fc165f2 --- /dev/null +++ b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad @@ -0,0 +1,47 @@ +- input.ambient_heat = 0.0 +- input.electricity = 0.0 +- input.network_gas = 1.0 +- output.loss = elastic +- output.useable_heat.ambient_heat = 1.0 +- output.useable_heat.electricity = 1.0 +- output.useable_heat.network_gas = 1.07 +- groups = [ + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_space_heating_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households, mt_delivery_system_households + ] +- use = energetic +- sector_label = households_space_heating +- presentation_group = heat_pumps +- availability = 0.0 +- full_load_hours = 0.0 +- ccs_investment = 0.0 +- construction_time = 0.0 +- cost_of_installing = 0.0 +- decommissioning_costs = 0.0 +- fixed_operation_and_maintenance_costs_per_year = 148.0 +- initial_investment = 5584.39 +- 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.02 +- fever.alias_of = households_water_heater_airconditioning_with_combined_network_gas +- fever.base_cop = 2.85633 +- fever.capacity.electricity = 0.001 +- fever.capacity.network_gas = 0.022 +- fever.cop_cutoff = 1.0 +- fever.cop_per_degree = 0.075165 +- fever.defer_for = 4 +- fever.efficiency_balanced_with = ambient_heat +- fever.efficiency_based_on = electricity +- fever.group = space_heating +- fever.technology_curve_type = tech_constant +- fever.type = producer +- network_gas.profile = self: network_gas_input_curve +- network_gas.type = consumer +- electricity_output_capacity = 0.0 +- free_co2_factor = 0.0 +- heat_output_capacity = 0.02354 +- households_supplied_per_unit = 1.0 +- takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad new file mode 100644 index 0000000000..2cd4cedbc1 --- /dev/null +++ b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad @@ -0,0 +1,2 @@ +- use = energetic +- groups = [] diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad new file mode 100644 index 0000000000..99c330c86e --- /dev/null +++ b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad @@ -0,0 +1,44 @@ +- input.ambient_heat = 0.704359 +- input.electricity = 0.295641 +- output.cooling = 0.0 +- output.loss = elastic +- output.useable_heat = 1.0 +- groups = [ + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_space_heating_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households, ht_delivery_system_households + ] +- use = energetic +- sector_label = households_space_heating +- presentation_group = heat_pumps +- availability = 0.0 +- full_load_hours = 0.0 +- ccs_investment = 0.0 +- construction_time = 0.0 +- cost_of_installing = 0.0 +- decommissioning_costs = 0.0 +- fixed_operation_and_maintenance_costs_per_year = 100.0 +- initial_investment = 6900.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.02 +- fever.alias_of = households_water_heater_airconditioning_with_heat_pump_boiler +- fever.base_cop = 2.856330 +- fever.capacity.electricity = 0.00200 +- fever.cop_per_degree = 0.075165 +- fever.defer_for = 4 +- fever.efficiency_balanced_with = ambient_heat +- fever.efficiency_based_on = electricity +- fever.group = space_heating +- fever.technology_curve_type = tech_constant +- fever.type = producer +- storage.cost_per_mwh = 0.0 +- storage.decay = 0.0 +- storage.volume = 0.0 +- electricity_output_capacity = 0.0 +- free_co2_factor = 0.0 +- heat_output_capacity = 0.007968 +- households_supplied_per_unit = 1.0 +- takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator.ad b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator.ad new file mode 100644 index 0000000000..2cd4cedbc1 --- /dev/null +++ b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler_aggregator.ad @@ -0,0 +1,2 @@ +- use = energetic +- groups = [] diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad new file mode 100644 index 0000000000..f5a0f2f616 --- /dev/null +++ b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad @@ -0,0 +1,31 @@ +- output.loss = elastic +- output.useable_heat = 0.9 +- groups = [ + direct_emissions, demand_driven, heat_production, etmoses, application_group, aggregator_producer, + wacc_households, costs_building_and_installations_households + ] +- use = energetic +- presentation_group = traditional_heat +- availability = 0.0 +- full_load_hours = 0.0 +- ccs_investment = 0.0 +- construction_time = 0.0 +- cost_of_installing = 0.0 +- decommissioning_costs = 0.0 +- fixed_operation_and_maintenance_costs_per_year = 0.0 +- initial_investment = 0.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.02 +- fever.group = households_hot_water +- fever.type = producer +- fever.technology_curve_type = default +- network_gas.profile = self: heat_output_curve +- network_gas.type = consumer +- electricity_output_capacity = 0.0 +- free_co2_factor = 0.0 +- heat_output_capacity = 0.022 +- households_supplied_per_unit = 0.0 +- takes_part_in_ets = 0.0 +- sector_label = households_hot_water diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad new file mode 100644 index 0000000000..2cd4cedbc1 --- /dev/null +++ b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad @@ -0,0 +1,2 @@ +- use = energetic +- groups = [] diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad new file mode 100644 index 0000000000..38bc47f93a --- /dev/null +++ b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad @@ -0,0 +1,41 @@ +- input.ambient_heat = 0.565217 +- input.electricity = 0.434783 +- output.loss = elastic +- output.useable_heat = 1.0 +- groups = [ + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_hot_water_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households + ] +- use = energetic +- sector_label = households_hot_water +- presentation_group = heat_pumps +- availability = 0.0 +- full_load_hours = 0.0 +- ccs_investment = 0.0 +- construction_time = 0.0 +- cost_of_installing = 0.0 +- decommissioning_costs = 0.0 +- fixed_operation_and_maintenance_costs_per_year = 50.0 +- initial_investment = 1750.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.02 +- fever.base_cop = 2.1044 +- fever.capacity.electricity = 0.00070 +- fever.cop_per_degree = 0.04074 +- fever.efficiency_balanced_with = ambient_heat +- fever.efficiency_based_on = electricity +- fever.group = households_hot_water +- fever.technology_curve_type = default +- fever.type = producer +- storage.cost_per_mwh = 0.0 +- storage.decay = 0.0 +- storage.volume = 0.008723 +- electricity_output_capacity = 0.0 +- free_co2_factor = 0.0 +- heat_output_capacity = 0.0078 +- households_supplied_per_unit = 1.0 +- takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator.ad b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator.ad new file mode 100644 index 0000000000..2cd4cedbc1 --- /dev/null +++ b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler_aggregator.ad @@ -0,0 +1,2 @@ +- use = energetic +- groups = [] diff --git a/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad b/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad new file mode 100644 index 0000000000..65136072ce --- /dev/null +++ b/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad @@ -0,0 +1,15 @@ +# Updates both space heating and hot water shares + +- query = + EACH( + UPDATE(V(households_space_heater_airconditioning_with_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)), + UPDATE(V(households_water_heater_airconditioning_with_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)) + ) +- share_group = heating_households +- priority = 10 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:V(households_space_heater_airconditioning_with_combined_network_gas,"fever.share_in_group") * 100.0 +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_heating/households_heater_airconditioning_with_heat_pump_boiler_share.ad b/inputs/demand/households/households_heating/households_heater_airconditioning_with_heat_pump_boiler_share.ad new file mode 100644 index 0000000000..4afda9ca0b --- /dev/null +++ b/inputs/demand/households/households_heating/households_heater_airconditioning_with_heat_pump_boiler_share.ad @@ -0,0 +1,15 @@ +# Updates both space heating and hot water shares + +- query = + EACH( + UPDATE(V(households_space_heater_airconditioning_with_heat_pump_boiler, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)), + UPDATE(V(households_water_heater_airconditioning_with_heat_pump_boiler, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)) + ) +- share_group = heating_households +- priority = 10 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:V(households_space_heater_airconditioning_with_heat_pump_boiler,"fever.share_in_group") * 100.0 +- step_value = 0.1 +- unit = % +- update_period = future From d93d8216d63b0eca5c1f6641601d867e5457325c Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Tue, 22 Sep 2026 13:49:48 +0200 Subject: [PATCH 2/5] Additional steps for airco heating - renamed the nodes and edges for arco + gas to include the word 'hybrid'. This way, fever can recognize it as a combined producer. - Made queries to include airco heating in the existing chart: Number of residences per space heating technology - Made queries to include airco heating in the residential space heating merit order - Added inputs to let users change the capacities of airco heating --- config/energy_node_positions.yml | 8 +++---- config/fever/space_heating_producer_order.yml | 2 ++ ...tioning_with_heat_pump_boiler_capacity.gql | 2 ++ ...itioning_combined_network_gas_capacity.gql | 2 ++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ..._airconditioning_with_heat_pump_boiler.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...d_airconditioning_combined_network_gas.gql | 20 ++++++++++++++++ ...ning_combined_network_gas@ambient_heat.ad} | 0 ...oning_combined_network_gas@network_gas.ad} | 0 ...oning_combined_network_gas@electricity.ad} | 0 ...oning_combined_network_gas@network_gas.ad} | 0 ...ed_network_gas_aggregator@useable_heat.ad} | 0 ...ed_network_gas_aggregator@useable_heat.ad} | 0 ...ting_apartments_1945_1964@useable_heat.ad} | 0 ...ting_apartments_1965_1984@useable_heat.ad} | 0 ...ting_apartments_1985_2004@useable_heat.ad} | 0 ...g_apartments_2005_present@useable_heat.ad} | 0 ...ng_apartments_before_1945@useable_heat.ad} | 0 ...heating_apartments_future@useable_heat.ad} | 0 ...detached_houses_1945_1964@useable_heat.ad} | 0 ...detached_houses_1965_1984@useable_heat.ad} | 0 ...detached_houses_1985_2004@useable_heat.ad} | 0 ...ached_houses_2005_present@useable_heat.ad} | 0 ...tached_houses_before_1945@useable_heat.ad} | 0 ...ng_detached_houses_future@useable_heat.ad} | 0 ...detached_houses_1945_1964@useable_heat.ad} | 0 ...detached_houses_1965_1984@useable_heat.ad} | 0 ...detached_houses_1985_2004@useable_heat.ad} | 0 ...ached_houses_2005_present@useable_heat.ad} | 0 ...tached_houses_before_1945@useable_heat.ad} | 0 ...mi_detached_houses_future@useable_heat.ad} | 0 ...terraced_houses_1945_1964@useable_heat.ad} | 0 ...terraced_houses_1965_1984@useable_heat.ad} | 0 ...terraced_houses_1985_2004@useable_heat.ad} | 0 ...raced_houses_2005_present@useable_heat.ad} | 0 ...rraced_houses_before_1945@useable_heat.ad} | 0 ...ng_terraced_houses_future@useable_heat.ad} | 0 ...ed_network_gas_aggregator@useable_heat.ad} | 0 ...ed_network_gas_aggregator@useable_heat.ad} | 0 ..._water_after_solar_heater@useable_heat.ad} | 0 ...r_airconditioning_with_heat_pump_boiler.ad | 1 - ...d_airconditioning_combined_network_gas.ad} | 3 ++- ...ioning_combined_network_gas_aggregator.ad} | 0 ...d_airconditioning_combined_network_gas.ad} | 17 ++++++++++--- ...ioning_combined_network_gas_aggregator.ad} | 0 ...tioning_with_combined_network_gas_share.ad | 6 ++--- ...h_heat_pump_boiler_heat_output_capacity.ad | 22 +++++++++++++++++ ...mbined_network_gas_heat_output_capacity.ad | 24 +++++++++++++++++++ ..._water_electricity_heat_output_capacity.ad | 2 +- 58 files changed, 316 insertions(+), 13 deletions(-) create mode 100644 gqueries/general/heat/user_sortable/user_sortable_households_space_heater_airconditioning_with_heat_pump_boiler_capacity.gql create mode 100644 gqueries/general/heat/user_sortable/user_sortable_households_space_heater_hybrid_airconditioning_combined_network_gas_capacity.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas.gql rename graphs/energy/edges/households/{environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad => environment_air_ambient_heat-households_space_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad} (100%) rename graphs/energy/edges/households/{households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad => households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad} (100%) rename graphs/energy/edges/households/{households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad => households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_airconditioning_combined_network_gas@electricity.ad} (100%) rename graphs/energy/edges/households/{households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad => households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad => households_space_heater_deficit-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad => households_water_heater_deficit-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad => households_water_heater_hybrid_airconditioning_combined_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad} (100%) rename graphs/energy/edges/households/{households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad => households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad} (100%) rename graphs/energy/nodes/households/{households_space_heater_airconditioning_with_combined_network_gas.ad => households_space_heater_hybrid_airconditioning_combined_network_gas.ad} (93%) rename graphs/energy/nodes/households/{households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad => households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad} (100%) rename graphs/energy/nodes/households/{households_water_heater_airconditioning_with_combined_network_gas.ad => households_water_heater_hybrid_airconditioning_combined_network_gas.ad} (69%) rename graphs/energy/nodes/households/{households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad => households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad} (100%) create mode 100644 inputs/demand/households/households_technologies/households_heater_airconditioning_with_heat_pump_boiler_heat_output_capacity.ad create mode 100644 inputs/demand/households/households_technologies/households_heater_hybrid_airconditioning_combined_network_gas_heat_output_capacity.ad diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml index 5193a2c8e7..9810de5ad8 100644 --- a/config/energy_node_positions.yml +++ b/config/energy_node_positions.yml @@ -1973,10 +1973,10 @@ households_solar_pv_solar_radiation: households_solar_pvt_solar_radiation: x: 3920 "y": 2760 -households_space_heater_airconditioning_with_combined_network_gas: +households_space_heater_hybrid_airconditioning_combined_network_gas: x: 1520 "y": 2520 -households_space_heater_airconditioning_with_combined_network_gas_aggregator: +households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator: x: 1180 "y": 2520 households_space_heater_airconditioning_with_heat_pump_boiler: @@ -2177,10 +2177,10 @@ households_useful_demand_hot_water: households_useful_demand_light: x: 800 "y": 4240 -households_water_heater_airconditioning_with_combined_network_gas: +households_water_heater_hybrid_airconditioning_combined_network_gas: x: 1520 "y": 3740 -households_water_heater_airconditioning_with_combined_network_gas_aggregator: +households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator: x: 1180 "y": 3740 households_water_heater_airconditioning_with_heat_pump_boiler: diff --git a/config/fever/space_heating_producer_order.yml b/config/fever/space_heating_producer_order.yml index 9d1ef8bbfe..4d890ce180 100644 --- a/config/fever/space_heating_producer_order.yml +++ b/config/fever/space_heating_producer_order.yml @@ -8,6 +8,8 @@ - households_space_heater_hybrid_heatpump_air_water_electricity - households_space_heater_hybrid_hydrogen_heatpump_air_water_electricity - households_space_heater_hybrid_crude_oil_heatpump_air_water_electricity +- households_space_heater_airconditioning_with_heat_pump_boiler +- households_space_heater_hybrid_airconditioning_combined_network_gas - households_space_heater_district_heating_ht_steam_hot_water - households_space_heater_electricity - households_space_heater_combined_network_gas diff --git a/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_airconditioning_with_heat_pump_boiler_capacity.gql b/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_airconditioning_with_heat_pump_boiler_capacity.gql new file mode 100644 index 0000000000..5a10fd8aa3 --- /dev/null +++ b/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_airconditioning_with_heat_pump_boiler_capacity.gql @@ -0,0 +1,2 @@ +- query = V(households_space_heater_airconditioning_with_heat_pump_boiler, heat_output_capacity) +- unit = MW diff --git a/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_hybrid_airconditioning_combined_network_gas_capacity.gql b/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_hybrid_airconditioning_combined_network_gas_capacity.gql new file mode 100644 index 0000000000..ec173285b0 --- /dev/null +++ b/gqueries/general/heat/user_sortable/user_sortable_households_space_heater_hybrid_airconditioning_combined_network_gas_capacity.gql @@ -0,0 +1,2 @@ +- query = V(households_space_heater_hybrid_airconditioning_combined_network_gas, heat_output_capacity) +- unit = MW diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..8265d23d6c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1945_1964, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1945_1964, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1945_1964, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1945_1964,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..a8934d93db --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1965_1984, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1965_1984, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1965_1984, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1965_1984,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..af1036577c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1985_2004, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1985_2004, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1985_2004, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1985_2004,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..4ee1fc5b4c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_2005_present, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_2005_present, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_2005_present, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_2005_present,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..f2827375e6 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_before_1945, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_before_1945, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_before_1945, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_before_1945,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler.gql new file mode 100644 index 0000000000..68c581e17c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_airconditioning_with_heat_pump_boiler/number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_future, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_future, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_future, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_future, households_space_heater_airconditioning_with_heat_pump_boiler_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_future,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..ca0cc05993 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1945_1964, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1945_1964, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1945_1964,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1945_1964, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1945_1964,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..6cf21027f8 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1965_1984, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1965_1984, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1965_1984,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1965_1984, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1965_1984,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..8546470a52 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_1985_2004, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_1985_2004, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_1985_2004,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_1985_2004, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_1985_2004,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..e5b8208e16 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_2005_present, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_2005_present, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_2005_present,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_2005_present, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_2005_present,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..57f9d6955a --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_before_1945, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_before_1945, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_before_1945,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_before_1945, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_before_1945,number_of_units) + ) + ) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas.gql new file mode 100644 index 0000000000..1758e0e88b --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_number_of_houses_per_space_heating_technology/space_heater_hybrid_airconditioning_combined_network_gas/number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas.gql @@ -0,0 +1,20 @@ +- unit = # +- query = + SUM( + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_terraced_houses_future, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_terraced_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_semi_detached_houses_future, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_semi_detached_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_detached_houses_future, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_detached_houses_future,number_of_units) + ), + PRODUCT( + V(EDGE(households_useful_demand_for_space_heating_apartments_future, households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator),share), + V(households_useful_demand_for_space_heating_apartments_future,number_of_units) + ) + ) diff --git a/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad b/graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad similarity index 100% rename from graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_airconditioning_with_combined_network_gas@ambient_heat.ad rename to graphs/energy/edges/households/environment_air_ambient_heat-households_space_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad diff --git a/graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad b/graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad similarity index 100% rename from graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_airconditioning_with_combined_network_gas@network_gas.ad rename to graphs/energy/edges/households/households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad diff --git a/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad b/graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_airconditioning_combined_network_gas@electricity.ad similarity index 100% rename from graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_airconditioning_with_combined_network_gas@electricity.ad rename to graphs/energy/edges/households/households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_airconditioning_combined_network_gas@electricity.ad diff --git a/graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad b/graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad similarity index 100% rename from graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_airconditioning_with_combined_network_gas@network_gas.ad rename to graphs/energy/edges/households/households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas@network_gas.ad diff --git a/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_deficit-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas-households_space_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas-households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1945_1964@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1965_1984@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_1985_2004@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_2005_present@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_before_1945@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_apartments_future@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1945_1964@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1965_1984@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_1985_2004@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_2005_present@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_before_1945@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_detached_houses_future@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1945_1964@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1965_1984@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_1985_2004@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_2005_present@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_before_1945@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_semi_detached_houses_future@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1945_1964@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1965_1984@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_1985_2004@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_2005_present@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_before_1945@useable_heat.ad diff --git a/graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad b/graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad rename to graphs/energy/edges/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_space_heating_terraced_houses_future@useable_heat.ad diff --git a/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad rename to graphs/energy/edges/households/households_water_heater_deficit-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_hybrid_airconditioning_combined_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas-households_water_heater_airconditioning_with_combined_network_gas_aggregator@useable_heat.ad rename to graphs/energy/edges/households/households_water_heater_hybrid_airconditioning_combined_network_gas-households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator@useable_heat.ad diff --git a/graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad b/graphs/energy/edges/households/households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad similarity index 100% rename from graphs/energy/edges/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad rename to graphs/energy/edges/households/households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator-households_useful_demand_for_hot_water_after_solar_heater@useable_heat.ad diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad index 99c330c86e..640f20ff69 100644 --- a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad +++ b/graphs/energy/nodes/households/households_space_heater_airconditioning_with_heat_pump_boiler.ad @@ -24,7 +24,6 @@ - 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.02 -- fever.alias_of = households_water_heater_airconditioning_with_heat_pump_boiler - fever.base_cop = 2.856330 - fever.capacity.electricity = 0.00200 - fever.cop_per_degree = 0.075165 diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad similarity index 93% rename from graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad rename to graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad index b96fc165f2..c26172b4f7 100644 --- a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad @@ -14,6 +14,7 @@ - use = energetic - sector_label = households_space_heating - presentation_group = heat_pumps +- graph_methods = [input] - availability = 0.0 - full_load_hours = 0.0 - ccs_investment = 0.0 @@ -26,7 +27,7 @@ - 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.02 -- fever.alias_of = households_water_heater_airconditioning_with_combined_network_gas +- fever.alias_of = households_water_heater_hybrid_airconditioning_combined_network_gas - fever.base_cop = 2.85633 - fever.capacity.electricity = 0.001 - fever.capacity.network_gas = 0.022 diff --git a/graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad similarity index 100% rename from graphs/energy/nodes/households/households_space_heater_airconditioning_with_combined_network_gas_aggregator.ad rename to graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad similarity index 69% rename from graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad rename to graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad index f5a0f2f616..112e366ff2 100644 --- a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad @@ -1,3 +1,6 @@ +- input.electricity = 0.0 +- input.network_gas = 1.0 +- input.ambient_heat = 0.0 - output.loss = elastic - output.useable_heat = 0.9 - groups = [ @@ -6,6 +9,7 @@ ] - use = energetic - presentation_group = traditional_heat +- graph_methods = [input] - availability = 0.0 - full_load_hours = 0.0 - ccs_investment = 0.0 @@ -18,14 +22,21 @@ - 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.02 +- fever.base_cop = 1.0 +- fever.capacity.electricity = 0.001 +- fever.capacity.network_gas = 0.022 +- fever.cop_cutoff = 10.0 +- fever.cop_per_degree = 0.0 +- fever.efficiency_balanced_with = ambient_heat +- fever.efficiency_based_on = electricity - fever.group = households_hot_water -- fever.type = producer - fever.technology_curve_type = default -- network_gas.profile = self: heat_output_curve +- fever.type = producer +- network_gas.profile = self: network_gas_input_curve - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 - heat_output_capacity = 0.022 -- households_supplied_per_unit = 0.0 +- households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 - sector_label = households_hot_water diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad similarity index 100% rename from graphs/energy/nodes/households/households_water_heater_airconditioning_with_combined_network_gas_aggregator.ad rename to graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas_aggregator.ad diff --git a/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad b/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad index 65136072ce..e01cc4365b 100644 --- a/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad +++ b/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad @@ -2,14 +2,14 @@ - query = EACH( - UPDATE(V(households_space_heater_airconditioning_with_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)), - UPDATE(V(households_water_heater_airconditioning_with_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)) + UPDATE(V(households_space_heater_hybrid_airconditioning_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)), + UPDATE(V(households_water_heater_hybrid_airconditioning_combined_network_gas, fever), share_in_group, DIVIDE(USER_INPUT(),100.0)) ) - share_group = heating_households - priority = 10 - max_value = 100.0 - min_value = 0.0 -- start_value_gql = present:V(households_space_heater_airconditioning_with_combined_network_gas,"fever.share_in_group") * 100.0 +- start_value_gql = present:V(households_space_heater_hybrid_airconditioning_combined_network_gas,"fever.share_in_group") * 100.0 - step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_technologies/households_heater_airconditioning_with_heat_pump_boiler_heat_output_capacity.ad b/inputs/demand/households/households_technologies/households_heater_airconditioning_with_heat_pump_boiler_heat_output_capacity.ad new file mode 100644 index 0000000000..4e5905b5fa --- /dev/null +++ b/inputs/demand/households/households_technologies/households_heater_airconditioning_with_heat_pump_boiler_heat_output_capacity.ad @@ -0,0 +1,22 @@ +# 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_airconditioning_with_heat_pump_boiler,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_airconditioning_with_heat_pump_boiler), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)), + UPDATE(V(households_water_heater_airconditioning_with_heat_pump_boiler), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)), + + UPDATE_WITH_FACTOR(V(V(households_space_heater_airconditioning_with_heat_pump_boiler, fever), capacity), "electricity", heat_capacity_relative_change), + UPDATE_WITH_FACTOR(V(V(households_water_heater_airconditioning_with_heat_pump_boiler, fever), capacity), "electricity", heat_capacity_relative_change) + ) +- priority = 0 +- max_value_gql = present:MAX(V(households_space_heater_airconditioning_with_heat_pump_boiler,heat_output_capacity) * 1000.0,25.0) +- min_value = 0.1 +- start_value_gql = present:V(households_space_heater_airconditioning_with_heat_pump_boiler,heat_output_capacity) * 1000.0 +- step_value = 0.1 +- unit = kW +- update_period = future diff --git a/inputs/demand/households/households_technologies/households_heater_hybrid_airconditioning_combined_network_gas_heat_output_capacity.ad b/inputs/demand/households/households_technologies/households_heater_hybrid_airconditioning_combined_network_gas_heat_output_capacity.ad new file mode 100644 index 0000000000..0d915fcb2f --- /dev/null +++ b/inputs/demand/households/households_technologies/households_heater_hybrid_airconditioning_combined_network_gas_heat_output_capacity.ad @@ -0,0 +1,24 @@ +# 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_hybrid_airconditioning_combined_network_gas,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_hybrid_airconditioning_combined_network_gas), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)), + UPDATE(V(households_water_heater_hybrid_airconditioning_combined_network_gas), heat_output_capacity, DIVIDE(USER_INPUT(),1000.0)), + + UPDATE_WITH_FACTOR(V(V(households_space_heater_hybrid_airconditioning_combined_network_gas, fever), capacity), "electricity", heat_capacity_relative_change), + UPDATE_WITH_FACTOR(V(V(households_water_heater_hybrid_airconditioning_combined_network_gas, fever), capacity), "electricity", heat_capacity_relative_change), + UPDATE_WITH_FACTOR(V(V(households_space_heater_hybrid_airconditioning_combined_network_gas, fever), capacity), "network_gas", heat_capacity_relative_change), + UPDATE_WITH_FACTOR(V(V(households_water_heater_hybrid_airconditioning_combined_network_gas, fever), capacity), "network_gas", heat_capacity_relative_change) + ) +- priority = 0 +- max_value_gql = present:MAX(V(households_space_heater_hybrid_airconditioning_combined_network_gas,heat_output_capacity) * 1000.0,25.0) +- min_value = 0.1 +- start_value_gql = present:V(households_space_heater_hybrid_airconditioning_combined_network_gas,heat_output_capacity) * 1000.0 +- step_value = 0.1 +- unit = kW +- update_period = future diff --git a/inputs/demand/households/households_technologies/households_heater_hybrid_heatpump_air_water_electricity_heat_output_capacity.ad b/inputs/demand/households/households_technologies/households_heater_hybrid_heatpump_air_water_electricity_heat_output_capacity.ad index d29bdb5ab1..5b47153a2c 100644 --- a/inputs/demand/households/households_technologies/households_heater_hybrid_heatpump_air_water_electricity_heat_output_capacity.ad +++ b/inputs/demand/households/households_technologies/households_heater_hybrid_heatpump_air_water_electricity_heat_output_capacity.ad @@ -16,7 +16,7 @@ UPDATE_WITH_FACTOR(V(V(households_water_heater_hybrid_heatpump_air_water_electricity, fever), capacity), "network_gas", heat_capacity_relative_change) ) - priority = 0 -- max_value_gql = present:MAX(V(households_space_heater_hybrid_heatpumpair_water_electricity,heat_output_capacity) * 1000.0,25.0) +- max_value_gql = present:MAX(V(households_space_heater_hybrid_heatpump_air_water_electricity,heat_output_capacity) * 1000.0,25.0) - min_value = 0.1 - start_value_gql = present:V(households_space_heater_hybrid_heatpump_air_water_electricity,heat_output_capacity) * 1000.0 - step_value = 0.1 From 208cd26f74a857e6f0625aab46f7a26fc83941f1 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Wed, 23 Sep 2026 12:55:06 +0200 Subject: [PATCH 3/5] Fixed mistakes found by Claude PR review - Added new technologies to households_hot_water_producer_order - ht_deliver_system instead of mt - Renamed inputs to align with existing naming convention --- config/fever/households_hot_water_producer_order.yml | 2 ++ ..._space_heater_hybrid_airconditioning_combined_network_gas.ad | 2 +- ...heater_hybrid_airconditioning_combined_network_gas_share.ad} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename inputs/demand/households/households_heating/{households_heater_airconditioning_with_combined_network_gas_share.ad => households_heater_hybrid_airconditioning_combined_network_gas_share.ad} (100%) diff --git a/config/fever/households_hot_water_producer_order.yml b/config/fever/households_hot_water_producer_order.yml index b99f303117..d609e497ef 100644 --- a/config/fever/households_hot_water_producer_order.yml +++ b/config/fever/households_hot_water_producer_order.yml @@ -8,6 +8,8 @@ - households_water_heater_hybrid_heatpump_air_water_electricity - households_water_heater_hybrid_hydrogen_heatpump_air_water_electricity - households_water_heater_hybrid_crude_oil_heatpump_air_water_electricity +- households_water_heater_airconditioning_with_heat_pump_boiler +- households_water_heater_hybrid_airconditioning_combined_network_gas - households_water_heater_district_heating_ht_steam_hot_water - households_water_heater_resistive_electricity - households_water_heater_combined_network_gas diff --git a/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad index c26172b4f7..ef796e0174 100644 --- a/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad @@ -9,7 +9,7 @@ direct_emissions, demand_driven, heat_production, etmoses, merit_household_space_heating_producers, application_group, aggregator_producer, lv_net_demand, wacc_households, - merit_order_csv_include, costs_building_and_installations_households, mt_delivery_system_households + merit_order_csv_include, costs_building_and_installations_households, ht_delivery_system_households ] - use = energetic - sector_label = households_space_heating diff --git a/inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad b/inputs/demand/households/households_heating/households_heater_hybrid_airconditioning_combined_network_gas_share.ad similarity index 100% rename from inputs/demand/households/households_heating/households_heater_airconditioning_with_combined_network_gas_share.ad rename to inputs/demand/households/households_heating/households_heater_hybrid_airconditioning_combined_network_gas_share.ad From 5fdb3c21693720e09d4892af4b9909ef3a43e04b Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Wed, 23 Sep 2026 16:19:28 +0200 Subject: [PATCH 4/5] Some final changes - Made some changes to node values (heat_output_capacity of 4 nodes) - Added two edges that have no real function as of right now as the demand is hardcoded to be zero. This is for the hybrid airco + heat pump, the water heater only runs on gas but since it is modelled as a hybrid with (0) demand for electricity and ambient heat. The electricity and ambient heat edges are added. --- ...brid_airconditioning_combined_network_gas@ambient_heat.ad | 2 ++ ...ybrid_airconditioning_combined_network_gas@electricity.ad | 5 +++++ ...ace_heater_hybrid_airconditioning_combined_network_gas.ad | 2 +- ...lds_space_heater_hybrid_heatpump_air_water_electricity.ad | 2 +- ...ter_heater_hybrid_airconditioning_combined_network_gas.ad | 2 +- ...lds_water_heater_hybrid_heatpump_air_water_electricity.ad | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad create mode 100644 graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_airconditioning_combined_network_gas@electricity.ad diff --git a/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad b/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/households/environment_air_ambient_heat-households_water_heater_hybrid_airconditioning_combined_network_gas@ambient_heat.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_airconditioning_combined_network_gas@electricity.ad b/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_airconditioning_combined_network_gas@electricity.ad new file mode 100644 index 0000000000..16ad6d5fd9 --- /dev/null +++ b/graphs/energy/edges/households/households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_airconditioning_combined_network_gas@electricity.ad @@ -0,0 +1,5 @@ +- type = share +- reversed = false +- groups = [final_demand, hot_water_households] + +- parent_share = 0.0 diff --git a/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad index ef796e0174..35ded66d5f 100644 --- a/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_space_heater_hybrid_airconditioning_combined_network_gas.ad @@ -43,6 +43,6 @@ - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.02354 +- heat_output_capacity = 0.003984 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad index 6c7f6b8648..c7c0c21319 100644 --- a/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad +++ b/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad @@ -40,7 +40,7 @@ - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.02354 +- heat_output_capacity = 0.00460 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad index 112e366ff2..bdb30c5471 100644 --- a/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad @@ -36,7 +36,7 @@ - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.022 +- heat_output_capacity = 0.01980 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 - sector_label = households_hot_water diff --git a/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad index 6b94f399b7..f4d71ace35 100644 --- a/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad +++ b/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad @@ -38,7 +38,7 @@ - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.02354 +- heat_output_capacity = 0.00460 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 From 29c804ba7b5415834da90392f824d2fb86de90c2 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 2 Oct 2026 16:38:35 +0200 Subject: [PATCH 5/5] Implemented PR feedback - Added 'output.useable_heat.network_gas = 0.9' to the water heater hybrid node - Alligned heat_output_capacity of water heater parts to the space heater parts --- ...ds_water_heater_airconditioning_with_heat_pump_boiler.ad | 2 +- ...er_heater_hybrid_airconditioning_combined_network_gas.ad | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad index 38bc47f93a..38d9709344 100644 --- a/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad +++ b/graphs/energy/nodes/households/households_water_heater_airconditioning_with_heat_pump_boiler.ad @@ -36,6 +36,6 @@ - storage.volume = 0.008723 - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.0078 +- heat_output_capacity = 0.007968 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad index bdb30c5471..afa92b1843 100644 --- a/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad +++ b/graphs/energy/nodes/households/households_water_heater_hybrid_airconditioning_combined_network_gas.ad @@ -2,7 +2,9 @@ - input.network_gas = 1.0 - input.ambient_heat = 0.0 - output.loss = elastic -- output.useable_heat = 0.9 +- output.useable_heat.ambient_heat = 1.0 +- output.useable_heat.electricity = 1.0 +- output.useable_heat.network_gas = 0.9 - groups = [ direct_emissions, demand_driven, heat_production, etmoses, application_group, aggregator_producer, wacc_households, costs_building_and_installations_households @@ -36,7 +38,7 @@ - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.01980 +- heat_output_capacity = 0.003984 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 - sector_label = households_hot_water