Merge branch 'improve-transport-sector' into uba_industry_demand

Author: lindnemi

CHANGELOG.md

@@ -4,6 +4,8 @@
 - Added an option to source mobility demand from UBA MWMS (Projektionsbericht 2025) for the years 2025-2035
 - Renamed functions and script for exogenous mobility demand
 - Improved the transport demand data, added an option to source 2020 and 2025 data from AGEB instead of Aladin
+- Longer lifetime (40 years) is only applied to existing gas CHPs, not new ones. Added a new config entry `existing_capacities:fill_value_gas_chp_lifetime`
+- Bugfix: gas CHPs are extendable again
 - Simplified scenarion definition and made `Mix` the default scenario
 - 0.3: workflow is all public now, no longer requires credentials to internal data
 - Allowing myopic optimization until 2050

Snakefile

@@ -362,7 +362,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cost_data", T
     ruleorder: modify_cost_data > retrieve_cost_data
 
 
-rule build_exogenous_mobility_demand:
+rule build_exogenous_mobility_data:
     params:
         reference_scenario=config_provider("iiasa_database", "reference_scenario"),
         planning_horizons=config_provider("scenario", "planning_horizons"),
@@ -374,18 +374,17 @@ rule build_exogenous_mobility_demand:
         energy_totals_year=config_provider("energy", "energy_totals_year"),
     input:
         ariadne="resources/ariadne_database.csv",
-        clustered_pop_layout=resources("pop_layout_base_s_{clusters}.csv"),
         energy_totals=resources("energy_totals.csv"),
     output:
-        mobility_demand=resources(
-            "modified_mobility_demand_{clusters}_{planning_horizons}.csv"
+        mobility_data=resources(
+            "modified_mobility_data_{clusters}_{planning_horizons}.csv"
         ),
     resources:
         mem_mb=1000,
     log:
-        logs("build_exogenous_mobility_demand_{clusters}_{planning_horizons}.log"),
+        logs("build_exogenous_mobility_data_{clusters}_{planning_horizons}.log"),
     script:
-        "scripts/pypsa-de/build_exogenous_mobility_demand.py"
+        "scripts/pypsa-de/build_exogenous_mobility_data.py"
 
 
 rule build_egon_data:
@@ -574,8 +573,8 @@ rule modify_prenetwork:
             else []
         ),
         costs=resources("costs_{planning_horizons}.csv"),
-        modified_mobility_demand=resources(
-            "modified_mobility_demand_{clusters}_{planning_horizons}.csv"
+        modified_mobility_data=resources(
+            "modified_mobility_data_{clusters}_{planning_horizons}.csv"
         ),
         biomass_potentials=resources(
             "biomass_potentials_s_{clusters}_{planning_horizons}.csv"

config/config.de.yaml

@@ -44,7 +44,7 @@ iiasa_database:
   reference_scenario: KN2045_Mix
   region: Deutschland
   ageb_for_mobility: true # In 2020 use AGEB data for final energy demand and KBA for vehicles
-  uba_for_mobility: true # For 2025–2035 use MWMS scenario from UBA Projektionsbericht 2025
+  uba_for_mobility: false # For 2025–2035 use MWMS scenario from UBA Projektionsbericht 2025
   uba_for_industry: true # For 2025–2035 use MWMS scenario from UBA Projektionsbericht 2025
   scale_industry_non_energy: false # Scale non-energy industry demand directly proportional to energy demand
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#foresight
@@ -73,6 +73,7 @@ scenario:
 existing_capacities:
   grouping_years_power: [1920, 1950, 1955, 1960, 1965, 1970, 1975, 1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020]
   grouping_years_heat: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019] # heat grouping years >= baseyear will be ignored
+  fill_value_gas_chp_lifetime: 40 # if no explicit lifetime is given use 40 years. The number was chosen s.t. the existing capacities in 2020 match with statistics.
 
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#countries
@@ -278,8 +279,6 @@ costs:
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#sector
 sector:
-  chp:
-    enable: false # This should only deactivate the CHPs from prepare_sector_network, not those from add_existing_baseyear
   v2g: false
   solar_thermal: false
   district_heating:
@@ -336,31 +335,31 @@ sector:
     2040: 0.29
     2045: 0.36
     2050: 0.43
-  # The transport_shares are just dummy setting that get overwritten in build_exogenous_mobility_demand
+  # For Germany these settings get overwritten in build_exogenous_mobility_data
   land_transport_fuel_cell_share:
     2020: 0.01
     2025: 0.01
-    2030: 0.01
-    2035: 0.01
-    2040: 0.01
-    2045: 0.01
-    2050: 0.01
+    2030: 0.02
+    2035: 0.03
+    2040: 0.03
+    2045: 0.03
+    2050: 0.03
   land_transport_electric_share:
-    2020: 0.04
-    2025: 0.04
-    2030: 0.04
-    2035: 0.04
-    2040: 0.04
-    2045: 0.04
-    2050: 0.04
+    2020: 0.05
+    2025: 0.15
+    2030: 0.3
+    2035: 0.45
+    2040: 0.72
+    2045: 0.87
+    2050: 0.97
   land_transport_ice_share:
-    2020: 0.95
-    2025: 0.95
-    2030: 0.95
-    2035: 0.95
-    2040: 0.95
-    2045: 0.95
-    2050: 0.95
+    2020: 0.94
+    2025: 0.84
+    2030: 0.68
+    2035: 0.52
+    2040: 0.25
+    2045: 0.1
+    2050: 0.0
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#industry
 industry:

scripts/add_existing_baseyear.py

@@ -510,6 +510,10 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
     chp["lifetime"] = (chp.DateOut - chp["grouping_year"] + 1).fillna(
         snakemake.params.costs["fill_values"]["lifetime"]
     )
+    chp.loc[chp.Fueltype == "gas", "lifetime"] = (
+        chp.DateOut - chp["grouping_year"] + 1
+    ).fillna(snakemake.params.existing_capacities["fill_value_gas_chp_lifetime"])
+
     chp = chp.loc[
         chp.grouping_year + chp.lifetime > baseyear
     ]  # in add_brownfield this is build_year + lifetime <= baseyear
@@ -572,6 +576,12 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
             aggfunc=lambda x: np.average(x, weights=mastr_chp.loc[x.index, "p_nom"]),
         )
 
