Merge branch 'addSEFE' of https://github.com/robertpietzcker/openentr…

…ance into addSEFE
openENTRANCE · Oct 25, 2024 · 49511a8 · 49511a8
2 parents e6010d3 + f38b8aa
commit 49511a8
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 24 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -26,4 +26,4 @@ jobs:
       run: pip install -e .
 
     - name: Run the nomenclature project validation
-      run: nomenclature validate-project . --dimension region --dimension variable
+      run: nomenclature validate-project . --dimension region --dimension variable --dimension subannual
diff --git a/definitions/variable/emissions/emissions.yaml b/definitions/variable/emissions/emissions.yaml
@@ -678,6 +678,23 @@
     description: Kyoto GHG emissions from other sources, including CO2, CH4, N2O and F-gases 
       (preferably use 100-year GWPs from AR4 for aggregation of different gases)
     unit: Mt CO2e/yr
+- Emissions|Kyoto Gases|non-CO2:
+    description: Non-CO2 GHG emissions from all sources, counted in CO2e (preferably use 100-year 
+      GWPs from AR4 for aggregation of different gases)
+    unit: Mt CO2e/yr
+- Emissions|Kyoto Gases|CH4:
+    description: CH4 GHG emissions from all sources, counted in CO2e (preferably use 100-year 
+      GWPs from AR4 for aggregation of different gases)
+    unit: Mt CO2e/yr
+- Emissions|Kyoto Gases|N2O:
+    description: N2O GHG emissions from all sources, counted in CO2e (preferably use 100-year 
+      GWPs from AR4 for aggregation of different gases)
+    unit: Mt CO2e/yr
+- Emissions|Kyoto Gases|F-Gases:
+    description: Total F-gas emissions, including sulfur hexafluoride (SF6), hydrofluorocarbons
+      (HFCs), perfluorocarbons (PFCs) (preferably use 100-year GWPs from AR4 for aggregation
+      of different F-gases), counted in CO2e
+    unit: Mt CO2e/yr
 
 - Emissions|N2O:
     description: Total nitrous oxide (N2O) emissions

diff --git a/definitions/variable/tag_electricity_input_types.yaml b/definitions/variable/tag_electricity_input_types.yaml
@@ -282,16 +282,17 @@
   - Hydro:
       description: hydropower
   - Hydro|Pumped Storage:
-      description: hydropower systems with short-term storage capacity
-        (including pumping turbines)
+      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://transparency.entsoe.eu).
+        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
@@ -14,6 +14,14 @@
       description: redox flow batteries
   - Compressed Air:
       description: compressed air storage systems
+  - Pumped 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:

diff --git a/definitions/variable/technology/README.md b/definitions/variable/technology/README.md
@@ -21,9 +21,18 @@ See [technologies.yaml](technologies.yaml) for the full codelist.
 Variables for the installed capacity of (energy) production/generation
 or transmission should follow the structure below.
 
-- `Capacity|{Fuel}`
-- `Capacity|{Fuel}|{Specification}`
-- `Capacity|{Fuel}|{Specification}|{Identifier Of A Specific Power Plant}`
+- `Capacity|{Output}`
+- `Capacity|{Output}|{Specification}`
+- `Capacity|{Output}|{Input}`
+
+## Capacity Additions
+
+Variables for capacity additions of (energy) production/generation
+or transmission should follow the structure below.
+
+- `Capacity Additions|{Output}`
+- `Capacity Additions|{Output}|{Specification}`
+- `Capacity Additions|{Output}|{Input}`
 
 ## Capital Cost
 

diff --git a/definitions/variable/technology/electricity-expansion.yaml b/definitions/variable/technology/electricity-expansion.yaml
@@ -6,7 +6,7 @@
       this capacity is added to the existing capacity
     unit: MW
 - Commissioned Storage|Electricity|{Storage Type}:
-    description: New storage capacity for {Electricity Storage Type},
+    description: New storage capacity for {Storage Type},
       this capacity is added to the existing capacity
     unit: MWh
 - Commissioned Capacity|Network|Electricity:
@@ -18,7 +18,7 @@
       this capacity is substracted from the existing capacity
     unit: MW
 - Decommissioned Storage|Electricity|{Storage Type}:
