quintel · kndehaan · Apr 24, 2026 · Apr 29, 2026 · Apr 30, 2026 · Apr 30, 2026
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,8 @@ gem 'rake'
 
 group :development, :test do
   gem 'roo'
-  gem 'atlas',    ref: 'f2e3f0d', github: 'quintel/atlas'
+  gem 'atlas',    ref: 'b6e9aea', github: 'quintel/atlas'
+  gem "ostruct"
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/quintel/atlas.git
-  revision: f2e3f0de7a7fc9cd864fcf47ed3624c812803e83
-  ref: f2e3f0d
+  revision: b6e9aea0dfa7f42707c79a1954ee17e7c340856f
+  ref: b6e9aea
   specs:
     atlas (1.0.0)
       activemodel (>= 7)
@@ -123,6 +123,7 @@ PLATFORMS
 
 DEPENDENCIES
   atlas!
+  ostruct
   rake
   refinery!
   roo

diff --git a/carriers/ambient_cold.ad b/carriers/ambient_cold.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = deepskyblue2
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(ambient_cold, cost_per_mj)
diff --git a/carriers/ambient_heat.ad b/carriers/ambient_heat.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = firebrick2
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(ambient_heat, cost_per_mj)
diff --git a/carriers/car_kms.ad b/carriers/car_kms.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/cooling.ad b/carriers/cooling.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/dumped_heat.ad b/carriers/dumped_heat.ad
@@ -1 +1,3 @@
 - infinite = false
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/freight_tonne_kms.ad b/carriers/freight_tonne_kms.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = red
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/hot_water.ad b/carriers/hot_water.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/light.ad b/carriers/light.ad
@@ -1,4 +1,5 @@
 - infinite = false
 - graphviz_color = purple
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(light, cost_per_mj)
diff --git a/carriers/loss.ad b/carriers/loss.ad
@@ -1,4 +1,5 @@
 - infinite = false
 - graphviz_color = gray46
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(loss, cost_per_mj)
diff --git a/carriers/not_defined.ad b/carriers/not_defined.ad
@@ -2,4 +2,5 @@
 - infinite = false
 - graphviz_color = gray46
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(not_defined, cost_per_mj)
diff --git a/carriers/other_ghg.ad b/carriers/other_ghg.ad
@@ -0,0 +1,2 @@
+- infinite = false
+- graphviz_color = black
diff --git a/carriers/passenger_kms.ad b/carriers/passenger_kms.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/shipping_kms.ad b/carriers/shipping_kms.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/solar_radiation.ad b/carriers/solar_radiation.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = gold2
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(solar_radiation, cost_per_mj)
diff --git a/carriers/solar_thermal.ad b/carriers/solar_thermal.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = green
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(solar_thermal, cost_per_mj)
diff --git a/carriers/truck_kms.ad b/carriers/truck_kms.ad
@@ -1,2 +1,4 @@
 - infinite = false
 - graphviz_color = purple
+
+~ co2_conversion_per_mj = 0.0
diff --git a/carriers/uranium_oxide.ad b/carriers/uranium_oxide.ad
@@ -3,4 +3,5 @@
 - mj_per_kg = 443000.0
 - graphviz_color = orange
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(uranium_oxide, cost_per_mj)
diff --git a/carriers/water.ad b/carriers/water.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = deepskyblue
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(water, cost_per_mj)
diff --git a/carriers/wind.ad b/carriers/wind.ad
@@ -2,4 +2,5 @@
 - infinite = true
 - graphviz_color = goldenrod2
 
+~ co2_conversion_per_mj = 0.0
 ~ cost_per_mj = CARRIER(wind, cost_per_mj)
diff --git a/config/direct_emissions_csv.yml b/config/direct_emissions_csv.yml
@@ -0,0 +1,225 @@
+# Configuration for the direct emissions CSV
+#
+# 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
+#
+# 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
+#   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
+
+
+schema:
+  - name: Group
+    type: node_group
+  - name: Sector
+  - name: Subsector
+  - name: Key
+    type: node_attribute
+    value: key
+  - name: GHG
+    type: node_attribute
+    value: ghg_carrier
+  - name: CO2_production
+    label: "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]"
+    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]"
+    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]"
+    type: node_attribute
+    value: direct_reporting_emissions_total_ghg_emissions
+    transform: "(value * 1e-6).round(6)"
+
+
+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
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		- infinite = false

		~ co2_conversion_per_mj = 0.0