Add capacity variables for secondary-energy-carriers

definitions/variable/energy/secondary-energy-electricity.yaml

@@ -1,41 +1,80 @@
 - Secondary Energy|Electricity:
     definition: Total net electricity generation
     unit: EJ/yr
+- Capacity|Electricity:
+    definition: Total installed (available) capacity of all power plants
+    unit: GW
 
 - Secondary Energy|Electricity|Biomass:
     definition: Net electricity generation from purpose-grown bioenergy crops, crop and
       forestry residue, municipal solid waste bioenergy and traditional biomass
     unit: EJ/yr
+- Capacity|Electricity|Biomass:
+    definition: Installed (available) capacity of all power plants using purpose-grown
+      bioenergy crops, crop and forestry residue, municipal solid waste bioenergy and
+      traditional biomass
+    unit: GW
 - Secondary Energy|Electricity|Biomass|{CCS}:
     definition: Net electricity generation from purpose-grown bioenergy crops, crop and
       forestry residue, municipal solid waste bioenergy and traditional biomass {CCS}
     unit: EJ/yr
+- Capacity|Electricity|Biomass|{CCS}:
+    definition: Installed (available) capacity of all power plants using purpose-grown
+        bioenergy crops, crop and forestry residue, municipal solid waste bioenergy and
+        traditional biomass {CCS}
+    unit: GW
 
 - Secondary Energy|Electricity|Non-Biomass Renewables:
     definition: Net electricity generation from hydro, wind, solar, geothermal, ocean,
       and other renewable sources excluding biomass
     unit: EJ/yr
+- Capacity|Electricity|Biomass|Non-Biomass Renewables:
+    definition: Installed (available) capacity of all power plants using hydro, wind,
+      solar, geothermal, ocean, and other renewable sources excluding biomass
+    unit: GW
 - Secondary Energy|Electricity|{Non-Biomass Renewables}:
     description: Net electricity generation from {Non-Biomass Renewables}
     unit: EJ/yr
+- Capacity|Electricity|{Non-Biomass Renewables}:
+    definition: Installed (available) capacity of all power plants using {Non-Biomass Renewables}
+    unit: GW
 
 - Secondary Energy|Electricity|Nuclear:
     description: Net electricity generation from nuclear power
     unit: EJ/yr
+- Capacity|Electricity|Nuclear:
+    definition: Installed (available) capacity of all nuclear power plants
+    unit: GW
 - Secondary Energy|Electricity|Hydrogen:
     definition: Net electricity generation from hydrogen
     unit: EJ/yr
+- Capacity|Electricity|Hydrogen:
+    definition: Installed (available) capacity of all power plants using hydrogen
+    unit: GW
 - Secondary Energy|Electricity|Ammonia:
     definition: Net electricity generation from ammonia
     unit: EJ/yr
+- Capacity|Electricity|Ammonia:
+    definition: Installed (available) capacity of all power plants using ammonia
+    unit: GW
 
 - Secondary Energy|Electricity|{Primary Fossil Fuel}:
     description: Net electricity generation from {Primary Fossil Fuel}
     unit: EJ/yr
+- Capacity|Electricity|{Primary Fossil Fuel}:
+    definition: Installed (available) capacity of all power plants using {Primary Fossil Fuel}
+    unit: GW
 - Secondary Energy|Electricity|{Primary Fossil Fuel}|{CCS}:
     description: Net electricity generation from {Primary Fossil Fuel} {CCS}
     unit: EJ/yr
+- Capacity|Electricity|{Primary Fossil Fuel}|{CCS}:
+    definition: Installed (available) capacity of all power plants using {Primary Fossil Fuel} {CCS}
+    unit: GW
 
 - Secondary Energy|Electricity|Other:
     description: Net electricity generation from sources that do not fit any other category
     unit: EJ/yr
+- Capacity|Electricity|Other:
+    definition: Installed (available) capacity of all power plants using sources that
+      do not fit any other category
+    unit: GW

definitions/variable/energy/secondary-energy-non-electricity.yaml

@@ -2,114 +2,228 @@
     definition: Total production of refined liquid fuels from all energy sources,
       including oil products, synthetic fossil fuels from gas and coal, and biofuels
     unit: EJ/yr
+- Capacity|Liquids:
+    definition: Total installed (available) capacity for the production of refined
+      liquid fuels from all energy sources, including oil products, synthetic fossil
+      fuels from gas and coal, and biofuels
+    unit: GW
 - Secondary Energy|Liquids|Biomass:
     description: Production of liquid fuels from biomass
     unit: EJ/yr
+- Capacity|Liquids|Biomass:
+    definition: Installed (available) capacity for the production of refined
+      liquid fuels from biomass
+    unit: GW
 - Secondary Energy|Liquids|{Primary Fossil Fuel}:
     description: Production of fossil liquid fuels from {Primary Fossil Fuel}
     unit: EJ/yr
+- Capacity|Liquids|{Primary Fossil Fuel}:
+    definition: Installed (available) capacity for the production of refined
+      liquid fuels from {Primary Fossil Fuel}
+    unit: GW
 - Secondary Energy|Liquids|Electricity:
     description: Production of liquid fuels from electricity (e-fuels)
     unit: EJ/yr
