quintel · kndehaan · Jun 9, 2026 · Jul 7, 2026 · Jul 7, 2026 · Jul 7, 2026
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ gem 'rake'
 
 group :development, :test do
   gem 'roo'
-  gem 'atlas',    ref: '3ef8053', github: 'quintel/atlas'
+  gem 'atlas',         ref: '732edc0', github: 'quintel/atlas'
   gem "ostruct"
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/quintel/atlas.git
-  revision: 3ef80536894d1fc90a83c8243f8cb62c48e8f565
-  ref: 3ef8053
+  revision: 732edc0301c7fb4a663c586cc213bae7178eb7b5
+  ref: 732edc0
   specs:
     atlas (1.0.0)
       activemodel (>= 7)

diff --git a/config/direct_emissions_csv.yml b/config/direct_emissions_csv.yml
@@ -1,14 +1,31 @@
 # Configuration for the direct emissions CSV
 #
+# 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 `: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
+# 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
+#                       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.
+#
 # Schema
 # ------
-# Defines the columns included in the exported CSV, split into three categories:
-#
-# Row identifiers — must also be specified in each `rows` entry:
-#   - Group      Node group used to select which nodes appear in the export.
-#                The group name itself is not included in the data export.
-#   - Sector     ETM sector name
-#   - Subsector  ETM subsector name
+# Row identifiers, looked up from the sector mapping (not hand-typed):
+#   - Sector     sector_mapping: emissions_sector
+#   - Subsector  sector_mapping: emissions_subsector
 #
 # Auto-generated node attributes:
 #   - Key  Unique node key
@@ -22,19 +39,26 @@
 #   A transform is applied to each: emission values are given in kg, transformed to kton (× 1e-6)
 #   and rounded to 6 decimal places.
 #
-# Rows
-# ----
-# See explanation above for row identifiers, rows include:
-#   - Group
-#   - Sector
-#   - Subsector
+# 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.
+# For example:
+#   - name: Use
+#     label: "Use"
+#     type: sector_mapping
+#     value: use
+#   - name: IPCC_CRT_code_agg
+#     label: "IPCC CRT code (aggregated)"
+#     type: sector_mapping
+#     value: ipcc_crt_code_agg
 
 
 schema:
-  - name: Group
-    type: node_group
   - name: Sector
+    type: sector_mapping
+    value: emissions_sector
   - name: Subsector
+    type: sector_mapping
+    value: emissions_subsector
   - name: Key
     type: node_attribute
     value: key
@@ -64,162 +88,5 @@ schema:
 
 
 rows:
