Merge branch 'openENTRANCE:main' into add-variables-chargingStations

openENTRANCE · Nov 13, 2023 · 71ce97c · 71ce97c
2 parents 3be0e42 + cbce03a
commit 71ce97c
Show file tree

Hide file tree

Showing 3 changed files with 145 additions and 4 deletions.
diff --git a/definitions/scenario/scenarios.yaml b/definitions/scenario/scenarios.yaml
@@ -74,6 +74,30 @@
 - WP2 Building|High District Heating|Efficiency Moderate
 - WP2 Building|High District Heating|Efficiency High
 
+- WP2 Transport|High Electrification|Efficiency Moderate|Prices 2023_10
+- WP2 Transport|High Electrification|Efficiency High|Prices 2023_10
+- WP2 Transport|High Electrification|Lifestyle and Behavioral Change|Prices 2023_10
+- WP2 Transport|High H2/e-fuels|Efficiency Moderate|Prices 2023_10
+- WP2 Transport|High H2/e-fuels|Efficiency High|Prices 2023_10
+- WP2 Transport|High H2/e-fuels|Lifestyle and Behavioral Change|Prices 2023_10
+
+# ECEMF - Work package 2 main industry scenarios with updated prices
+- WP2 Industry|High Electrification|Efficiency Moderate|Prices 2023_10
+- WP2 Industry|High Electrification|Efficiency High|Prices 2023_10
+- WP2 Industry|High Electrification|Lifestyle and Behavioral Change|Prices 2023_10
+- WP2 Industry|High H2/e-fuels|Efficiency Moderate|Prices 2023_10
+- WP2 Industry|High H2/e-fuels|Efficiency High|Prices 2023_10
+- WP2 Industry|High H2/e-fuels|Lifestyle and Behavioral Change|Prices 2023_10
+
+# ECEMF - Work package 2 main buildings scenarios with updated prices
+- WP2 Building|High Electrification|Efficiency Moderate|Prices 2023_10
+- WP2 Building|High Electrification|Efficiency High|Prices 2023_10
+- WP2 Building|High Electrification|Lifestyle and Behavioral Change|Prices 2023_10
+- WP2 Building|High H2/e-fuels|Efficiency Moderate|Prices 2023_10
+- WP2 Building|High H2/e-fuels|Efficiency High|Prices 2023_10
+- WP2 Building|High District Heating|Efficiency Moderate|Prices 2023_10
+- WP2 Building|High District Heating|Efficiency High|Prices 2023_10
+
 # EMF-ECEMF collaboration scenarios
 - EMFECEMF_NZero
 - EMFECEMF_NPI

diff --git a/definitions/variable/tag_electricity_input_types.yaml b/definitions/variable/tag_electricity_input_types.yaml
@@ -38,12 +38,12 @@
         with freely vented CO2 emissions
 
   - Fossil:
-      description: all fossil fuels (crude oil, coal, natural gas)
+      description: all fossil fuels (crude oil, coal, natural gas, fossil waste and fossil industrial gases)
   - Fossil|w/ CCS:
-      description: all fossil fuels (crude oil, coal, natural gas)
+      description: all fossil fuels (crude oil, coal, natural gas, fossil waste and fossil industrial gases)
         with a CO2 capture component
   - Fossil|w/o CCS:
-      description: all fossil fuels (crude oil, coal, natural gas)
+      description: all fossil fuels (crude oil, coal, natural gas, fossil waste and fossil industrial gases)
         with freely vented CO2 emissions
 
   - Coal:
@@ -328,4 +328,8 @@
       description: ocean energy
 
   - Other:
-      description: other energy sources and fuels not explicitely listed
+      description: other energy sources and fuels not explicitly listed
+  - Other|Fossil:
+      description: other fossil energy sources and fuels not explicitly listed (e.g. fossil waste and fossil industrial gases)
+  - Other|Non-Fossil:
+      description: other non-fossil energy sources and fuels not explicitly listed (e.g. biomass waste)
diff --git a/definitions/variable/technology/technologies.yaml b/definitions/variable/technology/technologies.yaml
@@ -7,6 +7,113 @@
 - Capacity|Electricity|{Storage Type}:
     description: Total installed electricity generation capacity from {Storage Type}
     unit: GW