+        mastr_chp_lifetime = mastr_chp.pivot_table(
+            index=["grouping_year", "Fueltype"],
+            columns="bus",
+            values="lifetime",
+            aggfunc=lambda x: np.average(x, weights=mastr_chp.loc[x.index, "p_nom"]),
+        )
         mastr_chp_p_nom = mastr_chp.pivot_table(
             index=["grouping_year", "Fueltype"],
             columns="bus",
@@ -589,12 +599,13 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
         # add everything as Link
         for grouping_year, generator in mastr_chp_p_nom.index:
             # capacity is the capacity in MW at each node for this
-            p_nom = mastr_chp_p_nom.loc[grouping_year, generator].dropna()
+            p_nom = mastr_chp_p_nom.loc[grouping_year, generator]
             threshold = snakemake.params.existing_capacities["threshold_capacity"]
             p_nom = p_nom[p_nom > threshold]
 
             efficiency_power = mastr_chp_efficiency_power.loc[grouping_year, generator]
             efficiency_heat = mastr_chp_efficiency_heat.loc[grouping_year, generator]
+            lifetime = mastr_chp_lifetime.loc[grouping_year, generator]
 
             for bus in p_nom.index:
                 # check if link already exists and set p_nom_min and efficiency
@@ -636,11 +647,11 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
                         overnight_cost=costs.at[key, "investment"]
                         * costs.at[key, "efficiency"],
                         marginal_cost=costs.at[key, "VOM"],
-                        efficiency=efficiency_power.dropna().loc[bus],
-                        efficiency2=efficiency_heat.dropna().loc[bus],
+                        efficiency=efficiency_power.loc[bus],
+                        efficiency2=efficiency_heat.loc[bus],
                         efficiency3=costs.at[generator, "CO2 intensity"],
                         build_year=grouping_year,
-                        lifetime=costs.at[key, "lifetime"],
+                        lifetime=lifetime.loc[bus],
                     )
                 else:
                     key = "central solid biomass CHP"
@@ -661,7 +672,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
                         efficiency=efficiency_power.loc[bus],
                         efficiency2=efficiency_heat.loc[bus],
                         build_year=grouping_year,
-                        lifetime=costs.at[key, "lifetime"],
+                        lifetime=lifetime.loc[bus],
                     )
 
     # CHPs that are not from MaStR
@@ -671,10 +682,17 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
         values="Capacity",
         aggfunc="sum",
     )
+    chp_nodal_lifetime = chp.pivot_table(
+        index=["grouping_year", "Fueltype"],
+        columns="bus",
+        values="lifetime",
+        aggfunc=lambda x: np.average(x, weights=chp.loc[x.index, "Capacity"]),
+    )
     for grouping_year, generator in chp_nodal_p_nom.index:
-        p_nom = chp_nodal_p_nom.loc[grouping_year, generator].dropna()
+        p_nom = chp_nodal_p_nom.loc[grouping_year, generator]
         threshold = snakemake.params.existing_capacities["threshold_capacity"]
         p_nom = p_nom[p_nom > threshold]
+        lifetime = chp_nodal_lifetime.loc[grouping_year, generator]
 
         for bus in p_nom.index:
             # check if link already exists and set p_nom_min and efficiency
@@ -726,7 +744,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
                     efficiency2=costs.at[key, "efficiency"] / costs.at[key, "c_b"],
                     efficiency3=costs.at[generator, "CO2 intensity"],
                     build_year=grouping_year,
-                    lifetime=costs.at[key, "lifetime"],
+                    lifetime=lifetime.loc[bus],
                 )
             else:
                 key = "central solid biomass CHP"
@@ -747,7 +765,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
                     efficiency=costs.at[key, "efficiency"],
                     efficiency2=costs.at[key, "efficiency-heat"],
                     build_year=grouping_year,
-                    lifetime=costs.at[key, "lifetime"],
+                    lifetime=lifetime.loc[bus],
                 )
 
 
@@ -1085,9 +1103,8 @@ def add_heating_capacities_installed_before_baseyear(
 
         snakemake = mock_snakemake(
             "add_existing_baseyear",
-            configfiles=["config/test/config.dach.yaml"],
-            clusters="5",
-            ll="v1.5",
+            clusters="27",
+            ll="vopt",
             opts="",
             sector_opts="none",
             planning_horizons="2020",