jort-wolda · Sep 18, 2026 · Sep 22, 2026 · Sep 23, 2026 · Sep 23, 2026 · Oct 2, 2026
diff --git 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_hybrid_airconditioning_combined_network_gas:
+  x: 1520
+  "y": 2520
+households_space_heater_hybrid_airconditioning_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_hybrid_airconditioning_combined_network_gas:
+  x: 1520
+  "y": 3740
+households_water_heater_hybrid_airconditioning_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/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/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/.../user_sortable_households_space_heater_airconditioning_with_heat_pump_boiler_capacity.gql b/.../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/...sortable_households_space_heater_hybrid_airconditioning_combined_network_gas_capacity.gql b/...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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- query = V(households_space_heater_airconditioning_with_heat_pump_boiler, heat_output_capacity)
		- unit = MW
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- query = V(households_space_heater_hybrid_airconditioning_combined_network_gas, heat_output_capacity)
		- unit = MW