+- Capacity|Electricity|Storage|Power:
+    description: Total installed capacity of operating electricity storage (e.g. pumped hydro, batteries, compressed air storage)
+          in terms of electricity output capacity
+    unit: GW
+- Capacity|Electricity|Storage|Power|{Storage Type}:
+    description: Total installed capacity of operating electricity storage from {Storage Type}
+          in terms of electricity output capacity
+    unit: GW
+- Capacity|Electricity|Storage|Reservoir:
+    description: Reservoir size of electricity storage technologies (e.g. pumped hydro, batteries, compressed air storage) 
+          in terms of stored electric energy
+    unit: GWh
+- Capacity|Electricity|Storage|Reservoir|{Storage Type}:
+    description: Reservoir size of electricity storage technologies from {Storage Type}
+          in terms of stored electric energy
+    unit: GWh
+- Capacity|Gases:
+    description: Total installed (available) capacity of gas plants
+    unit: GW
+- Capacity|Gases|Biomass:
+    description: Total installed (available) capacity of biomass to gas plants
+    unit: GW
+- Capacity|Gases|Biomass|w/ CCS:
+    description: Total installed (available) capacity of biomass to gas plants with CCS
+    unit: GW
+- Capacity|Gases|Biomass|w/o CCS:
+    description: Total installed (available) capacity of biomass to gas plants without CCS
+    unit: GW
+- Capacity|Gases|Coal:
+    description: Total installed (available) capacity of coal to gas plants
+    unit: GW
+- Capacity|Gases|Coal|w/ CCS:
+    description: Total installed (available) capacity of coal to gas plants with CCS
+    unit: GW
+- Capacity|Gases|Coal|w/o CCS:
+    description: Total installed (available) capacity of coal to gas plants without CCS
+    unit: GW
+- Capacity|Hydrogen:
+    description: Total installed (available) capacity of hydrogen plants (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Biomass:
+    description: Total installed (available) capacity of biomass to hydrogen plants (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Biomass|w/ CCS:
+    description: Total installed (available) capacity of biomass to hydrogen plants with CCS (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Biomass|w/o CCS:
+    description: Total installed (available) capacity of biomass to hydrogen plants without CCS (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Coal:
+    description: Total installed (available) capacity of coal to hydrogen plants (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Coal|w/ CCS:
+    description: Total installed (available) capacity of coal to hydrogen plants with CCS (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Coal|w/o CCS:
+    description: Total installed (available) capacity of coal to hydrogen plants without CCS (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Electricity:
+    description: Total installed (available) capacity of hydrogen-by-electrolysis plants (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Input|Electricity:
+    description: Total installed (available) capacity of hydrogen-by-electrolysis plants (in electricity input)
+    unit: GW
+- Capacity|Hydrogen|Gas:
+    description: Total installed (available) capacity of gas to hydrogen plants (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Gas|w/ CCS:
+    description: Total installed (available) capacity of gas to hydrogen plants with CCS (in hydrogen output)
+    unit: GW
+- Capacity|Hydrogen|Gas|w/o CCS:
+    description: Total installed (available) capacity of gas to hydrogen plants without CCS (in hydrogen output)
+    unit: GW
+- Capacity|Liquids:
+    description: Total installed (available) capacity of biomass to liquids plants
+    unit: GW
+- Capacity|Liquids|Biomass:
+    description: Total installed (available) capacity of biomass to liquids plants
+    unit: GW
+- Capacity|Liquids|Biomass|w/ CCS:
+    description: Total installed (available) capacity of biomass to liquids plants with CCS
+    unit: GW
+- Capacity|Liquids|Biomass|w/o CCS:
+    description: Total installed (available) capacity of biomass to liquids plants without CCS
+    unit: GW
+- Capacity|Liquids|Coal:
+    description: Total installed (available) capacity of coal to liquids plants
+    unit: GW
+- Capacity|Liquids|Coal|w/ CCS:
+    description: Total installed (available) capacity of coal to liquids plants with CCS
+    unit: GW
+- Capacity|Liquids|Coal|w/o CCS:
+    description: Total installed (available) capacity of coal to liquids plants without CCS
+    unit: GW
+- Capacity|Liquids|Gas:
+    description: Total installed (available) capacity of gas to liquids plants
+    unit: GW
+- Capacity|Liquids|Gas|w/ CCS:
+    description: Total installed (available) capacity of gas to liquids plants with CCS
+    unit: GW
+- Capacity|Liquids|Gas|w/o CCS:
+    description: Total installed (available) capacity of gas to liquids plants without CCS
+    unit: GW
+- Capacity|Liquids|Oil:
+    description: Total installed (available) capacity of oil refining plants
+    unit: GW
+
 - Capacity|Heat|Residential and Commercial:
     description: Total installed heat generation capacity for the residential and
       commercial sectors
@@ -25,6 +132,12 @@
     description: Total installed heat generation capacity for the industrial sector
       from {Fuel}
     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}
+    unit: [billion pkm/yr, billion tkm/yr]
 - Efficiency|Hydrogen|Electricity:
     description: Efficiency of producing hydrogen from electricity
     unit: "%"