Change to dictionary

definitions/variable/electricitysources_tags.yaml

@@ -5,9 +5,15 @@
 - Investment|Energy Supply|Electricity|{Electricity Source}:
     description: Investment in {Electricity Source}
     unit: billion USD_2010/yr
+- Investment|Energy Supply|Electricity|{Common Electricity Source}:
+    description: Investment in {Electricity Source}
+    unit: billion USD_2010/yr
 - Variable Cost|Electricity|{Electricity Source}:
     description: Variable cost for generating electricity from {Electricity Source} with the fuel cost
     unit: EUR/MWh
+- Variable Cost|Electricity|{Common Electricity Source}:
+    description: Variable cost for generating electricity from {Electricity Source} with the fuel cost
+    unit: EUR/MWh
 - Capacity|Electricity|{Electricity Source}:
     description: Installed (available) capacity of {Electricity Source}
     unit: GW

definitions/variable/tag_electricity-source.yaml

@@ -7,32 +7,17 @@
         description: hydroelectric power plants with reservoirs
     - Hydro|Run of River:
         description: hydroelectric power plants without reservoirs
-    - Lignite|w/o CCS:          
-        description: lignite without carbon capture and storage
+    - Coal|Lignite|w/ CCS:          
+        description: coal (lignite) power plants without carbon capture and storage    
+    - Coal|Lignite|w/o CCS:          
+        description: coal (lignite) power plants without carbon capture and storage
     - Waste:
         description: waste-to-energy plants
-    - Wind|Offshore:
-        description: offshore wind power
-    - Wind|Onshore:
-        description: onshore wind power
-    - Solar|PV:
-        description: photovoltaic solar power
-    - Biomass:  
-        description: biomass power plants
-    - Coal|w/ CCS:
+    - Coal|Hard Coal|w/ CCS:
         description: coal power plants with carbon capture and storage
-    - Coal|w/o CCS:
+    - Coal|Hard Coal|w/o CCS:
         description: coal power plants without carbon capture and storage
-    - Geothermal:
-        description: geothermal power plants
-    - Nuclear:
-        description: nuclear power plants
-    - Ocean:
-        description: ocean power plants
-    - Oil:
-        description: oil power plants
     - Electricity storage:
         description: electricity storage systems
     - Transmission and Distribution:
         description: electricity transmission and distribution systems
-

definitions/variable/tag_existing_electricitysources.yaml

@@ -0,0 +1,95 @@
+- Common Electricity Source:
+    - Biomass:
+        description: purpose-grown bioenergy crops, biogas, crop and forestry residue,
+          municipal solid waste bioenergy and traditional biomass
+    - Biomass|w/ CCS:
+        description: purpose-grown bioenergy crops, biogas, crop and forestry residue,
+          municipal solid waste bioenergy and traditional biomass
+          in combination with carbon capture and storage (CCS)
+    - Biomass|w/o CCS:
+        description: purpose-grown bioenergy crops, biogas, crop and forestry residue,
+          municipal solid waste bioenergy and traditional biomass
+          without carbon capture and storage (CCS)
+
+    - Non-Biomass Renewables:
+        description: hydro, wind, solar, geothermal, ocean, and other renewable sources
+          excluding biomass
+    - Hydro:
+        description: hydropower
+    - Solar:
+        description: solar energy
+    - Solar|CSP:
+        description: utility-scale concentrated solar power (CSP)
+    - Solar|PV:
+        description: photovoltaics (PV)
+    - Solar|PV|Residential:
+        description: residential rooftop photovoltaics (PV)
+        tier: ^1
+    - Solar|PV|Commercial:
+        description: commercial rooftop photovoltaics (PV)
+        tier: ^1
+    - Solar|PV|Open Land:
+        description: photovoltaics (PV) on open land (no mixed use)
+        tier: ^1
+    - Solar|PV|Agri-PV:
+        description: photovoltaics (PV) on agricultural land (mixed use)
+        tier: ^1
+    - Solar|PV|Floating:
+        description: photovoltaics (PV) on water
+        tier: ^1
+    - Solar|PV|Other:
+        description: other types of photovoltaics (PV)
+        tier: ^1
+    - Wind:
+        description: wind power
+    - Wind|Onshore:
+        description: onshore wind power
+    - Wind|Offshore:
+        description: offshore wind power
+
+    - Geothermal:
+        description: geothermal sources
+    - Ocean:
+        description: oceans
+
+    - Nuclear:
+        description: nuclear power
+    - Hydrogen:
+        description: hydrogen
+    - Ammonia:
+        description: ammonia
+
+    - Fossil:
+        description: fossil fuels including coal, natural gas and conventional/unconventional oil
+    - Fossil|w/ CCS:
+        description: fossil fuels including coal, natural gas and conventional/unconventional oil
+          in combination with carbon capture and storage (CCS)
+    - Fossil|w/o CCS:
+        description: fossil fuels including coal, natural gas and conventional/unconventional oil
+          without carbon capture and storage (CCS)
+    - Oil:
+        description: conventional and unconventional crude oil in combination with
+          carbon capture and storage (CCS)
+    - Oil|w/ CCS:
+        description: conventional and unconventional crude oil in combination with
+          carbon capture and storage (CCS)
+    - Oil|w/o CCS:
+        description: conventional and unconventional crude oil without carbon capture
+          and storage (CCS)
+    - Gas:
+        description: natural gas (fossil methane)
+    - Gas|w/ CCS:
+        description: natural gas (fossil methane) in combination with carbon capture
+          and storage (CCS)
+    - Gas|w/o CCS:
+        description: natural gas (fossil methane) without carbon capture and storage (CCS)
+    - Coal:
+        description: coal including lignite
+    - Coal|w/ CCS:
+        description: coal including lignite in combination with carbon capture and
+          storage (CCS)
+    - Coal|w/o CCS:
+        description: coal including lignite without carbon capture and storage (CCS)
+    - Other:
+        description: sources that do not fit any other category
+

definitions/variable/tag_turbine_types.yaml

@@ -0,0 +1,8 @@
+- Turbine Type:
+    - CCGT:
+        description: Combined-cycle gas turbine
+    - OCGT:
+        description: Open-cycle gas turbine
+    - Steam Turbine:
+        description: steam turbines
+