-    description: Removed storage capacity for {Electricity Storage Type},
+    description: Removed storage capacity for {Storage Type},
       this capacity is substracted from the existing capacity
     unit: MWh
 - Decommissioned Capacity|Network|Electricity:

diff --git a/definitions/variable/technology/electricity-operation.yaml b/definitions/variable/technology/electricity-operation.yaml
@@ -57,12 +57,12 @@
 - Spillage|Electricity|Hydro|Reservoir:
     description: Energy spillage that could not be stored by  Hydro Reservoir . Several energy models include spillage variables related to renewable
       energy production; however, another way is to include a spillage variable to
-      the {Storage Type} unit since it is the last sink of the power network
+      the hydro reservoir unit since it is the last sink of the power network
     unit: [MWh, GWh]
 - Spillage|Electricity|Hydro|Pumped Storage:
     description: Energy spillage that could not be stored by  pumped storage . Several energy models include spillage variables related to renewable
       energy production; however, another way is to include a spillage variable to
-      the {Storage Type} unit since it is the last sink of the power network
+      the pumped-storage unit since it is the last sink of the power network
     unit: [MWh, GWh]
 
 - Operation Cost|Electricity|{Electricity Input}:

diff --git a/definitions/variable/technology/power-plant.yaml b/definitions/variable/technology/power-plant.yaml
@@ -164,7 +164,7 @@
     unit: '-'
     skip-region-aggregation: true
 - Discharging Efficiency|Electricity|{Storage Type}:
-    description: Efficiency of discharging for a {Electricity Storage Type}
+    description: Efficiency of discharging for a {Storage Type}
     unit: '-'
     skip-region-aggregation: true
 - Discharging Efficiency|Electricity|Hydro|Pumped Storage:
@@ -176,7 +176,7 @@
     unit: '-'
     skip-region-aggregation: true
 - Inflows|Electricity|{Storage Type}:
-    description: Inflows into a storage of a {Electricity Storage Type}, expressed in energy
+    description: Inflows into a storage of a {Storage Type}, expressed in energy
     unit: GWh
 - Inflows|Electricity|Hydro|Reservoir:
     description: Inflows into a hydro reservoir, expressed in energy
@@ -202,7 +202,7 @@
     unit: '-'
     skip-region-aggregation: true
 - Seasonality|Electricity|{Storage Type}:
-    description: seasonality (daily, weekly, monthly, etc.) of {Electricity Storage Type}
+    description: seasonality (daily, weekly, monthly, etc.) of {Storage Type}
     unit: [daily,weekly,monthly]
 - Roundtrip Efficiency|Electricity|{Storage Type}:
     description: Efficiency when charging energy from the grid to the system

diff --git a/definitions/variable/technology/technologies.yaml b/definitions/variable/technology/technologies.yaml
@@ -120,30 +120,204 @@
     description: Total installed (available) capacity of hydrogen-to-liquids (synfuel) plants
     unit: GW
 
+- Capacity|Heat:
+    description: Total installed centralized heat generation capacity
+    unit: GW
+- Capacity|Heat|{Fuel}:
+    description: Total installed centralized heat generation capacity from {Fuel}
+    unit: GW
+- Capacity|Heat|Heat Pumps:
+    description: Total installed centralized heat generation capacity by heat pumps 
+    unit: GW
+
 - Capacity|Heat|Residential and Commercial:
-    description: Total installed heat generation capacity for the residential and
+    description: Total installed centralized heat generation capacity for the residential and
       commercial sectors
     unit: GW
 - Capacity|Heat|Residential and Commercial|{Fuel}:
-    description: Total installed heat generation capacity for the residential and
+    description: Total installed centralized heat generation capacity for the residential and
       commercial sectors from {Fuel}
     unit: GW
 - Capacity|Heat|{Residential/Commercial}|Heat Pumps:
-    description: Total installed capacity of heat pumps for {Residential/Commercial} buildings
+    description: Total installed centralized heat generation capacity by heat pumps for {Residential/Commercial} buildings
     unit: GW
 - Capacity|Heat|Industrial:
