From e6f120bed9c44c7f86aa2f6a4296f394c98a342a Mon Sep 17 00:00:00 2001 From: robertpietzcker Date: Wed, 9 Oct 2024 09:44:56 +0200 Subject: [PATCH] adjust naming --- .../variable/tag_electricity_input_types.yaml | 15 +++++++++++---- definitions/variable/tag_storage_types.yaml | 8 +++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/definitions/variable/tag_electricity_input_types.yaml b/definitions/variable/tag_electricity_input_types.yaml index 42d0792c..e7a4b3aa 100644 --- a/definitions/variable/tag_electricity_input_types.yaml +++ b/definitions/variable/tag_electricity_input_types.yaml @@ -280,12 +280,19 @@ description: hydrogen used in combined cycle gas turbine (CCGT) power plants not generating heat - Hydro: - description: hydropower - includes reservoir and run-of-river, but NOT pumped hydro + description: hydropower + - Hydro|Pumped Storage: + description: hydropower systems with pumping turbines + notes: This hydropower system has two water reservoirs at different elevations. + The definition follows the convention established by the ENTSO-E transparency platform + (https://eepublicdownloads.entsoe.eu/clean-documents/sdc-documents/MAF/2020/Hydropower_Modelling_New_database_and_methodology_V1_0.pdf). + - Hydro|Pumped Storage|Closed-Loop: + description: hydropower systems with pumping but NO natural inflows + - Hydro|Pumped Storage|Open-Loop: + description: hydropower systems with pumping and natural inflows - Hydro|Reservoir: - description: hydropower systems with seasonal storage capacity - (possibly including pumping turbines) + description: hydropower systems with >24h storage capacity notes: This definition follows the convention established - by the ENTSO-E transparency platform (https://transparency.entsoe.eu). - Hydro|Run of River: description: run-of-river hydro power plants (i.e. without storage capacity) diff --git a/definitions/variable/tag_storage_types.yaml b/definitions/variable/tag_storage_types.yaml index 63002497..f167e451 100644 --- a/definitions/variable/tag_storage_types.yaml +++ b/definitions/variable/tag_storage_types.yaml @@ -15,7 +15,13 @@ - Compressed Air: description: compressed air storage systems - Pumped Hydro: - description: pumped hydro storage systems - without external inflow (hydro storage with inflow should be reported under "Capacity|Electricity|Hydro") + description: pumped hydro storage systems + - Pumped Hydro|Closed-Loop: + description: pumped hydro storage systems with no natural inflow + notes: The definition follows the convention established by the ENTSO-E transparency platform + (https://eepublicdownloads.entsoe.eu/clean-documents/sdc-documents/MAF/2020/Hydropower_Modelling_New_database_and_methodology_V1_0.pdf). + - Pumped Hydro|Open-Loop: + description: pumped hydro storage systems with natural inflow - Heat: description: all types of heat storage systems - Electric Vehicle: