feat: Integrate missing PECD data

config/config.tyndp.yaml

@@ -45,7 +45,7 @@ electricity:
     enable: true
     fill_gaps_method: zero
     # Complete PECD data is only available for the years 2030, 2040
-    # TODO: adjust once udpated 2050 PECD data ist available
+    # TODO: adjust once udpated 2050 PECD data is available
     available_years:
     - 2030
     - 2040

config/test/config.tyndp.yaml

@@ -56,7 +56,7 @@ electricity:
     enable: true
     fill_gaps_method: zero
     # Complete PECD data is only available for the years 2030, 2040
-    # TODO: adjust once udpated 2050 PECD data ist available
+    # TODO: adjust once udpated 2050 PECD data is available
     available_years:
     - 2030
     - 2040

doc/release_notes.rst

@@ -11,7 +11,7 @@ Release Notes
 Upcoming Open-TYNDP Release
 ================
 
-* Add complete compatibility for processing and preparation of TYNDP 2024 PECD v3.1 renewable profiles (Solar PV rooftop, Solar PV utility, Onshore Wind, Offshore Wind, Solar CSP), replacing default ERA5- and SARAH3-based profiles processed with Atlite (https://github.com/open-energy-transition/open-tyndp/pull/71). This implementation serves to facilitate a sub-workflow for creation of the renewable profiles but does not yet attach them to any technologies yet.
+* Add complete compatibility for processing and preparation of PECD v3.1 renewable profiles (Solar PV rooftop, Solar PV utility, Onshore Wind, Offshore Wind, Solar CSP) (https://github.com/open-energy-transition/open-tyndp/pull/71). These profiles are used for the TYNDP 2024 and replace the default ERA5- and SARAH3-based profiles processed with Atlite. This implementation serves to facilitate a sub-workflow for creation of the renewable profiles, but does not yet attach them to any technologies.
 
 
 Upcoming PyPSA-Eur Release

scripts/_helpers.py

@@ -1132,33 +1132,37 @@ def extract_grid_data_tyndp(
 
 
 def safe_pyear(
-    year: int,
+    year: int | str,
     available_years: list = [2030, 2040, 2050],
     source: str = "TYNDP",
     verbose: bool = True,
 ):
     """
-    Checks and adjusts whether a given pyear is in the available years and falls back to the previous available year.
+    Checks and adjusts whether a given pyear is in the available years of a given data source. If not, it falls back to the previous available year.
 
     Parameters
     ----------
     year : int
-        planning horizon year which will be checked and possibly adjusted to previous available year
+        planning horizon year which will be checked and possibly adjusted to previous available year.
     available_years : list, optional
-        list of available years. Defaults to [2030, 2040, 2050]
+        List of available years. Defaults to [2030, 2040, 2050].
     source : str, optional
-        source of the data for which availability will be checked. Defaults to "TYNDP"
+        Source of the data for which availability will be checked. For logging purpose only. Defaults to "TYNDP".
     verbose : bool, optional
-        Whether to activate verbose logging. Defaults to True
+        Whether to activate verbose logging. Defaults to True.
 
     Returns
     -------
-    year_new : str
-        safe pyear as a string
+    year_new : int
+        safe pyear adjusted for available years
     """
 
     if not available_years:
-        raise ValueError("`available_years` cannot be empty.")
+        raise ValueError(
+            "No `available_years` provided. Expected a non-empty list of years."
+        )
+    if not isinstance(year, int):
+        year = int(year)
     if year not in available_years:
         lower = [y for y in available_years if y < year]
         year_new = max(lower) if lower else available_years[0]
@@ -1169,4 +1173,4 @@ def safe_pyear(
     else:
         year_new = year
 
-    return str(year_new)
+    return year_new

scripts/build_renewable_profiles_pecd.py

@@ -57,14 +57,8 @@
         year_i = year
         # falling back to latest available pyear if not in list of available years
         year = safe_pyear(
-            int(year), available_years=snakemake.params.available_years, source="PECD"
+            year, available_years=snakemake.params.available_years, source="PECD"
         )
-        # TODO: remove once PECD data is updated
-        if year == 2050:
-            logger.warning(
-                "PECD input data for 2050 is incomplete. Falling back to 2040 PECD data."
-            )
-            year = 2040
 
         profile = (
             pd.read_csv(

scripts/clean_pecd_data.py

@@ -41,13 +41,13 @@ def read_pecd_file(
     node: str,
     dir_pecd: str,
     cyear: str,
-    pyear: str,
+    pyear: int,
     technology: str,
     sns: pd.DatetimeIndex,
 ):
     fn = Path(
         dir_pecd,
-        pyear,
+        str(pyear),
         f"PECD_{technology}_{pyear}_{node.replace('GB', 'UK')}_edition 2023.2.csv",
     )
 
@@ -59,7 +59,7 @@ def read_pecd_file(
         return None
 
     # Malta CSP data file has an extra header row that must be skipped
-    if node == "MT00" and technology == "CSP_noStorage" and pyear == "2040":
+    if node == "MT00" and technology == "CSP_noStorage" and pyear == 2040:
         skiprows = 11
     else:
         skiprows = 10
@@ -111,7 +111,7 @@ def read_pecd_file(
 
     # Planning year (falls back to latest available pyear if not in list of available years)
     pyear = safe_pyear(
-        int(snakemake.wildcards.planning_horizons),
+        snakemake.wildcards.planning_horizons,
         available_years=snakemake.params.available_years,
         source="PECD",
     )

scripts/clean_tyndp_demand.py

@@ -34,9 +34,8 @@ def load_elec_demand(
 
     # handle intermediate years
     # TODO: Possibly improve this with linear interpolation for 2035 and 2045
-    pyear = int(
-        safe_pyear(int(pyear), available_years=available_years, source="TYNDP demand")
-    )
+    pyear = safe_pyear(pyear, available_years=available_years, source="TYNDP demand")
+
     if scenario == "NT":
         if pyear == 2050:
             logger.warning(