-    description: Total installed heat generation capacity for the industrial sector
+    description: Total installed centralized heat generation capacity for the industrial sector
     unit: GW
 - Capacity|Heat|Industrial|{Fuel}:
-    description: Total installed heat generation capacity for the industrial sector
+    description: Total installed centralized heat generation capacity for the industrial sector
       from {Fuel}
     unit: GW
+- Capacity|Heat|Industrial||Heat Pumps:
+    description: Total installed centralized heat generation capacity by heat pumps for the industrial sector
+    unit: GW
 - Capacity|Transportation|{Transport mode}:
     description: Maximum amount of pkms or tkms that can be transported per year by {Transport mode}
     unit: [billion pkm/yr, billion tkm/yr]
 - Capacity|Transportation|{Bunkers mode}:
-    description: Maximum amount of pkms or tkms that can be transported per year by {Transport mode}
+    description: Maximum amount of pkms or tkms that can be transported per year by {Bunkers mode}
     unit: [billion pkm/yr, billion tkm/yr]
+
+
+- Capacity Additions|Electricity:
+    description: Total added electricity generation capacity
+    unit: GW/yr
+- Capacity Additions|Electricity|{Electricity Input}:
+    description: Total added electricity generation capacity from {Electricity Input}
+    unit: GW/yr
+- Capacity Additions|Electricity|{Storage Type}:
+    description: Total added electricity generation capacity from {Storage Type}
+    unit: GW/yr
+- Capacity Additions|Electricity|Storage|Power:
+    description: Total added capacity of operating electricity storage (e.g. pumped hydro, batteries, compressed air storage)
+          in terms of electricity output capacity
+    unit: GW/yr
+- Capacity Additions|Electricity|Storage|Power|{Storage Type}:
+    description: Total added capacity of operating electricity storage from {Storage Type}
+          in terms of electricity output capacity
+    unit: GW/yr
+- Capacity Additions|Electricity|Storage|Reservoir:
+    description: Added reservoir size of electricity storage technologies (e.g. pumped hydro, batteries, compressed air storage) 
+          in terms of stored electric energy
+    unit: GWh/yr
+- Capacity Additions|Electricity|Storage|Reservoir|{Storage Type}:
+    description: Added reservoir size of electricity storage technologies from {Storage Type}
+          in terms of stored electric energy
+    unit: GWh/yr
+- Capacity Additions|Gases:
+    description: Total capacity additions of gas plants
+    unit: GW/yr
+- Capacity Additions|Gases|Biomass:
+    description: Total capacity additions of biomass to gas plants
+    unit: GW/yr
+- Capacity Additions|Gases|Biomass|w/ CCS:
+    description: Total capacity additions of biomass to gas plants with CCS
+    unit: GW/yr
+- Capacity Additions|Gases|Biomass|w/o CCS:
+    description: Total capacity additions of biomass to gas plants without CCS
+    unit: GW/yr
+- Capacity Additions|Gases|Coal:
+    description: Total capacity additions of coal to gas plants
+    unit: GW/yr
+- Capacity Additions|Gases|Coal|w/ CCS:
+    description: Total capacity additions of coal to gas plants with CCS
+    unit: GW/yr
+- Capacity Additions|Gases|Coal|w/o CCS:
+    description: Total capacity additions of coal to gas plants without CCS
+    unit: GW/yr
+- Capacity Additions|Gases|Hydrogen:
+    description: Total capacity additions of hydrogen-to-methane (syngas) plants
+    unit: GW/yr
+- Capacity Additions|Hydrogen:
+    description: Total capacity additions of hydrogen plants (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Biomass:
+    description: Total capacity additions of biomass to hydrogen plants (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Biomass|w/ CCS:
+    description: Total capacity additions of biomass to hydrogen plants with CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Biomass|w/o CCS:
+    description: Total capacity additions of biomass to hydrogen plants without CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Coal:
+    description: Total capacity additions of coal to hydrogen plants (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Coal|w/ CCS:
+    description: Total capacity additions of coal to hydrogen plants with CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Coal|w/o CCS:
+    description: Total capacity additions of coal to hydrogen plants without CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Electricity:
+    description: Total capacity additions of hydrogen-by-electrolysis plants (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Input|Electricity:
+    description: Total capacity additions of hydrogen-by-electrolysis plants (in electricity input)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Gas:
+    description: Total capacity additions of gas to hydrogen plants (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Gas|w/ CCS:
+    description: Total capacity additions of gas to hydrogen plants with CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Hydrogen|Gas|w/o CCS:
+    description: Total capacity additions of gas to hydrogen plants without CCS (in hydrogen output)
+    unit: GW/yr
+- Capacity Additions|Liquids:
+    description: Total capacity additions of biomass to liquids plants
+    unit: GW/yr
+- Capacity Additions|Liquids|Biomass:
+    description: Total capacity additions of biomass to liquids plants
+    unit: GW/yr
+- Capacity Additions|Liquids|Biomass|w/ CCS:
+    description: Total capacity additions of biomass to liquids plants with CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Biomass|w/o CCS:
+    description: Total capacity additions of biomass to liquids plants without CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Coal:
+    description: Total capacity additions of coal to liquids plants
+    unit: GW/yr
+- Capacity Additions|Liquids|Coal|w/ CCS:
+    description: Total capacity additions of coal to liquids plants with CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Coal|w/o CCS:
+    description: Total capacity additions of coal to liquids plants without CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Gas:
+    description: Total capacity additions of gas to liquids plants
+    unit: GW/yr
+- Capacity Additions|Liquids|Gas|w/ CCS:
+    description: Total capacity additions of gas to liquids plants with CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Gas|w/o CCS:
+    description: Total capacity additions of gas to liquids plants without CCS
+    unit: GW/yr
+- Capacity Additions|Liquids|Oil:
+    description: Total capacity additions of oil refining plants
+    unit: GW/yr
+- Capacity Additions|Liquids|Hydrogen:
+    description: Total capacity additions of hydrogen-to-liquids (synfuel) plants
+    unit: GW/yr
+
+- Capacity Additions|Heat:
+    description: Additions to total installed centralized heat generation capacity 
+    unit: GW/yr
+- Capacity Additions|Heat|{Fuel}:
+    description: Additions to total installed centralized heat generation capacity from {Fuel}
+    unit: GW/yr
+- Capacity Additions|Heat|Heat Pumps:
+    description: Additions to total installed centralized heat generation capacity by heat pumps
+    unit: GW/yr
+- Capacity Additions|Heat|Residential and Commercial:
+    description: Additions to total installed centralized heat generation capacity for the residential and
+      commercial sectors
+    unit: GW/yr
+- Capacity Additions|Heat|Residential and Commercial|{Fuel}:
+    description: Additions to total installed centralized heat generation capacity for the residential and
+      commercial sectors from {Fuel}
+    unit: GW/yr
+- Capacity Additions|Heat|{Residential/Commercial}|Heat Pumps:
+    description: Additions to total installed capacity of centralized heat generation capacity  from heat pumps for {Residential/Commercial} buildings
+    unit: GW/yr
+- Capacity Additions|Heat|Industrial:
+    description: Additions to total installed centralized heat generation capacity for the industrial sector
+    unit: GW/yr
+- Capacity Additions|Heat|Industrial|{Fuel}:
+    description: Additions to total installed centralized heat generation capacity for the industrial sector
+      from {Fuel}
+    unit: GW/yr
+- Capacity Additions|Heat|Industrial|Heat Pumps:
+    description: Additions to total installed capacity of centralized heat generation capacity from heat pumps for the industrial sector
+    unit: GW/yr
+- Capacity Additions|Transportation|{Transport mode}:
+    description: Additions to maximum amount of pkms or tkms that can be transported per year by {Transport mode}
+    unit: [billion pkm/yr/yr, billion tkm/yr/yr]
+- Capacity Additions|Transportation|{Bunkers mode}:
+    description: Additions to maximum amount of pkms or tkms that can be transported per year by {Bunkers mode}
+    unit: [billion pkm/yr/yr, billion tkm/yr/yr]
+
 - Efficiency|Hydrogen|Electricity:
     description: Efficiency of producing hydrogen from electricity
     unit: "%"