open-energy-transition · daniel-rdt · Oct 8, 2025 · Aug 22, 2025 · Aug 22, 2025 · Sep 2, 2025
diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ test:
 	snakemake -call make_summary_perfect --configfile config/test/config.perfect.yaml
 	snakemake -call resources/test-elec-clusters/networks/base_s_adm.nc --configfile config/test/config.clusters.yaml
 	snakemake -call --configfile config/test/config.scenarios.yaml -n
-	snakemake -call --configfile config/test/config.tyndp.yaml
+	snakemake -call --configfile config/test/config.tyndp.yaml --latency-wait 10
 	echo "All tests completed successfully."
 
 unit-test:

diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ The back-casting of the 2024 TYNDP cycle involves developing new features based
 - Added the TYNDP electricity demand as an exogenously set demand (see PR [#14](https://github.com/open-energy-transition/open-tyndp/pull/14)).
 - Added processing and preparation of TYNDP 2024 PECD v3.1 renewable profiles for offshore wind farms, replacing default ERA5-based profiles processed with Atlite (see PR [#53](https://github.com/open-energy-transition/open-tyndp/pull/53)).
 - Introduced TYNDP offshore wind hubs topology with both electric and hydrogen infrastructure, offshore electrolysers, and detailed wind farm characteristics (see PR [#54](https://github.com/open-energy-transition/open-tyndp/pull/54)).
+- Added processing and preparation of PEMMDB v.2.4 capacity, must-run and availability data as well as expansion trajectories for conventional and renewable power generation, electrolysers, batteries and DSR (see PR [#97](https://github.com/open-energy-transition/open-tyndp/pull/97)).
 
 |       Feature        | TYNDP 2024 topology | Open-TYNDP topology |
 |:--------------------:|:-------------------:|:-------------------:|
@@ -67,8 +68,8 @@ While multiple TYNDP features are already introduced to the Open-TYNDP model, th
 |                                                        |                    Offshore grid                    |                                   [#54](https://github.com/open-energy-transition/open-tyndp/pull/54)                                    |   ✅    |
 |                                                        |                      PECD data                      | [#53](https://github.com/open-energy-transition/open-tyndp/pull/53), [#71](https://github.com/open-energy-transition/open-tyndp/pull/71) |   ✅    |
 |                                                        |                    Hydro inflows                    |                                   [#77](https://github.com/open-energy-transition/open-tyndp/pull/77)                                    |   ✅    |
-|                                                        |            PEMMDB capacities & must-runs            |                                   [#97](https://github.com/open-energy-transition/open-tyndp/pull/97)                                    |   🔨   |
-|                                                        |         Investment candidates trajectories          |                                   [#97](https://github.com/open-energy-transition/open-tyndp/pull/97)                                    |   🔨   |
+|                                                        |            PEMMDB capacities & must-runs            |                                   [#97](https://github.com/open-energy-transition/open-tyndp/pull/97)                                    |   ✅    |
+|                                                        |         Investment candidates trajectories          |                                   [#97](https://github.com/open-energy-transition/open-tyndp/pull/97)                                    |   ✅    |
 |                    **TYNDP demand**                    |                     Electricity                     |                                   [#14](https://github.com/open-energy-transition/open-tyndp/pull/14)                                    |   ✅    |
 |                                                        |                      Hydrogen                       |                                                                                                                                          |   ⌛    |
 |                                                        |                       Methane                       |                                                                                                                                          |   ⌛    |

diff --git a/config/config.default.yaml b/config/config.default.yaml
@@ -140,8 +140,10 @@ electricity:
   everywhere_powerplants: []
 
   conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
+  tyndp_conventional_carriers: []
   renewable_carriers: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, offwind-float, hydro]
   tyndp_renewable_carriers: []
+  tyndp_stores: []
 
   pecd_renewable_profiles:
     enable: false
@@ -151,15 +153,7 @@ electricity:
     - 2040
     - 2050
     technologies:
-      Wind_Offshore:
-      - 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
+    - Wind_Offshore
 
   pemmdb_hydro_profiles:
     enable: false
@@ -174,6 +168,18 @@ electricity:
     - PS Open
     - PS Closed
 
+  pemmdb_capacities:
+    enable: false
+    nprocesses: 4
+    available_years:
+    - 2030
+    - 2040
+    - 2050
+    technologies:
+    Solar:
+    - solar-pv-utility
+    - solar-pv-rooftop
+
   estimate_renewable_capacities:
     enable: true
     from_gem: true

diff --git a/config/config.tyndp.yaml b/config/config.tyndp.yaml
@@ -38,8 +38,37 @@ electricity:
   base_network: tyndp
 
   # TODO: remove redundant onwind and solar from renewable_carriers list once technologies are included as tyndp_renewable_carriers from PEMMDB data
+  tyndp_conventional_carriers:
+  - gas
+  - coal
+  - lignite
+  - nuclear
+  - oil-light
+  - oil-heavy
+  - oil-shale
   renewable_carriers: [hydro, solar, solar-hsat, onwind]
-  tyndp_renewable_carriers: [hydro, 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]
+  tyndp_renewable_carriers:
+  - other-res
+  - hydro-ror
+  - hydro-reservoir
+  - hydro-pondage
+  - hydro-phs
+  - hydro-phs-pure
+  - 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
+  tyndp_stores:
+  - battery
+  - h2_cavern
+  - h2_tank
 
   pecd_renewable_profiles:
     enable: true
@@ -50,21 +79,10 @@ electricity:
     - 2030
     - 2040
     technologies:
-      Wind_Offshore:
-      - 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
-      LFSolarPVRooftop:
-      - solar-pv-rooftop
-      LFSolarPVUtility:
-      - solar-pv-utility
-      Wind_Onshore:
-      - onwind
+    - Wind_Offshore
+    - LFSolarPVRooftop
+    - LFSolarPVUtility
+    - Wind_Onshore
 
   pemmdb_hydro_profiles:
     enable: true
@@ -73,11 +91,34 @@ electricity:
     - 2040
     - 2050
     technologies:
-    - Run of River
+    - Run_of_River
     - Pondage
     - Reservoir
-    - PS Open
-    - PS Closed
+    - PS_Open
+    - PS_Closed
+
+  pemmdb_capacities:
+    enable: true
+    nprocesses: 4
+    available_years:
+    - 2030
+    - 2040
+    - 2050
+    technologies:
+    - Solar
+    - Wind
+    - Hydro
+    - Other_RES
+    - Gas
+    - Nuclear
+    - Hard_coal
+    - Lignite
+    - Light_oil
+    - Heavy_oil
+    - Oil_shale
+    - Other_Non-RES
+    - Electrolyser
+    - Battery
 
   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
@@ -50,8 +50,37 @@ electricity:
     Link: [H2 pipeline]
 
   # TODO: remove redundant onwind and solar from renewable_carriers list once technologies are included as tyndp_renewable_carriers from PEMMDB data
+  tyndp_conventional_carriers:
+  - gas
+  - coal
+  - lignite
+  - nuclear
+  - oil-light
+  - oil-heavy
+  - oil-shale
   renewable_carriers: [solar, solar-hsat, onwind]
-  tyndp_renewable_carriers: [hydro, 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]
+  tyndp_renewable_carriers:
+  - other-res
+  - hydro-ror
+  - hydro-reservoir
+  - hydro-pondage
+  - hydro-phs
+  - hydro-phs-pure
+  - 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
+  tyndp_stores:
+  - battery
+  - h2_cavern
+  - h2_tank
 
   pecd_renewable_profiles:
     enable: true
@@ -62,21 +91,10 @@ electricity:
     - 2030
     - 2040
     technologies:
-      Wind_Offshore:
-      - 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
-      LFSolarPVRooftop:
-      - solar-pv-rooftop
-      LFSolarPVUtility:
-      - solar-pv-utility
-      Wind_Onshore:
-      - onwind
+    - Wind_Offshore
+    - LFSolarPVRooftop
+    - LFSolarPVUtility
+    - Wind_Onshore
 
   pemmdb_hydro_profiles:
     enable: true
@@ -85,11 +103,34 @@ electricity:
     - 2040
     - 2050
     technologies:
-    - Run of River
+    - Run_of_River
     - Pondage
     - Reservoir
-    - PS Open
-    - PS Closed
+    - PS_Open
+    - PS_Closed
+
+  pemmdb_capacities:
+    enable: true
+    nprocesses: 4
+    available_years:
+    - 2030
+    - 2040
+    - 2050
+    technologies:
+    - Solar
+    - Wind
+    - Hydro
+    - Other_RES
+    - Gas
+    - Nuclear
+    - Hard_coal
+    - Lignite
+    - Light_oil
+    - Heavy_oil
+    - Oil_shale
+    - Other_Non-RES
+    - Electrolyser
+    - Battery
 
   estimate_renewable_capacities:
     # NOTE: technologies that are covered by TYNDP renewable carriers need to be removed from estimation

diff --git a/data/tyndp_technology_map.csv b/data/tyndp_technology_map.csv
@@ -0,0 +1,58 @@
+pemmdb_carrier,pemmdb_type,pecd_carrier,investment_dataset_carrier,open_tyndp_carrier,open_tyndp_index,comment
+Solar,Photovoltaic,LFSolarPVUtility,Solar PV Utility,solar-pv-utility,solar-pv-utility,For non Italian nodes Utility and Rooftop share the same PECD profile called LFSolarPV
+Solar,Rooftop,LFSolarPVRooftop,Solar PV Rooftop,solar-pv-rooftop,solar-pv-rooftop,For non Italian nodes Utility and Rooftop share the same PECD profile called LFSolarPV
+Solar,Thermal Solar,CSP_noStorage,,solar-thermal,solar-thermal,
+Solar,Solar Thermal with Storage,CSP_withStorage,,solar-thermal-w-storage,solar-thermal-w-storage,
+Solar,Solar Thermal with Storage - Storage,CSP_withStorage,,solar-thermal-w-storage,solar-thermal-w-storage-storage,
+Wind,Onshore wind,Wind_Onshore,Wind Onshore,onwind,onwind,
+Wind,Offshore wind,Wind_Offshore,,offwind,offwind,only used w/o offshore hubs
+,,Wind_Offshore,,offwind-ac-fb-r,offwind-ac-fb-r,only used with offshore hubs
+,,Wind_Offshore,,offwind-ac-fl-r,offwind-ac-fl-r,only used with offshore hubs
+,,Wind_Offshore,,offwind-dc-fb-r,offwind-dc-fb-r,only used with offshore hubs
+,,Wind_Offshore,,offwind-dc-fl-r,offwind-dc-fl-r,only used with offshore hubs
+,,Wind_Offshore,,offwind-dc-fb-oh,offwind-dc-fb-oh,only used with offshore hubs
+,,Wind_Offshore,,offwind-dc-fl-oh,offwind-dc-fl-oh,only used with offshore hubs
+,,Wind_Offshore,,offwind-h2-fb-oh,offwind-h2-fb-oh,only used with offshore hubs
+,,Wind_Offshore,,offwind-h2-fl-oh,offwind-h2-fl-oh,only used with offshore hubs
+Hydro,Run of River - Turbine,,,hydro-ror,hydro-ror-turbine,
+Hydro,Pondage - Reservoir,,,hydro-pondage,hydro-pondage-reservoir,
+Hydro,Pondage - Turbine,,,hydro-pondage,hydro-pondage-turbine,
+Hydro,Reservoir - Reservoir,,,hydro-reservoir,hydro-reservoir-reservoir,
+Hydro,Reservoir - Turbine,,,hydro-reservoir,hydro-reservoir-turbine,
+Hydro,Pump Storage - Reservoir,,,hydro-phs,hydro-phs-reservoir,
+Hydro,Pump Storage - Turbine,,,hydro-phs,hydro-phs-turbine,
+Hydro,Pump Storage - Pump,,,hydro-phs,hydro-phs-pump,
+Hydro,Pure Pump Storage - Reservoir,,,hydro-phs-pure,hydro-phs-pure-reservoir,
+Hydro,Pure Pump Storage - Turbine,,,hydro-phs-pure,hydro-phs-pure-turbine,
+Hydro,Pure Pump Storage - Pump,,,hydro-phs-pure,hydro-phs-pure-pump,
+Other RES,"Small Biomass, Geothermal, Marine, Waste and Not Defined",,,other-res,other-res,
+Gas,Conventional old 1,,,gas,gas-conv-old1,
+Gas,Conventional old 2,,,gas,gas-conv-old2,
+Gas,CCGT old 1,,,gas,gas-ccgt-old1,
+Gas,CCGT old 2,,,gas,gas-ccgt-old2,
+Gas,CCGT new,,,gas,gas-ccgt-new,
+Gas,CCGT CCS,,,gas,gas-ccgt-ccs,
+Gas,OCGT old,,,gas,gas-ocgt-old,
+Gas,OCGT new,,,gas,gas-ocgt-new,
+Gas,CCGT present 1,,,gas,gas-ccgt-present1,
+Gas,CCGT present 2,,,gas,gas-ccgt-present2,
+Nuclear,Nuclear,,Nuclear,nuclear,nuclear,
+Hard coal,old 1,,,coal,coal-old1,
+Hard coal,old 2,,,coal,coal-old2,
+Hard coal,new,,,coal,coal-new,
+Hard coal,CCS,,,coal,coal-ccs,
+Lignite,old 1,,,lignite,lignite-old1,
+Lignite,old 2,,,lignite,lignite-old2,
+Lignite,new,,,lignite,lignite-new,
+Lignite,CCS,,,lignite,lignite-ccs,
+Light oil,Light oil,,,oil-light,oil-light,
+Heavy oil,old 1,,,oil-heavy,oil-heavy-old1,
+Heavy oil,old 2,,,oil-heavy,oil-heavy-old2,
+Oil shale,old,,,oil-shale,oil-shale-old,
+Oil shale,new,,,oil-shale,oil-shale-new,
+Electrolyser,Onshore grid connected,,Electrolyzers,electrolyser,eletrolyser-onshore-grid,
+Battery,Discharge,,,battery,battery-discharge,
+Battery,Charge,,,battery,battery-charge,
+Battery,Store,,,battery,battery-store,
+,,,Batteries Prosumer,battery,battery-store-prosumer,
+,,,Batteries Utility,battery,battery-store-utility,
diff --git a/doc/configtables/electricity.csv b/doc/configtables/electricity.csv
@@ -32,16 +32,19 @@ 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 {LFSolarPVUtility, LFSolarPVRooftop, Wind_Offshore, Wind_Onshore, CSP_noStorage, CSP_withStorage_7h_dispatched, CSP_withStorage_7h_preDispatch}.
--- 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.
+-- enable,,bool,Activate PECD renewable profiles from 2024 TYNDP instead of default renewable profiles for specified renewable technologies below.
+-- 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."
 -- available_years,--,list,"List of years for which PECD data is available."
--- 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.
+-- technologies,--,"Any subset of {Wind_Offshore, LFSolarPVRooftop, LFSolarPVUtility, CSP_noStorage, CSP_withStorage, Wind_Onshore}",The PECD technologies whose PECD profile is used. These PECD technologies and their profiles are mapped to ``tyndp_renewable_carriers``. Please make sure that the mapping is included in the `tyndp_technology_map.csv` file.
 pemmdb_hydro_profiles,,,
 -- enable,,bool,Activate PEMMDB hydro inflow profiles from 2024 TYNDP instead of default hydro profiles.
 -- available_years,--,list,"List of years for which PEMMDB hydro inflows data is available."
--- technologies,--,list,The hydro technologies for which PEMMDB hydro inflows data is used. Technologies can be any of {Run of River, Pondage, Reservoir, PS Open, PS Closed}.
+-- technologies,--,"Any subset of {Run of River, Pondage, Reservoir, PS Open, PS Closed}",The hydro technologies for which PEMMDB hydro inflows data is used.
+pemmdb_capacities,,,
+-- enable,,bool,Activate PEMMDB capacities, must-runs and availabilities from 2024 TYNDP.
+-- nprocesses,,int,"Number of parallel processes when reading pemmdb data."
+-- available_years,--,list,"List of years for which PEMMDB data is available."
+-- technologies,--,"Any subset of {Solar, Wind, Hydro, Other RES, Gas, Nuclear, Hard coal, Lignite, Light oil, Heavy oil, Oil shale, Other Non-RES, Electrolyser, Battery}.",The PEMMDB technologies which are available and which data shall be used.
 estimate_renewable_capacities,,, 
 -- enable,,bool,Activate routine to estimate renewable capacities in rule :mod:`add_electricity`. This option should not be used in combination with pathway planning ``foresight: myopic`` or ``foresight: perfect`` as renewable capacities are added differently in :mod:`add_existing_baseyear`.
 -- from_gem,--,bool,Add renewable capacities from `Global Energy Monitor's Global Solar Power Tracker <https://globalenergymonitor.org/projects/global-solar-power-tracker/>`_ and `Global Energy Monitor's Global Wind Power Tracker <https://globalenergymonitor.org/projects/global-wind-power-tracker/>`_.

diff --git a/doc/index.rst b/doc/index.rst
@@ -90,6 +90,7 @@ The back-casting of the 2024 TYNDP cycle involves developing new features based
 - Added the TYNDP electricity demand as an exogenously set demand (see PR `#14 <https://github.com/open-energy-transition/open-tyndp/pull/14>`__).
 - Added processing and preparation of TYNDP 2024 PECD v3.1 renewable profiles for offshore wind farms, replacing default ERA5-based profiles processed with Atlite (see PR `#53 <https://github.com/open-energy-transition/open-tyndp/pull/53>`__).
 - Introduced TYNDP offshore wind hubs topology with both electric and hydrogen infrastructure, offshore electrolysers, and detailed wind farm characteristics (see PR `#54 <https://github.com/open-energy-transition/open-tyndp/pull/54>`__).
+- Added processing and preparation of PEMMDB v.2.4 capacity, must-run and availability data as well as expansion trajectories for conventional and renewable power generation, electrolysers, batteries and DSR (see PR `#97 <https://github.com/open-energy-transition/open-tyndp/pull/97>`__).
 
 .. list-table::
    :align: center
@@ -185,11 +186,11 @@ While multiple TYNDP features are already introduced to the Open-TYNDP model, th
    * -
      - PEMMDB capacities & must-runs
      - `#97 <https://github.com/open-energy-transition/open-tyndp/pull/97>`__
-     - 🔨
+     - ✅
    * -
      - Investment candidates trajectories
      - `#97 <https://github.com/open-energy-transition/open-tyndp/pull/97>`__
-     - 🔨
+     - ✅
    * - **TYNDP demand**
      - Electricity
      - `#14 <https://github.com/open-energy-transition/open-tyndp/pull/14>`__

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -22,6 +22,8 @@ Upcoming Open-TYNDP Release
 
 * Allow the retrieval of PyPSA-Eur cutouts for additional climate years that are not available on Zenodo via retrieval from GCP (https://github.com/open-energy-transition/open-tyndp/pull/109). Currently, this feature is available for the additional climate year 2009.
 
+* Introduce processing of PEMMDB v.2.4 capacity, must-run and availability data as well as expansion trajectories for conventional and renewable power generation, electrolysers, batteries and DSR (https://github.com/open-energy-transition/open-tyndp/pull/97).
+
 
 Upcoming PyPSA-Eur Release
 ================