quintel · robindesmit-quintel · Jul 30, 2026 · Jul 30, 2026 · Jul 31, 2026 · Jul 16, 2026
diff --git a/config/direct_emissions_csv.yml b/config/direct_emissions_csv.yml
@@ -3,85 +3,102 @@
 # Row selection (the export membership rule)
 # -------------------------------------------
 # `rows.require` names a column of `config/sector_mapping.csv`. A (sector_label, use) pair from that
-# mapping is exported iff its cell in that column has a value ("-" and blank both count as "no
-# value"). `rows.order_by` names a column whose raw display value orders those pairs (ascending; a
-# pair with a blank/"-" cell there sorts last; ties keep mapping-file order) — the column need not
-# appear in `schema:`. Each exported pair expands into one row per energy or molecule node whose own
-# `sector_label` and `use` attributes match the pair (never derived from group or config names) AND
-# which belongs to the node's `:direct_emissions` group, sorted by node key. A pair with zero such nodes
-# legally yields zero rows. A future export (e.g. a costs export) can reuse this mechanism by
+# mapping is exported if its cell in that column has a value ("-" and blank both count as "no
+# value").
+# `rows.order_by` names a column whose raw display value orders those pairs (ascending) — the column
+# need not appear in `schema:`.
+# Each exported pair expands into one row per energy or molecule node whose own
+# `sector_label` and `use` attributes match the pair AND which belongs to the node's `:direct_emissions`
+# group, sorted by node key.
+# A future export (e.g. a costs export) can reuse this mechanism by
 # declaring a different `require` column; rows for it stay out of this export by carrying "-" in
 # `emissions_sector`.
 #
 # Column types
 # ------------
-#   - node_attribute:  Evaluates `value` (a node_api method/expression) on each expanded node, with an
+#   - node_attribute:   Evaluates `value` (a node_api method/expression) on each expanded node, with an
 #                       optional `transform` applied to the result.
-#   - sector_mapping:   Renders the raw display value (never a normalized slug) of the named
-#                       sector_mapping column for the row's pair. A "-"/blank mapping cell renders as
-#                       an empty CSV cell.
+#   - sector_mapping:   Renders the raw display value of the named sector_mapping column for the
+#.                      row's pair. A "-"/blank mapping cell renders as "-".
+#                       This is display only: a "-" cell stays unqueryable, and a "-" in the
+#                       `rows.require` column still excludes the pair from the export (see above).
 #
 # Schema
 # ------
+# `name` is the CSV header, and the columns below appear in the exported order.
+#
 # Row identifiers, looked up from the sector mapping (not hand-typed):
-#   - Sector     sector_mapping: emissions_sector
-#   - Subsector  sector_mapping: emissions_subsector
+#   - Sector                          sector_mapping: emissions_sector
+#   - Subsector                       sector_mapping: emissions_subsector
+#   - IPCC CRT code                   sector_mapping: ipcc_crt_code
+#   - IPCC CRT category               sector_mapping: ipcc_crt_category
+#   - IPCC CRT subcategory 1st order  sector_mapping: ipcc_crt_subcategory_1st_order
+#   - IPCC CRT subcategory 2nd order  sector_mapping: ipcc_crt_subcategory_2nd_order
+#   - IPCC CRT subcategory 3rd order  sector_mapping: ipcc_crt_subcategory_3rd_order
 #
 # Auto-generated node attributes:
 #   - Key  Unique node key
 #   - GHG  Greenhouse gas type (CO2 or Other GHG), derived via ghg_carrier method
 #
 # Emission method columns.
-#   - CO2_production       Direct reporting CO2 production
-#   - CO2_capture          Direct reporting captured CO2
-#   - Other_GHG_emissions  Direct reporting other GHG emissions
-#   - Total_GHG_emissions  Direct reporting total GHG emissions
+#   - CO2 production [kton CO2-eq]       Direct reporting CO2 production
+#   - CO2 capture [kton CO2-eq]          Direct reporting captured CO2
+#   - Other GHG emissions [kton CO2-eq]  Direct reporting other GHG emissions
+#   - Total GHG emissions [kton CO2-eq]  Direct reporting total GHG emissions
 #   A transform is applied to each: emission values are given in kg, transformed to kton (× 1e-6)
 #   and rounded to 6 decimal places.
 #
 # Modellers may append further classification columns later by adding a `sector_mapping` entry here