+- Capacity|Liquids|Electricity:
+    description: Installed (available) capacity for the production of refined
+      liquid fuels from electricity (e-fuels)
+    unit: GW
 - Secondary Energy|Liquids|Other:
     description: Production of liquids fuels from sources that do not fit any other category
     unit: EJ/yr
+- Capacity|Liquids|Other:
+    description: Installed (available) capacity for the production of liquids fuels from
+      sources that do not fit any other category
+    unit: GW
 
 - Secondary Energy|Solids:
     definition: Total production of solid energy carriers, including coal, briquettes,
       coke, and wood pellets
     unit: EJ/yr
+- Capacity|Solids:
+    definition: Total installed (available) capacity for the production of solid energy
+      carriers
+    unit: GW
 - Secondary Energy|Solids|Biomass:
     description: Production of solid secondary energy carriers from biomass
-      (e.g., commercial charcoal, wood chips, wood pellets).
-      Use of tradional bioenergy is excluded.
-    unit: EJ/yr
+      (e.g., commercial charcoal, wood chips, wood pellets),
+      not including tradional bioenergy
+    unit: EJ/yr
+- Capacity|Solids|Biomass:
+    definition: Installed (available) capacity for the production of solid secondary
+      energy carriers from biomass (e.g., commercial charcoal, wood chips, wood pellets),
+      not including tradional bioenergy
+    unit: GW
 - Secondary Energy|Solids|Fossil:
     description: Consumption of fossil solid secondary energy carriers
       including coal and lignite and derived products (e.g., coke, briquettes)
     unit: EJ/yr
+- Capacity|Solids|Fossil:
+    definition: Installed (available) capacity for the production of fossil solid
+      secondary energy carriers including coal and lignite and derived products
+      (e.g., coke, briquettes)
+    unit: GW
 
 - Secondary Energy|Gases:
     definition: Total production of gaseous fuels, including natural gas and biogas,
       not including hydrogen
     unit: EJ/yr
+- Capacity|Gases:
+    definition: Total installed (available) capacity for the production of gaseous fuels,
+      including natural gas and biogas, not including hydrogen
+    unit: GW
 - Secondary Energy|Gases|Biomass:
     description: Production of biogas
     unit: EJ/yr
+- Capacity|Gases|Biomass:
+    definition: Installed (available) capacity for the production of biogas
+    unit: GW
 - Secondary Energy|Gases|Fossil:
     description: Production of gaseous fuels from fossil energy carriers
     unit: EJ/yr
+- Capacity|Gases|Fossil:
+    definition: Installed (available) capacity for the production of gaseous fuels
+      from fossil energy carriers
+    unit: GW
 - Secondary Energy|Gases|Coal:
     description: Production of coal gas from coal gasification
     unit: EJ/yr
+- Capacity|Gases|Coal:
+    definition: Installed (available) capacity for the production of coal gas
+      from coal gasification
+    unit: GW
 - Secondary Energy|Gases|Gas:
     description: Consumption of natural gas (fossil methane)
     unit: EJ/yr
+- Capacity|Gases|Gas:
+    description: Installed (available) capacity for the production and processing
+      of natural gas (fossil methane)
+    unit: GW
 - Secondary Energy|Gases|Electricity:
-    description: Production of gas from electricity (power-to-gas)
+    description: Production of gaseous fuels from electricity (power-to-gas),
+      not including hydrogen, e.g., methane, synfuel, LPG
     unit: EJ/yr
+- Capacity|Gases|Electricity:
+    definition: Installed (available) capacity for the production of gaseous fuels from
+      electricity (power-to-gas), not including hydrogen, e.g., methane, synfuel, LPG
+    unit: GW
 - Secondary Energy|Gases|Other:
     description: Production of gases from sources that do not fit any other category
     unit: EJ/yr
+- Capacity|Gases|Other:
+    description: Installed (available) capacity for the production of gases from sources
+      that do not fit any other category
+    unit: GW
 
 - Secondary Energy|Hydrogen:
     definition: Total production of hydrogen
     unit: EJ/yr
+- Capacity|Hydrogen:
+    definition: Total installed (available) capacity for the production of hydrogen
+    unit: GW
 - Secondary Energy|Hydrogen|Biomass:
     description: Production of hydrogen from biomass
     unit: EJ/yr
+- Capacity|Hydrogen|Biomass:
+    description: Installed (available) capacity for the production of hydrogen from biomass
+    unit: GW
 - Secondary Energy|Hydrogen|Biomass|{CCS}:
     description: Production of hydrogen from biomass {CCS}
     unit: EJ/yr
+- Capacity|Hydrogen|Biomass|{CCS}:
+    description: Installed (available) capacity for the production of hydrogen
+      from biomass {CCS}
+    unit: GW
 - Secondary Energy|Hydrogen|{Primary Fossil Fuel}:
     description: Production of hydrogen from {Primary Fossil Fuel}
     unit: EJ/yr
