open-energy-transition · daniel-rdt · Aug 11, 2025 · Jul 11, 2025 · Jul 14, 2025 · Jul 15, 2025
diff --git a/config/config.default.yaml b/config/config.default.yaml
@@ -116,6 +116,7 @@ electricity:
 
   pecd_renewable_profiles:
     enable: false
+    fill_gaps_method: zero
     technologies:
       Wind_Offshore:
       - offwind-ac-fb-r

diff --git a/config/config.tyndp.yaml b/config/config.tyndp.yaml
@@ -40,11 +40,12 @@ co2_budget:
 electricity:
   base_network: tyndp-raw
 
-  renewable_carriers: [solar, solar-hsat, onwind, hydro]
-  tyndp_renewable_carriers: [offwind-ac-fb-r, offwind-ac-fl-r, offwind-dc-fb-r, offwind-dc-fl-r, offwind-dc-fb-oh, offwind-dc-fl-oh, offwind-h2-fb-oh, offwind-h2-fl-oh]
+  renewable_carriers: [onwind, solar, solar-hsat, hydro]
+  tyndp_renewable_carriers: [onwind, solar-pv-utility, solar-pv-rooftop, offwind-ac-fb-r, offwind-ac-fl-r, offwind-dc-fb-r, offwind-dc-fl-r, offwind-dc-fb-oh, offwind-dc-fl-oh, offwind-h2-fb-oh, offwind-h2-fl-oh]
 
   pecd_renewable_profiles:
     enable: true
+    fill_gaps_method: zero
     technologies:
       Wind_Offshore:
       - offwind-ac-fb-r
@@ -55,6 +56,12 @@ electricity:
       - offwind-dc-fl-oh
       - offwind-h2-fb-oh
       - offwind-h2-fl-oh
+      LFSolarPVRooftop:
+      - solar-pv-rooftop
+      LFSolarPVUtility:
+      - solar-pv-utility
+      Wind_Onshore:
+      - onwind
 
   estimate_renewable_capacities:
     # NOTE: technologies that are covered by TYNDP renewable carriers need to be removed from estimation

diff --git a/config/test/config.tyndp.yaml b/config/test/config.tyndp.yaml
@@ -44,11 +44,12 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
-  renewable_carriers: [solar, solar-hsat, onwind]
-  tyndp_renewable_carriers: [offwind-ac-fb-r, offwind-ac-fl-r, offwind-dc-fb-r, offwind-dc-fl-r, offwind-dc-fb-oh, offwind-dc-fl-oh, offwind-h2-fb-oh, offwind-h2-fl-oh]
+  renewable_carriers: [onwind, solar, solar-hsat]
+  tyndp_renewable_carriers: [onwind, solar-pv-utility, solar-pv-rooftop, offwind-ac-fb-r, offwind-ac-fl-r, offwind-dc-fb-r, offwind-dc-fl-r, offwind-dc-fb-oh, offwind-dc-fl-oh, offwind-h2-fb-oh, offwind-h2-fl-oh]
 
   pecd_renewable_profiles:
     enable: true
+    fill_gaps_method: zero
     technologies:
       Wind_Offshore:
       - offwind-ac-fb-r
@@ -59,6 +60,12 @@ electricity:
       - offwind-dc-fl-oh
       - offwind-h2-fb-oh
       - offwind-h2-fl-oh
+      LFSolarPVRooftop:
+      - solar-pv-rooftop
+      LFSolarPVUtility:
+      - solar-pv-utility
+      Wind_Onshore:
+      - onwind
 
   estimate_renewable_capacities:
     # NOTE: technologies that are covered by TYNDP renewable carriers need to be removed from estimation

diff --git a/doc/configtables/electricity.csv b/doc/configtables/electricity.csv
@@ -32,7 +32,8 @@ conventional_carriers,--,"Any subset of {nuclear, oil, OCGT, CCGT, coal, lignite
 renewable_carriers,--,"Any subset of {solar, onwind, offwind-ac, offwind-dc, offwind-float, hydro}",List of renewable generators to include in the model.
 tyndp_renewable_carriers,--,"Any subset of {solar-pv, solar-pv-utility, solar-pv-rooftop, onwind, offwind-ac-fb-r, offwind-ac-fl-r, offwind-dc-fb-r, offwind-dc-fl-r, offwind-dc-fb-oh, offwind-dc-fl-oh, offwind-h2-fb-oh, offwind-h2-fl-oh}",List of TYNDP renewable generators to include in the model. Technologies covered by specified TYNDP renewable carriers need to be removed from `estimate_renewable_carriers` technology list.
 pecd_renewable_profiles,,,
--- enable,,bool,Activate PECD renewable profiles from 2024 TYNDP instead of default renewable profiles for specified renewable technologies below. Technologies ``pecd_techs`` can be any of {CSP, LFSolarPV, Wind_Offshore, Wind_Onshore}.
+-- enable,,bool,Activate PECD renewable profiles from 2024 TYNDP instead of default renewable profiles for specified renewable technologies below. Technologies ``pecd_techs`` can be any of {CSP, LFSolarPVUtility, LFSolarPVRooftop, Wind_Offshore, Wind_Onshore}.
+-- fill_gaps_method,,str,The chosen method for filling gaps in the PECD data to the modelled nodes. Can be either `zero` to fill with zero values or any other aggregation method such as `mean`, `median`, `max` or similar.
 -- technologies,,,
 -- -- {pecd_tech},--,str,The PECD tech whose PECD profile is used. These PECD tech and their profiles are mapped to ``tyndp_renewable_carriers``.
 -- -- -- {tyndp_renewable_carriers},--,str,The `tyndp_renewable_carriers` for which the PECD profiles must be used. All `tyndp_renewable_carriers` must be mapped to a PECD profile. Non-TYNDP renewable carriers use the default renewable profiles.

diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk
@@ -397,6 +397,9 @@ rule clean_pecd_data:
     params:
         snapshots=config_provider("snapshots"),
         drop_leap_day=config_provider("enable", "drop_leap_day"),
+        fill_gaps_method=config_provider(
+            "electricity", "pecd_renewable_profiles", "fill_gaps_method"
+        ),
     input:
         offshore_buses="data/tyndp_2024_bundle/Offshore hubs/NODE.xlsx",
         onshore_buses=resources("busmap_base_s_all.csv"),

diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py
@@ -111,6 +111,9 @@ def add_existing_renewables(
 
     irena = irena.unstack().reset_index()
 
+    if not set(tech_map.keys()).intersection(renewable_carriers):
+        logger.info("No existing capacities to add for specified renewable carriers.")
+
     for carrier, tech in tech_map.items():
         if carrier not in renewable_carriers:
             continue
@@ -154,7 +157,9 @@ def add_existing_renewables(
                     df_agg.at[name, "bus"] = bus
                     df_agg.at[name, "resource_class"] = bin_id
 
-    df_agg["resource_class"] = df_agg["resource_class"].fillna(0)
+    df_agg["resource_class"] = (
+        df_agg["resource_class"].fillna(0) if "resource_class" in df_agg.columns else 0
+    )
 
 
 def add_power_capacities_installed_before_baseyear(

diff --git a/scripts/clean_pecd_data.py b/scripts/clean_pecd_data.py
@@ -5,11 +5,9 @@
 Loads and cleans the available PECD capacity factor generation time series based on PECD weather data.
 The script is executed for a given technology, and planning horizon. Technologies can be one of:
 
-   * CSP_noStorage,
-   * CSP_withStorage,
-   * LFSolarPV,
-   * LFSolarPVRooftop,
+   * CSP
    * LFSolarPVUtility,
+   * LFSolarPVRooftop,
    * Wind_Offshore,
    * Wind_Onshore.
 
@@ -46,6 +44,9 @@ def read_pecd_file(
 ):
     fn = Path(dir_pecd, pyear, f"PECD_{technology}_{pyear}_{node}_edition 2023.2.csv")
 
+    # PECD only differentiates between utility and rooftop PV for some nodes
+    if not os.path.isfile(fn) and "LFSolarPV" in technology:
+        fn = Path(str(fn).replace(technology, "LFSolarPV"))
     if not os.path.isfile(fn):
         return None
 
@@ -97,19 +98,20 @@ def read_pecd_file(
     # Planning year
     pyear = str(snakemake.wildcards.planning_horizons)
 
-    # TODO: find solution for solar profiles being differentiated between Utility and Rooftop for Italy
     # Technology as in PECD terminology
     pecd_tech = snakemake.wildcards.technology
 
     offshore_buses = pd.read_excel(snakemake.input.offshore_buses, index_col=0)
     onshore_buses = pd.read_csv(snakemake.input.onshore_buses, index_col=0)
 
     nodes = (
-        offshore_buses.index if pecd_tech == "Wind_Offshore" else onshore_buses.index
+        offshore_buses.index
+        if pecd_tech == "Wind_Offshore"
+        else onshore_buses.index.str.replace("GB", "UK", regex=True)
     )
     dir_pecd = snakemake.input.dir_pecd
 
-    # Load and prep electricity demand
+    # Load and prep pecd data
     tqdm_kwargs = {
         "ascii": False,
         "unit": " nodes",
@@ -127,16 +129,26 @@ def read_pecd_file(
     )
 
     with mp.Pool(processes=snakemake.threads) as pool:
-        demand = list(tqdm(pool.imap(func, nodes), **tqdm_kwargs))
+        pecd = list(tqdm(pool.imap(func, nodes), **tqdm_kwargs))
 
+    if all(data is None for data in pecd):
+        raise ValueError(
+            f"No PECD data found for {pecd_tech}. Please specify a technology covered within the TYNDP PECD data."
+        )
+    pecd_df = pd.concat(pecd, axis=1)
+    fill_na = (
+        pd.Series(0.0, index=pecd_df.index)
+        if snakemake.params.fill_gaps_method == "zero"
+        else pecd_df.agg(snakemake.params.fill_gaps_method, axis=1)
+    )
     pecd_df = (
-        pd.concat(demand, axis=1)
-        .reindex(
-            nodes, axis=1, fill_value=0.0
-        )  # include missing node data with empty columns
+        pecd_df.reindex(nodes, axis=1)  # include missing node data with empty columns
         .rename(
             columns=lambda x: x.replace("UK", "GB")
         )  # replace UK with GB for naming convention
+        .where(
+            lambda df: df.notna(), fill_na, axis=0
+        )  # fill missing node data with configured aggregation method
     )
 
     pecd_df.to_csv(snakemake.output.pecd_data_clean)