-# — any column of `config/sector_mapping.csv` may be surfaced, in any order, under any header label.
+# — any column of `config/sector_mapping.csv` may be surfaced, in any order, under any header.
 # For example:
 #   - name: Use
-#     label: "Use"
 #     type: sector_mapping
 #     value: use
-#   - name: IPCC_CRT_code_agg
-#     label: "IPCC CRT code (aggregated)"
+#   - name: "IPCC CRT code (aggregated)"
 #     type: sector_mapping
 #     value: ipcc_crt_code_agg
 
-
 schema:
   - name: Sector
     type: sector_mapping
     value: emissions_sector
   - name: Subsector
     type: sector_mapping
     value: emissions_subsector
+  - name: "IPCC CRT code"
+    type: sector_mapping
+    value: ipcc_crt_code
+  - name: "IPCC CRT category"
+    type: sector_mapping
+    value: ipcc_crt_category
+  - name: "IPCC CRT subcategory 1st order"
+    type: sector_mapping
+    value: ipcc_crt_subcategory_1st_order
+  - name: "IPCC CRT subcategory 2nd order"
+    type: sector_mapping
+    value: ipcc_crt_subcategory_2nd_order
+  - name: "IPCC CRT subcategory 3rd order"
+    type: sector_mapping
+    value: ipcc_crt_subcategory_3rd_order
   - name: Key
     type: node_attribute
     value: key
   - name: GHG
     type: node_attribute
     value: ghg_carrier
-  - name: CO2_production
-    label: "CO2 production [kton CO2-eq]"
+  - name: "CO2 production [kton CO2-eq]"
     type: node_attribute
     value: direct_reporting_emissions_co2_production
     transform: "(value * 1e-6).round(6)"
-  - name: CO2_capture
-    label: "CO2 capture [kton CO2-eq]"
+  - name: "CO2 capture [kton CO2-eq]"
     type: node_attribute
     value: direct_reporting_emissions_co2_capture
     transform: "(value * 1e-6).round(6)"
-  - name: Other_GHG_emissions
-    label: "Other GHG emissions [kton CO2-eq]"
+  - name: "Other GHG emissions [kton CO2-eq]"
     type: node_attribute
     value: direct_reporting_emissions_other_ghg_emissions
     transform: "(value * 1e-6).round(6)"
-  - name: Total_GHG_emissions
-    label: "Total GHG emissions [kton CO2-eq]"
+  - name: "Total GHG emissions [kton CO2-eq]"
     type: node_attribute
     value: direct_reporting_emissions_total_ghg_emissions
     transform: "(value * 1e-6).round(6)"

diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml
@@ -542,12 +542,18 @@ energy_chemical_refineries_transformation_external_coupling_node:
 energy_chp_coal_gas:
   x: 3920
   "y": 11100
-energy_chp_combined_cycle_ht_network_gas:
+energy_chp_combined_cycle_ht_hydrogen:
   x: 6360
   "y": 7460
-energy_chp_combined_cycle_mt_network_gas:
+energy_chp_combined_cycle_ht_network_gas:
+  x: 6360
+  "y": 7400
+energy_chp_combined_cycle_mt_hydrogen:
   x: 6360
   "y": 6140
+energy_chp_combined_cycle_mt_network_gas:
+  x: 6360
+  "y": 6080
 energy_chp_local_engine_ht_biogas:
   x: 6060
   "y": 7700
@@ -604,7 +610,7 @@ energy_chp_ultra_supercritical_cofiring_mt_coal:
   "y": 6320
 energy_chp_ultra_supercritical_ht_coal:
   x: 6360
-  "y": 7400
+  "y": 7340
 energy_chp_ultra_supercritical_ht_lignite:
   x: 6360
   "y": 7760

diff --git a/config/sector_mapping.csv b/config/sector_mapping.csv
@@ -1,4 +1,4 @@
-sector_label,use,emissions_sector,emissions_subsector,ipcc_crt_code_agg,ipcc_crt_code,ipcc_crt_category,crt_subcategory_1st_order,ipcc_crt_subcategory_2nd_order,ipcc_crt_subcategory_3rd_order
+sector_label,use,emissions_sector,emissions_subsector,ipcc_crt_code_agg,ipcc_crt_code,ipcc_crt_category,ipcc_crt_subcategory_1st_order,ipcc_crt_subcategory_2nd_order,ipcc_crt_subcategory_3rd_order
 energy_electricity_and_heat_production,energetic,Energy,Electricity and heat production,1.A.1,1.A.1.a,Energy,Fuel combustion activities,Energy industries,Public electricity and heat production
 industry_refineries,energetic,Industry,Refineries,1.A.1,1.A.1.b,Energy,Fuel combustion activities,Energy industries,Petroleum refining
 energy_fuels_production,energetic,Energy,Fuels production,1.A.1,1.A.1.c,Energy,Fuel combustion activities,Energy industries,Manufacture of solid fuels and other energy industries

