Add variables for secondary-energy production other than electricity

definitions/variable/energy/final-energy.yaml

@@ -16,6 +16,7 @@
 - Final Energy|Non-Energy Use|{Secondary Fuel}:
     description: Final energy consumption of {Secondary Fuel} in non-combustion processes
     unit: EJ/yr
+    notes: See `Secondary Energy|{Secondary Fuel}|...` for the sources of the energy carrier
 - Final Energy|Non-Energy Use|Waste:
     description: Final energy consumption of non-renewable waste in non-combustion processes
     unit: EJ/yr
@@ -26,6 +27,7 @@
     description: Final energy consumption of {Secondary Fuel} by the {Non-Energy Sector}
       for non-combustion processes
     unit: EJ/yr
+    notes: See `Secondary Energy|{Secondary Fuel}|...` for the sources of the energy carrier
 - Final Energy|Non-Energy Use|{Non-Energy Sector}|Waste:
     description: Final energy consumption of non-renewable waste by the {Non-Energy Sector}
       for non-combustion processes
@@ -46,6 +48,7 @@
 - Final Energy|{Secondary Fuel}:
     description: Final energy fuel consumption of {Secondary Fuel}
     unit: EJ/yr
+    notes: See `Secondary Energy|{Secondary Fuel}|...` for the sources of the energy carrier
 - Final Energy|Geothermal:
     description: Final energy consumption of geothermal energy (e.g., from decentralized
       or small-scale geothermal heating systems) excluding geothermal heat pumps
@@ -71,6 +74,7 @@
 - Final Energy|{Sector}|{Secondary Fuel}:
     description: Final energy consumption by the agriculture sector of {Secondary Fuel}
     unit: EJ/yr
+    notes: See `Secondary Energy|{Secondary Fuel}|...` for the sources of the energy carrier
 - Final Energy|{Sector}|Other:
     description: Final energy consumption by the industrial sector of other energy sources
     unit: EJ/yr

definitions/variable/energy/primary-energy.yaml

@@ -56,14 +56,6 @@
       includes electricity, heat and hydrogen production from nuclear energy)
     unit: EJ/yr
 
-- Primary Energy|Fossil:
-    description: Primary energy consumption of fossil fuels including coal, natural gas
-      and conventional/unconventional oil
-    unit: EJ/yr
-- Primary Energy|Fossil|{CCS}:
-    description: Primary energy consumption of fossil fuels including coal, natural gas
-      and conventional/unconventional oil {CCS}
-    unit: EJ/yr
 - Primary Energy|{Primary Fossil Fuel}:
     description: Primary energy consumption of {Primary Fossil Fuel}
     unit: EJ/yr

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

@@ -0,0 +1,115 @@
+- Secondary Energy|Liquids:
+    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
+- Secondary Energy|Liquids|Biomass:
+    description: Production of liquid fuels from biomass
+    unit: EJ/yr
+- Secondary Energy|Liquids|{Primary Fossil Fuel}:
+    description: Production of fossil liquid fuels from {Primary Fossil Fuel}
+    unit: EJ/yr
+- Secondary Energy|Liquids|Electricity:
+    description: Production of liquid fuels from electricity (e-fuels)
+    unit: EJ/yr
+- Secondary Energy|Liquids|Other:
+    description: Production of liquids fuels from sources that do not fit any other category
+    unit: EJ/yr
+
+- Secondary Energy|Solids:
+    definition: Total production of solid energy carriers, including coal, briquettes,
+      coke, and wood pellets
+    unit: EJ/yr
+- 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
+- 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
+
+- Secondary Energy|Gases:
+    definition: Total production of gaseous fuels, including natural gas and biogas,
+      not including hydrogen
+    unit: EJ/yr
+- Secondary Energy|Gases|Biomass:
+    description: Production of biogas
+    unit: EJ/yr
+- Secondary Energy|Gases|Fossil:
+    description: Production of gaseous fuels from fossil energy carriers
+    unit: EJ/yr
+- Secondary Energy|Gases|Coal:
+    description: Production of coal gas from coal gasification
+    unit: EJ/yr
+- Secondary Energy|Gases|Gas:
+    description: Consumption of natural gas (fossil methane)
+    unit: EJ/yr
+- Secondary Energy|Gases|Electricity:
+    description: Production of gas from electricity (power-to-gas)
+    unit: EJ/yr
+- Secondary Energy|Gases|Other:
+    description: Production of gases from sources that do not fit any other category
+    unit: EJ/yr
+
+- Secondary Energy|Hydrogen:
+    definition: Total production of hydrogen
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Biomass:
+    description: Production of hydrogen from biomass
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Biomass|{CCS}:
+    description: Production of hydrogen from biomass {CCS}
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|{Primary Fossil Fuel}:
+    description: Production of hydrogen from {Primary Fossil Fuel}
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|{Primary Fossil Fuel}|{CCS}:
+    description: Production of hydrogen from {Primary Fossil Fuel} {CCS}
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Electricity:
+    description: Production of hydrogen from electricity via electrolysis
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Nuclear:
+    description: Production of hydrogen from nuclear energy
+      (e.g. thermochemical water splitting with nuclear heat)
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Solar:
+    description: Production of hydrogen from solar energy
+      (e.g. thermochemical water splitting with solar heat)
+    unit: EJ/yr
+- Secondary Energy|Hydrogen|Other:
+    description: Production of hydrogen from sources that do not fit any other category
+    unit: EJ/yr
+
+- Secondary Energy|Heat:
+    definition: Total production of centralized heat
+    unit: EJ/yr
+- Secondary Energy|Heat|Biomass:
+    description: Centralized heat generation from biomass
+    unit: EJ/yr
+- 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
+- Secondary Energy|Heat|{Primary Fossil Fuel}:
+    description: Centralized heat generation from {Primary Fossil Fuel}
+    unit: EJ/yr
+- 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
+- Secondary Energy|Heat|Other:
+    description: Centralized heat generation from sources that do not fit any other category
+    unit: EJ/yr

definitions/variable/energy/tag_primary_fossil_energy_carriers.yaml

@@ -1,4 +1,6 @@
 - Primary Fossil Fuel:
+    - Fossil:
+        description: fossil fuels including coal, natural gas and conventional/unconventional oil
     - Coal:
         description: coal including lignite
     - Oil:

definitions/variable/energy/tag_secondary_energy_carriers.yaml

@@ -1,5 +1,6 @@
 - Secondary Fuel:
     # Electricity is treated separately
+    # see also `secondary-energy-other.yaml`
     - Liquids:
         description: liquid fuels (conventional & unconventional oil, biofuels,
           coal-to-liquids, gas-to-liquids)