+- Capacity|Hydrogen|{Primary Fossil Fuel}:
+    description: Installed (available) capacity for the production of hydrogen
+      from {Primary Fossil Fuel}
+    unit: EJGW
 - Secondary Energy|Hydrogen|{Primary Fossil Fuel}|{CCS}:
     description: Production of hydrogen from {Primary Fossil Fuel} {CCS}
     unit: EJ/yr
+- Capacity|Hydrogen|{Primary Fossil Fuel}|{CCS}:
+      description: Installed (available) capacity for the production of hydrogen
+        from {Primary Fossil Fuel} {CCS}
+      unit: GW
 - Secondary Energy|Hydrogen|Electricity:
-    description: Production of hydrogen from electricity via electrolysis
+    description: Production of hydrogen using electrolysis
     unit: EJ/yr
+- Capacity|Hydrogen|Electricity:
+    description: Installed (available) capacity for the production of hydrogen
+      using electrolysis, not including two-step power-to-gas for production of
+      other gaseous fuels
+    unit: GW
 - Secondary Energy|Hydrogen|Nuclear:
     description: Production of hydrogen from nuclear energy
       (e.g. thermochemical water splitting with nuclear heat)
     unit: EJ/yr
+- Capacity|Hydrogen|Nuclear:
+    description: Installed (available) capacity for the production of hydrogen from
+      nuclear energy (e.g. thermochemical water splitting with nuclear heat)
+    unit: GW
 - Secondary Energy|Hydrogen|Solar:
     description: Production of hydrogen from solar energy
       (e.g. thermochemical water splitting with solar heat)
     unit: EJ/yr
+- Capacity|Hydrogen|Solar:
+    description: Installed (available) capacity for the production of hydrogen
+      from solar energy (e.g. thermochemical water splitting with solar heat)
+    unit: GW
 - Secondary Energy|Hydrogen|Other:
     description: Production of hydrogen from sources that do not fit any other category
     unit: EJ/yr
+- Capacity|Hydrogen|Other:
+    description: Installed (available) capacity for the production of hydrogen
+      from sources that do not fit any other category
+    unit: GW
 
 - Secondary Energy|Heat:
-    definition: Total production of centralized heat
+    definition: Total generation of centralized heat
     unit: EJ/yr
+- Capacity|Heat:
+    definition: Total installed (available) capacity for the generation of centralized heat
+    unit: GW
 - Secondary Energy|Heat|Biomass:
     description: Centralized heat generation from biomass
     unit: EJ/yr
+- Capacity|Heat|Biomass:
+    description: Installed (available) capacity for centralized heat generation from biomass
+    unit: GW
 - Secondary Energy|Heat|Biomass|{CCS}:
     description: Centralized heat generation from biomass {CCS}
     unit: EJ/yr
-- Secondary Energy|Heat|Geothermal:
-    description: Centralized heat generation from geothermal energy
-      excluding ground-source heat pumps
-    unit: EJ/yr
+- Capacity|Heat|Biomass|{CCS}:
+    description: Installed (available) capacity for centralized heat generation
+      from biomass {CCS}
+    unit: GW
+- Secondary Energy|Heat|{Non-Fossil Heat Sources}:
+    description: Centralized heat generation from {Non-Fossil Heat Sources}
+    unit: EJ/yr
+- Capacity|Heat|{Non-Fossil Heat Sources}:
+    description: Installed (available) capacity for centralized heat generation
+      from {Non-Fossil Heat Sources}
+    unit: GW
 - Secondary Energy|Heat|{Primary Fossil Fuel}:
     description: Centralized heat generation from {Primary Fossil Fuel}
     unit: EJ/yr
+- Capacity|Heat|{Primary Fossil Fuel}:
+    description: Installed (available) capacity for centralized heat generation
+      from {Primary Fossil Fuel}
+    unit: GW
 - Secondary Energy|Heat|{Primary Fossil Fuel}|{CCS}:
     description: Centralized heat generation from {Primary Fossil Fuel} {CCS}
     unit: EJ/yr
-- Secondary Energy|Heat|Electricity:
-    description: Centralized heat generation from electricity
-    unit: EJ/yr
-- Secondary Energy|Heat|Nuclear:
-    description: Centralized heat generation from nuclear energy
-    unit: EJ/yr
-- Secondary Energy|Heat|Solar:
-    description: Centralized heat generation from solar energy
-    unit: EJ/yr
+- Capacity|Heat|{Primary Fossil Fuel}|{CCS}:
+    description: Installed (available) capacity for centralized heat generation
+      from {Primary Fossil Fuel} {CCS}
+    unit: GW
 - Secondary Energy|Heat|Other:
     description: Centralized heat generation from sources that do not fit any other category
     unit: EJ/yr
+- Capacity|Heat|Other:
+    description: Installed (available) capacity for centralized heat generation
+      from sources that do not fit any other category
+    unit: GW

definitions/variable/energy/tag_non_fossil_heat_sources.yaml

@@ -0,0 +1,9 @@
+- Non-Fossil Heat Sources:
+    - Geothermal:
+        description: geothermal energy excluding ground-source heat pumps
+    - Electricity:
+        description: electricity
+    - Nuclear:
+        description: nuclear energy
+    - Solar:
+        description: solar energy