diff --git a/...ions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql b/...ions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql
diff --git a/...emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql b/...emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql
diff --git a/...emissions_indirect_emissions_co2_1990.gql → ...emissions_indirect_emissions_co2_1990.gql b/...emissions_indirect_emissions_co2_1990.gql → ...emissions_indirect_emissions_co2_1990.gql
diff --git a/...direct_emissions_agriculture_co2_1990.gql → ...direct_emissions_agriculture_co2_1990.gql b/...direct_emissions_agriculture_co2_1990.gql → ...direct_emissions_agriculture_co2_1990.gql
diff --git a/...2/direct_emissions_buildings_co2_1990.gql → ...2/direct_emissions_buildings_co2_1990.gql b/...2/direct_emissions_buildings_co2_1990.gql → ...2/direct_emissions_buildings_co2_1990.gql
diff --git a/...rect_emissions/emissions_sector/1990/per_sector/co2/direct_emissions_bunkers_co2_1990.gql b/...rect_emissions/emissions_sector/1990/per_sector/co2/direct_emissions_bunkers_co2_1990.gql
@@ -0,0 +1,15 @@
+- unit = MT
+- query =
+    DIVIDE(
+      SUM(
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_shipping), 100.0),
+          EMISSIONS(emissions_subsector, "International navigation", co2, 1990)
+        ),
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_aviation), 100.0),
+          EMISSIONS(emissions_subsector, "International aviation", co2, 1990)
+        )
+      ),
+      THOUSANDS
+    )
diff --git a/.../co2/direct_emissions_energy_co2_1990.gql → .../co2/direct_emissions_energy_co2_1990.gql b/.../co2/direct_emissions_energy_co2_1990.gql → .../co2/direct_emissions_energy_co2_1990.gql
diff --git a/.../direct_emissions_households_co2_1990.gql → .../direct_emissions_households_co2_1990.gql b/.../direct_emissions_households_co2_1990.gql → .../direct_emissions_households_co2_1990.gql
diff --git a/...o2/direct_emissions_industry_co2_1990.gql → ...o2/direct_emissions_industry_co2_1990.gql b/...o2/direct_emissions_industry_co2_1990.gql → ...o2/direct_emissions_industry_co2_1990.gql
diff --git a/.../co2/direct_emissions_lulucf_co2_1990.gql → .../co2/direct_emissions_lulucf_co2_1990.gql b/.../co2/direct_emissions_lulucf_co2_1990.gql → .../co2/direct_emissions_lulucf_co2_1990.gql
diff --git a/...r/co2/direct_emissions_other_co2_1990.gql → ...r/co2/direct_emissions_other_co2_1990.gql b/...r/co2/direct_emissions_other_co2_1990.gql → ...r/co2/direct_emissions_other_co2_1990.gql
diff --git a/...2/direct_emissions_transport_co2_1990.gql → ...2/direct_emissions_transport_co2_1990.gql b/...2/direct_emissions_transport_co2_1990.gql → ...2/direct_emissions_transport_co2_1990.gql
diff --git a/...r/co2/direct_emissions_waste_co2_1990.gql → ...r/co2/direct_emissions_waste_co2_1990.gql b/...r/co2/direct_emissions_waste_co2_1990.gql → ...r/co2/direct_emissions_waste_co2_1990.gql
diff --git a/..._emissions_agriculture_other_ghg_1990.gql → ..._emissions_agriculture_other_ghg_1990.gql b/..._emissions_agriculture_other_ghg_1990.gql → ..._emissions_agriculture_other_ghg_1990.gql
diff --git a/...ct_emissions_buildings_other_ghg_1990.gql → ...ct_emissions_buildings_other_ghg_1990.gql b/...ct_emissions_buildings_other_ghg_1990.gql → ...ct_emissions_buildings_other_ghg_1990.gql
diff --git a/...ns/emissions_sector/1990/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql b/...ns/emissions_sector/1990/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql
@@ -0,0 +1,15 @@
+- unit = MT
+- query =
+    DIVIDE(
+      SUM(
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_shipping), 100.0),
+          EMISSIONS(emissions_subsector, "International navigation", other_ghg, 1990)
+        ),
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_aviation), 100.0),
+          EMISSIONS(emissions_subsector, "International aviation", other_ghg, 1990)
+        )
+      ),
+      THOUSANDS
+    )
diff --git a/...irect_emissions_energy_other_ghg_1990.gql → ...irect_emissions_energy_other_ghg_1990.gql b/...irect_emissions_energy_other_ghg_1990.gql → ...irect_emissions_energy_other_ghg_1990.gql
diff --git a/...t_emissions_households_other_ghg_1990.gql → ...t_emissions_households_other_ghg_1990.gql b/...t_emissions_households_other_ghg_1990.gql → ...t_emissions_households_other_ghg_1990.gql
diff --git a/...ect_emissions_industry_other_ghg_1990.gql → ...ect_emissions_industry_other_ghg_1990.gql b/...ect_emissions_industry_other_ghg_1990.gql → ...ect_emissions_industry_other_ghg_1990.gql
diff --git a/...irect_emissions_lulucf_other_ghg_1990.gql → ...irect_emissions_lulucf_other_ghg_1990.gql b/...irect_emissions_lulucf_other_ghg_1990.gql → ...irect_emissions_lulucf_other_ghg_1990.gql
diff --git a/...direct_emissions_other_other_ghg_1990.gql → ...direct_emissions_other_other_ghg_1990.gql b/...direct_emissions_other_other_ghg_1990.gql → ...direct_emissions_other_other_ghg_1990.gql
diff --git a/...ct_emissions_transport_other_ghg_1990.gql → ...ct_emissions_transport_other_ghg_1990.gql b/...ct_emissions_transport_other_ghg_1990.gql → ...ct_emissions_transport_other_ghg_1990.gql
diff --git a/...direct_emissions_waste_other_ghg_1990.gql → ...direct_emissions_waste_other_ghg_1990.gql b/...direct_emissions_waste_other_ghg_1990.gql → ...direct_emissions_waste_other_ghg_1990.gql
diff --git a/..._emissions_agriculture_total_ghg_1990.gql → ..._emissions_agriculture_total_ghg_1990.gql b/..._emissions_agriculture_total_ghg_1990.gql → ..._emissions_agriculture_total_ghg_1990.gql
diff --git a/...ct_emissions_buildings_total_ghg_1990.gql → ...ct_emissions_buildings_total_ghg_1990.gql b/...ct_emissions_buildings_total_ghg_1990.gql → ...ct_emissions_buildings_total_ghg_1990.gql
diff --git a/...rect_emissions_bunkers_total_ghg_1990.gql → ...rect_emissions_bunkers_total_ghg_1990.gql b/...rect_emissions_bunkers_total_ghg_1990.gql → ...rect_emissions_bunkers_total_ghg_1990.gql
diff --git a/...irect_emissions_energy_total_ghg_1990.gql → ...irect_emissions_energy_total_ghg_1990.gql b/...irect_emissions_energy_total_ghg_1990.gql → ...irect_emissions_energy_total_ghg_1990.gql
diff --git a/...t_emissions_households_total_ghg_1990.gql → ...t_emissions_households_total_ghg_1990.gql b/...t_emissions_households_total_ghg_1990.gql → ...t_emissions_households_total_ghg_1990.gql
diff --git a/...ect_emissions_industry_total_ghg_1990.gql → ...ect_emissions_industry_total_ghg_1990.gql b/...ect_emissions_industry_total_ghg_1990.gql → ...ect_emissions_industry_total_ghg_1990.gql
diff --git a/...irect_emissions_lulucf_total_ghg_1990.gql → ...irect_emissions_lulucf_total_ghg_1990.gql b/...irect_emissions_lulucf_total_ghg_1990.gql → ...irect_emissions_lulucf_total_ghg_1990.gql
diff --git a/...direct_emissions_other_total_ghg_1990.gql → ...direct_emissions_other_total_ghg_1990.gql b/...direct_emissions_other_total_ghg_1990.gql → ...direct_emissions_other_total_ghg_1990.gql
diff --git a/...ct_emissions_transport_total_ghg_1990.gql → ...ct_emissions_transport_total_ghg_1990.gql b/...ct_emissions_transport_total_ghg_1990.gql → ...ct_emissions_transport_total_ghg_1990.gql
diff --git a/...direct_emissions_waste_total_ghg_1990.gql → ...direct_emissions_waste_total_ghg_1990.gql b/...direct_emissions_waste_total_ghg_1990.gql → ...direct_emissions_waste_total_ghg_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql b/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql b/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql
diff --git a/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql b/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql b/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql b/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql
diff --git a/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql b/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql b/...ct_emissions_excl_lulucf_bunkers_1990.gql → ...ct_emissions_excl_lulucf_bunkers_1990.gql
diff --git a/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql b/...ndirect_emissions_lulucf_bunkers_1990.gql → ...ndirect_emissions_lulucf_bunkers_1990.gql
diff --git a/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql b/...ct_emissions_lulucf_excl_bunkers_1990.gql → ...ct_emissions_lulucf_excl_bunkers_1990.gql
diff --git a/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql b/..._excl_indirect_emissions_bunkers_1990.gql → ..._excl_indirect_emissions_bunkers_1990.gql
diff --git a/...rect_emissions_indirect_emissions_co2.gql → ...rect_emissions_indirect_emissions_co2.gql b/...rect_emissions_indirect_emissions_co2.gql → ...rect_emissions_indirect_emissions_co2.gql
diff --git a/...missions_indirect_emissions_total_ghg.gql → ...missions_indirect_emissions_total_ghg.gql b/...missions_indirect_emissions_total_ghg.gql → ...missions_indirect_emissions_total_ghg.gql
diff --git a/.../co2/direct_emissions_agriculture_co2.gql → .../co2/direct_emissions_agriculture_co2.gql b/.../co2/direct_emissions_agriculture_co2.gql → .../co2/direct_emissions_agriculture_co2.gql
diff --git a/...or/co2/direct_emissions_buildings_co2.gql → ...or/co2/direct_emissions_buildings_co2.gql b/...or/co2/direct_emissions_buildings_co2.gql → ...or/co2/direct_emissions_buildings_co2.gql
diff --git a/...ctor/co2/direct_emissions_bunkers_co2.gql → ...ctor/co2/direct_emissions_bunkers_co2.gql b/...ctor/co2/direct_emissions_bunkers_co2.gql → ...ctor/co2/direct_emissions_bunkers_co2.gql
diff --git a/...ector/co2/direct_emissions_energy_co2.gql → ...ector/co2/direct_emissions_energy_co2.gql b/...ector/co2/direct_emissions_energy_co2.gql → ...ector/co2/direct_emissions_energy_co2.gql
diff --git a/...r/co2/direct_emissions_households_co2.gql → ...r/co2/direct_emissions_households_co2.gql b/...r/co2/direct_emissions_households_co2.gql → ...r/co2/direct_emissions_households_co2.gql
diff --git a/...tor/co2/direct_emissions_industry_co2.gql → ...tor/co2/direct_emissions_industry_co2.gql b/...tor/co2/direct_emissions_industry_co2.gql → ...tor/co2/direct_emissions_industry_co2.gql
diff --git a/...ector/co2/direct_emissions_lulucf_co2.gql → ...ector/co2/direct_emissions_lulucf_co2.gql b/...ector/co2/direct_emissions_lulucf_co2.gql → ...ector/co2/direct_emissions_lulucf_co2.gql
diff --git a/...sector/co2/direct_emissions_other_co2.gql → ...sector/co2/direct_emissions_other_co2.gql b/...sector/co2/direct_emissions_other_co2.gql → ...sector/co2/direct_emissions_other_co2.gql
diff --git a/...or/co2/direct_emissions_transport_co2.gql → ...or/co2/direct_emissions_transport_co2.gql b/...or/co2/direct_emissions_transport_co2.gql → ...or/co2/direct_emissions_transport_co2.gql
diff --git a/...sector/co2/direct_emissions_waste_co2.gql → ...sector/co2/direct_emissions_waste_co2.gql b/...sector/co2/direct_emissions_waste_co2.gql → ...sector/co2/direct_emissions_waste_co2.gql
diff --git a/...irect_emissions_agriculture_other_ghg.gql → ...irect_emissions_agriculture_other_ghg.gql b/...irect_emissions_agriculture_other_ghg.gql → ...irect_emissions_agriculture_other_ghg.gql
diff --git a/.../direct_emissions_buildings_other_ghg.gql → .../direct_emissions_buildings_other_ghg.gql b/.../direct_emissions_buildings_other_ghg.gql → .../direct_emissions_buildings_other_ghg.gql
diff --git a/...hg/direct_emissions_bunkers_other_ghg.gql → ...hg/direct_emissions_bunkers_other_ghg.gql b/...hg/direct_emissions_bunkers_other_ghg.gql → ...hg/direct_emissions_bunkers_other_ghg.gql
diff --git a/...ghg/direct_emissions_energy_other_ghg.gql → ...ghg/direct_emissions_energy_other_ghg.gql b/...ghg/direct_emissions_energy_other_ghg.gql → ...ghg/direct_emissions_energy_other_ghg.gql
diff --git a/...direct_emissions_households_other_ghg.gql → ...direct_emissions_households_other_ghg.gql b/...direct_emissions_households_other_ghg.gql → ...direct_emissions_households_other_ghg.gql
diff --git a/...g/direct_emissions_industry_other_ghg.gql → ...g/direct_emissions_industry_other_ghg.gql b/...g/direct_emissions_industry_other_ghg.gql → ...g/direct_emissions_industry_other_ghg.gql
diff --git a/...ghg/direct_emissions_lulucf_other_ghg.gql → ...ghg/direct_emissions_lulucf_other_ghg.gql b/...ghg/direct_emissions_lulucf_other_ghg.gql → ...ghg/direct_emissions_lulucf_other_ghg.gql
diff --git a/..._ghg/direct_emissions_other_other_ghg.gql → ..._ghg/direct_emissions_other_other_ghg.gql b/..._ghg/direct_emissions_other_other_ghg.gql → ..._ghg/direct_emissions_other_other_ghg.gql
diff --git a/.../direct_emissions_transport_other_ghg.gql → .../direct_emissions_transport_other_ghg.gql b/.../direct_emissions_transport_other_ghg.gql → .../direct_emissions_transport_other_ghg.gql
diff --git a/..._ghg/direct_emissions_waste_other_ghg.gql → ..._ghg/direct_emissions_waste_other_ghg.gql b/..._ghg/direct_emissions_waste_other_ghg.gql → ..._ghg/direct_emissions_waste_other_ghg.gql
diff --git a/...irect_emissions_agriculture_total_ghg.gql → ...irect_emissions_agriculture_total_ghg.gql b/...irect_emissions_agriculture_total_ghg.gql → ...irect_emissions_agriculture_total_ghg.gql
diff --git a/.../direct_emissions_buildings_total_ghg.gql → .../direct_emissions_buildings_total_ghg.gql b/.../direct_emissions_buildings_total_ghg.gql → .../direct_emissions_buildings_total_ghg.gql
diff --git a/...hg/direct_emissions_bunkers_total_ghg.gql → ...hg/direct_emissions_bunkers_total_ghg.gql b/...hg/direct_emissions_bunkers_total_ghg.gql → ...hg/direct_emissions_bunkers_total_ghg.gql
diff --git a/...ghg/direct_emissions_energy_total_ghg.gql → ...ghg/direct_emissions_energy_total_ghg.gql b/...ghg/direct_emissions_energy_total_ghg.gql → ...ghg/direct_emissions_energy_total_ghg.gql
diff --git a/...direct_emissions_households_total_ghg.gql → ...direct_emissions_households_total_ghg.gql b/...direct_emissions_households_total_ghg.gql → ...direct_emissions_households_total_ghg.gql
diff --git a/...g/direct_emissions_industry_total_ghg.gql → ...g/direct_emissions_industry_total_ghg.gql b/...g/direct_emissions_industry_total_ghg.gql → ...g/direct_emissions_industry_total_ghg.gql
diff --git a/...ghg/direct_emissions_lulucf_total_ghg.gql → ...ghg/direct_emissions_lulucf_total_ghg.gql b/...ghg/direct_emissions_lulucf_total_ghg.gql → ...ghg/direct_emissions_lulucf_total_ghg.gql
diff --git a/..._ghg/direct_emissions_other_total_ghg.gql → ..._ghg/direct_emissions_other_total_ghg.gql b/..._ghg/direct_emissions_other_total_ghg.gql → ..._ghg/direct_emissions_other_total_ghg.gql
diff --git a/.../direct_emissions_transport_total_ghg.gql → .../direct_emissions_transport_total_ghg.gql b/.../direct_emissions_transport_total_ghg.gql → .../direct_emissions_transport_total_ghg.gql
diff --git a/..._ghg/direct_emissions_waste_total_ghg.gql → ..._ghg/direct_emissions_waste_total_ghg.gql b/..._ghg/direct_emissions_waste_total_ghg.gql → ..._ghg/direct_emissions_waste_total_ghg.gql
diff --git a/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql b/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql b/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql
diff --git a/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql b/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql b/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql
diff --git a/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql b/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql
diff --git a/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql b/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql b/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql
diff --git a/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql b/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql b/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql
diff --git a/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql b/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql
diff --git a/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql b/...xcl_indirect_emissions_lulucf_bunkers.gql → ...xcl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql b/...ndirect_emissions_excl_lulucf_bunkers.gql → ...ndirect_emissions_excl_lulucf_bunkers.gql
diff --git a/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql b/...ncl_indirect_emissions_lulucf_bunkers.gql → ...ncl_indirect_emissions_lulucf_bunkers.gql
diff --git a/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql b/...ndirect_emissions_lulucf_excl_bunkers.gql → ...ndirect_emissions_lulucf_excl_bunkers.gql
diff --git a/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql b/...ulucf_excl_indirect_emissions_bunkers.gql → ...ulucf_excl_indirect_emissions_bunkers.gql
diff --git a/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a1_co2_1990.gql b/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a1_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.1", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a2_co2_1990.gql b/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a2_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.2", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a3_co2_1990.gql b/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a3_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.3", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4a_co2_1990.gql b/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4a_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.a", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4b_co2_1990.gql b/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4b_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.b", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4c_co2_1990.gql b/...sions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a4c_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.c", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a5_co2_1990.gql b/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1a5_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.5", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...issions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1b_co2_1990.gql b/...issions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1b_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.B", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...issions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1c_co2_1990.gql b/...issions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1c_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.C", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1d1_co2_1990.gql b/...ssions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_1d1_co2_1990.gql
@@ -0,0 +1,15 @@
+- unit = MT
+- query =
+    DIVIDE(
+      SUM(
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_aviation), 100.0),
+          EMISSIONS(ipcc_crt_code, "1.D.1.a", co2, 1990)
+        ),
+        PRODUCT(
+          DIVIDE(INPUT_VALUE(bunkers_allocated_percentage_shipping), 100.0),
+          EMISSIONS(ipcc_crt_code, "1.D.1.b", co2, 1990)
+        )
+      ),
+      THOUSANDS
+    )
diff --git a/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_2_co2_1990.gql b/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_2_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "2", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_3_co2_1990.gql b/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_3_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "3", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_4_co2_1990.gql b/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_4_co2_1990.gql
@@ -0,0 +1,6 @@
+# Uses the query for ETM sector LULUCF, which exactly matches IPCC category 5 LULUCF.
+# This is done since using the IPCC columns of the mapping file in a query could not distinguish
+# between emissions and removals for CO2.
+
+- unit = MT
+- query = Q(direct_emissions_lulucf_co2_1990)
diff --git a/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_5_co2_1990.gql b/...missions/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_5_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "5", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...ns/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_ind_co2_co2_1990.gql b/...ns/direct_emissions/ipcc/1990/per_category/co2/direct_emissions_ipcc_ind_co2_co2_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "ind_CO2", co2, 1990),
+      THOUSANDS
+    )
diff --git a/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a1_other_ghg_1990.gql b/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a1_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.1", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a2_other_ghg_1990.gql b/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a2_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.2", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a3_other_ghg_1990.gql b/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a3_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.3", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4a_other_ghg_1990.gql b/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4a_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.a", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4b_other_ghg_1990.gql b/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4b_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.b", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4c_other_ghg_1990.gql b/..._emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a4c_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.4.c", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a5_other_ghg_1990.gql b/...t_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1a5_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.A.5", other_ghg, 1990),
+      THOUSANDS
+    )
diff --git a/...ct_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1b_other_ghg_1990.gql b/...ct_emissions/ipcc/1990/per_category/other_ghg/direct_emissions_ipcc_1b_other_ghg_1990.gql
@@ -0,0 +1,6 @@
+- unit = MT
+- query =
+    DIVIDE(
+      EMISSIONS(ipcc_crt_code_agg, "1.B", other_ghg, 1990),
+      THOUSANDS
+    )