-  - Group: emissions_energy_electricity_and_heat_production
-    Sector: Energy
-    Subsector: Electricity and heat production
-  - Group: emissions_energy_fuels_production
-    Sector: Energy
-    Subsector: Fuels production
-  - Group: emissions_energy_steel
-    Sector: Energy
-    Subsector: Steel
-  - Group: emissions_energy_methanol_production
-    Sector: Energy
-    Subsector: Methanol production
-  - Group: emissions_energy_hydrogen_production
-    Sector: Energy
-    Subsector: Hydrogen production
-  - Group: emissions_energy_fugitive_emissions
-    Sector: Energy
-    Subsector: Fugitive emissions
-  - Group: emissions_energy_ccus
-    Sector: Energy
-    Subsector: CCUS
-  - Group: emissions_industry_non_specified
-    Sector: Industry
-    Subsector: Non-specified
-  - Group: emissions_industry_electricity_and_heat_production
-    Sector: Industry
-    Subsector: Electricity and heat production
-  - Group: emissions_industry_refineries
-    Sector: Industry
-    Subsector: Refineries
-  - Group: emissions_industry_steel
-    Sector: Industry
-    Subsector: Steel
-  - Group: emissions_industry_aluminium
-    Sector: Industry
-    Subsector: Aluminium
-  - Group: emissions_industry_other_metals
-    Sector: Industry
-    Subsector: Other metals
-  - Group: emissions_industry_fertilizers
-    Sector: Industry
-    Subsector: Fertilizers
-  - Group: emissions_industry_chemicals
-    Sector: Industry
-    Subsector: Chemicals
-  - Group: emissions_industry_paper
-    Sector: Industry
-    Subsector: Paper
-  - Group: emissions_industry_food
-    Sector: Industry
-    Subsector: Food
-  - Group: emissions_industry_other
-    Sector: Industry
-    Subsector: Other
-  - Group: emissions_transport_non_specified
-    Sector: National transport
-    Subsector: Non-specified
-  - Group: emissions_transport_cars
-    Sector: National transport
-    Subsector: Cars
-  - Group: emissions_transport_motorcycles
-    Sector: National transport
-    Subsector: Motorcycles
-  - Group: emissions_transport_bicycles
-    Sector: National transport
-    Subsector: Bicycles
-  - Group: emissions_transport_buses
-    Sector: National transport
-    Subsector: Buses
-  - Group: emissions_transport_trucks
-    Sector: National transport
-    Subsector: Trucks
-  - Group: emissions_transport_vans
-    Sector: National transport
-    Subsector: Vans
-  - Group: emissions_transport_trains
-    Sector: National transport
-    Subsector: Trains
-  - Group: emissions_transport_trams_metros
-    Sector: National transport
-    Subsector: Trams and metros
-  - Group: emissions_transport_domestic_navigation
-    Sector: National transport
-    Subsector: Domestic navigation
-  - Group: emissions_transport_domestic_aviation
-    Sector: National transport
-    Subsector: Domestic aviation
-  - Group: emissions_buildings_non_specified
-    Sector: Buildings
-    Subsector: Non-specified
-  - Group: emissions_buildings_space_heating
-    Sector: Buildings
-    Subsector: Space heating
-  - Group: emissions_buildings_cooling
-    Sector: Buildings
-    Subsector: Cooling
-  - Group: emissions_buildings_lighting
-    Sector: Buildings
-    Subsector: Lighting
-  - Group: emissions_buildings_appliances
-    Sector: Buildings
-    Subsector: Appliances
-  - Group: emissions_households_non_specified
-    Sector: Households
-    Subsector: Non-specified
-  - Group: emissions_households_space_heating
-    Sector: Households
-    Subsector: Space heating
-  - Group: emissions_households_hot_water
-    Sector: Households
-    Subsector: Hot water
-  - Group: emissions_households_cooling
-    Sector: Households
-    Subsector: Cooling
-  - Group: emissions_households_cooking
-    Sector: Households
-    Subsector: Cooking
-  - Group: emissions_households_lighting
-    Sector: Households
-    Subsector: Lighting
-  - Group: emissions_households_appliances
-    Sector: Households
-    Subsector: Appliances
-  - Group: emissions_agriculture_non_specified
-    Sector: Agriculture
-    Subsector: Non-specified
-  - Group: emissions_agriculture_electricity_and_heat_production
-    Sector: Agriculture
-    Subsector: Electricity and heat production
-  - Group: emissions_agriculture_heating
-    Sector: Agriculture
-    Subsector: Heating
-  - Group: emissions_other_non_specified
-    Sector: Other
-    Subsector: Non-specified
-  - Group: emissions_other_heating
-    Sector: Other
-    Subsector: Heating
-  - Group: emissions_other_other_transportation
-    Sector: Other
-    Subsector: Other transportation
-  - Group: emissions_other_indirect_emissions
-    Sector: Other
-    Subsector: Indirect emissions
-  - Group: emissions_lulucf_emissions
-    Sector: LULUCF
-    Subsector: Emissions
-  - Group: emissions_lulucf_removals
-    Sector: LULUCF
-    Subsector: Removals
-  - Group: emissions_waste_non_specified
-    Sector: Waste
-    Subsector: Non-specified
-  - Group: emissions_bunkers_international_aviation
-    Sector: International transport
-    Subsector: International aviation
-  - Group: emissions_bunkers_international_navigation
-    Sector: International transport
-    Subsector: International navigation
+  require: emissions_sector
+  order_by: ipcc_crt_code
diff --git a/config/sector_mapping.csv b/config/sector_mapping.csv
@@ -0,0 +1,65 @@
+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
+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
+energy_steel,energetic,Energy,Steel,1.A.1,1.A.1.c,Energy,Fuel combustion activities,Energy industries,Manufacture of solid fuels and other energy industries
+industry_non_specified,energetic,Industry,Non-specified,1.A.2,1.A.2,Energy,Fuel combustion activities,Manufacturing industries and construction,-
+industry_electricity_and_heat_production,energetic,Industry,Electricity and heat production,1.A.2,1.A.2,Energy,Fuel combustion activities,Manufacturing industries and construction,-
+industry_steel,energetic,Industry,Steel,1.A.2,1.A.2.a,Energy,Fuel combustion activities,Manufacturing industries and construction,Iron and steel
+industry_aluminium,energetic,Industry,Aluminium,1.A.2,1.A.2.b,Energy,Fuel combustion activities,Manufacturing industries and construction,Non-ferrous metals
+industry_other_metals,energetic,Industry,Other metals,1.A.2,1.A.2.b,Energy,Fuel combustion activities,Manufacturing industries and construction,Non-ferrous metals
+industry_fertilizers,energetic,Industry,Fertilizers,1.A.2,1.A.2.c,Energy,Fuel combustion activities,Manufacturing industries and construction,Chemicals
+industry_chemicals,energetic,Industry,Chemicals,1.A.2,1.A.2.c,Energy,Fuel combustion activities,Manufacturing industries and construction,Chemicals
+industry_paper,energetic,Industry,Paper,1.A.2,1.A.2.d,Energy,Fuel combustion activities,Manufacturing industries and construction,"Pulp, paper and print"
+industry_food,energetic,Industry,Food,1.A.2,1.A.2.e,Energy,Fuel combustion activities,Manufacturing industries and construction,"Food processing, beverages and tobacco"
+industry_other,energetic,Industry,Other,1.A.2,1.A.2.f-m,Energy,Fuel combustion activities,Manufacturing industries and construction,"Non-metallic minerals, transport equipment, machinery, mining, wood and wood products, construction, textile and leather, non-specified industry"
+transport_non_specified,energetic,National transport,Non-specified,1.A.3,1.A.3,Energy,Fuel combustion activities,Transport,-
+transport_domestic_aviation,energetic,National transport,Domestic aviation,1.A.3,1.A.3.a,Energy,Fuel combustion activities,Transport,Domestic Aviation
+transport_cars,energetic,National transport,Cars,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_motorcycles,energetic,National transport,Motorcycles,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_bicycles,energetic,National transport,Bicycles,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_buses,energetic,National transport,Buses,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_vans,energetic,National transport,Vans,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_trucks,energetic,National transport,Trucks,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation
+transport_trains,energetic,National transport,Trains,1.A.3,1.A.3.c,Energy,Fuel combustion activities,Transport,Railways
+transport_trams_metros,energetic,National transport,Trams and metros,1.A.3,1.A.3.c,Energy,Fuel combustion activities,Transport,Railways
+transport_domestic_navigation,energetic,National transport,Domestic navigation,1.A.3,1.A.3.d,Energy,Fuel combustion activities,Transport,Domestic Navigation
+other_other_transportation,energetic,Other,Other transportation,1.A.3,1.A.3.e,Energy,Fuel combustion activities,Transport,Other transportation
+buildings_non_specified,energetic,Buildings,Non-specified,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional
+buildings_space_heating,energetic,Buildings,Space heating,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional
+buildings_cooling,energetic,Buildings,Cooling,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional
+buildings_appliances,energetic,Buildings,Appliances,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional
+buildings_lighting,energetic,Buildings,Lighting,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional
+households_non_specified,energetic,Households,Non-specified,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_cooking,energetic,Households,Cooking,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_space_heating,energetic,Households,Space heating,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_hot_water,energetic,Households,Hot water,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_cooling,energetic,Households,Cooling,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_appliances,energetic,Households,Appliances,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+households_lighting,energetic,Households,Lighting,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential
+agriculture_non_specified,energetic,Agriculture,Non-specified,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing
+agriculture_electricity_and_heat_production,energetic,Agriculture,Electricity and heat production,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing
+agriculture_heating,energetic,Agriculture,Heating,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing
+other_non_specified,energetic,Other,Non-specified,1.A.5,1.A.5,Energy,Fuel combustion activities,Other,-
+other_heating,energetic,Other,Heating,1.A.5,1.A.5,Energy,Fuel combustion activities,Other,-
+energy_fugitive_emissions,non_energetic,Energy,Fugitive emissions,1.B,1.B excl. 1.B.2.a.iv,Energy,Fugitive emissions from fuels,"Solid fuels, Oil and natural gas and other emissions from energy production",-
+industry_refineries,non_energetic,Industry,Refineries,1.B,1.B.2.a.iv,Energy,Fugitive emissions from fuels,Oil and natural gas and other emissions from energy production,Refining/storage
+energy_ccus,non_energetic,Energy,CCUS,1.C,1.C,Energy,CO2 Transport and storage,-,-
+industry_non_specified,non_energetic,Industry,Non-specified,2,2,Industrial processes and product use,-,-,-
+industry_other,non_energetic,Industry,Other,2,"2.A,D-G",Industrial processes and product use,"Mineral industry, Non-energy products from fuels and solvent use, Electronics industry, Product uses as substitutes for ODS, Other product manufacture and use",-,-
+industry_fertilizers,non_energetic,Industry,Fertilizers,2,2.B.1-2,Industrial processes and product use,Chemical industry,"Ammonia production, Nitric acid production",-
+industry_chemicals,non_energetic,Industry,Chemicals,2,"2.B.3-7,8.b-g,9,10.b",Industrial processes and product use,Chemical industry,"Adipic acid production, Caprolactam, glyoxal and glyoxylic acid production, Carbide production, Titanium dioxide production, Soda ash production, Petrochemical and carbon black production excl. Methanol, Fluorochemical production, Other excl. Hydrogen production",-
+energy_methanol_production,non_energetic,Energy,Methanol production,2,2.B.8.a,Industrial processes and product use,Chemical industry,Petrochemical and carbon black production,Methanol
+energy_hydrogen_production,non_energetic,Energy,Hydrogen production,2,2.B.10.a,Industrial processes and product use,Chemical industry,Other,Hydrogen Production
+industry_steel,non_energetic,Industry,Steel,2,2.C.1,Industrial processes and product use,Metal industry,Iron and steel production,-
+industry_aluminium,non_energetic,Industry,Aluminium,2,2.C.3,Industrial processes and product use,Metal industry,Aluminium production,-
+industry_other_metals,non_energetic,Industry,Other metals,2,"2.C.2,4-7",Industrial processes and product use,Metal industry,"Ferroalloys production, Magnesium production, Lead production, Zinc production, Other",-
+industry_paper,non_energetic,Industry,Paper,2,2.H.1,Industrial processes and product use,Other,Pulp and paper,-
+industry_food,non_energetic,Industry,Food,2,2.H.2,Industrial processes and product use,Other,Food and beverages industry,-
+agriculture_non_specified,non_energetic,Agriculture,Non-specified,3,3,Agriculture,-,-,-
+lulucf_removals,non_energetic,LULUCF,Removals,4,4,"Land Use, Land-Use Change and Forestry",-,-,-
+lulucf_emissions,non_energetic,LULUCF,Emissions,4,4,"Land Use, Land-Use Change and Forestry",-,-,-
+waste_non_specified,non_energetic,Waste,Non-specified,5,5,Waste,-,-,-
+other_indirect_emissions,non_energetic,Other,Indirect emissions,ind_CO2,ind_CO2,Indirect CO2 emissions,-,-,-
+bunkers_international_aviation,energetic,International transport,International aviation,1.D.1,1.D.1.a,Energy,Memo items,International bunkers,International aviation (aviation bunkers)
+bunkers_international_navigation,energetic,International transport,International navigation,1.D.1,1.D.1.b,Energy,Memo items,International bunkers,International navigation (marine bunkers)