Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
6c82e32
Add simple emissions group to specified nodes in the buildings sector…
louispt1 Apr 24, 2026
3190557
Add crude oil edge group to buildings sector and emissions to buildin…
louispt1 Apr 29, 2026
c774f1c
Add emissions.csv (example) to nl2019 and nl2023
louispt1 Apr 30, 2026
b3c441a
Add other_ghg carrier
louispt1 Apr 30, 2026
0c4c250
Add other_ghg to carriers.csv for nl2019 and nl2023
louispt1 Apr 30, 2026
6f5915f
Extend emissions group to rest of buildings sector
kndehaan Apr 28, 2026
460d5e0
Fix which nodes have the emissions group
louispt1 Apr 30, 2026
de226a1
Correction in carriers.csv files
kndehaan May 1, 2026
a202bf7
Adjust molecule node to query EMISSIONS with underscores
louispt1 May 1, 2026
a7e8a05
Add co2_conversion_per_mj attribute to other_ghg
kndehaan May 1, 2026
cbe6fc4
Convert emissions.csv values to kton
kndehaan May 1, 2026
7d8abfe
Add dataset value molecule nodes with emissions groups
kndehaan May 4, 2026
c477cb9
Bug fix molecule node positions
kndehaan May 4, 2026
95d1fb7
Omit co2 conversion and cost attribute for other_ghg
kndehaan May 5, 2026
c727bda
Emissions groups added to Building sector nodes
kndehaan May 5, 2026
88d2ce7
Add emissions node and edge groups to sector Agriculture
kndehaan May 5, 2026
7672310
Add emissions node groups for sector Other
kndehaan May 5, 2026
c4f6743
Add emissions and edge node groups for sector Households
kndehaan May 5, 2026
0bd9af6
Add emissions groups for sector National transport
kndehaan May 5, 2026
a38a04a
Update molecule node name to transport
kndehaan May 5, 2026
f6e8f43
Undo added co2_conversion_per_mj attribute to kms carriers
kndehaan May 5, 2026
5ded374
Add emissions groups for sector International transport
kndehaan May 5, 2026
316c9e8
Rename molecule nodes to bunkers
kndehaan May 5, 2026
18b1566
Molecule node positions
kndehaan May 5, 2026
8d81730
Add co2_converison_per_mj to carrier files
kndehaan May 6, 2026
f8e7d17
Omit unused attribute from other_ghg carrier
kndehaan May 6, 2026
864d932
Add emissions groups to households final demand network gas
kndehaan May 7, 2026
f82fc3f
Add edge group for crude oil mix and node groups for emissions includ…
robindesmit-quintel May 7, 2026
d831e20
Add emissions group to energy electricity and heat production nodes
kndehaan May 7, 2026
a6b5348
Add emissions groups to Energy fuels production nodes
kndehaan May 8, 2026
e8d02be
Omit distribution and some other nodes from emissions groups
kndehaan May 8, 2026
228632f
Add emission groups to energy node in sector Industry
robindesmit-quintel May 8, 2026
061a59b
Add emission groups to extra energy nodes in sector Industry
robindesmit-quintel May 8, 2026
9a55c43
Improve indentation
kndehaan May 8, 2026
a5af83f
Add emission groups to energy nodes in industry, subcategory electric…
robindesmit-quintel May 8, 2026
136fdab
Update emission groups of energy nodes industry_useful_demand_for_oth…
robindesmit-quintel May 8, 2026
8d9896f
Add missing emission groups to extra energy nodes in sector Industry
robindesmit-quintel May 8, 2026
428ad20
Add emission groups to energy nodes in sector energy, hydrogen_produc…
robindesmit-quintel May 8, 2026
50bac2d
Add emission groups to 2 extra energy nodes in sector energy, hydroge…
robindesmit-quintel May 8, 2026
9f30c9a
Rake import emissions task
louispt1 May 12, 2026
5e649d0
Split the non_specified lulucf emissions into emissions and removals
robindesmit-quintel May 13, 2026
e232dbe
Rename lulucf nodes and include lulucf emissions and removals in emis…
robindesmit-quintel May 13, 2026
6ff95ee
Add emission groups to external coupling nodes
robindesmit-quintel May 13, 2026
f981149
Update the positions of the lulucf molecule nodes.
robindesmit-quintel May 13, 2026
b5d621d
Update import emissions rake task to handle multi-level nl dataset im…
louispt1 May 13, 2026
b3ee488
Molecule node positions
kndehaan May 15, 2026
267cb26
Move DESC inside task for import:emissions rake
louispt1 May 18, 2026
d04a523
Add emissions.csv files to country datasets
kndehaan May 19, 2026
070788b
Add co2_utilisation_per_mj attribute to nodes
kndehaan May 19, 2026
9cec8e8
Omit double defined free_co2_factor
kndehaan May 19, 2026
21fa157
Update node groups
kndehaan May 20, 2026
8b791db
Update emissions csv files according to pipeline changes
kndehaan May 20, 2026
fb22c0c
Update the layout of groups in files with emission groups.
robindesmit-quintel May 21, 2026
e61941f
Update ccs_capture_rate for fischer tropsch non-biogenic waste
kndehaan May 21, 2026
4914e7a
Add emissions groups to utilisation molecule node
kndehaan May 21, 2026
a94a3ee
Change the name of emission group ccu_emitted to ccus_emitted
robindesmit-quintel May 21, 2026
7f50ada
Reapply emissions_energy_steel groups to cokes nodes
kndehaan May 21, 2026
7d1930f
Update ccs_capture_rate value for Fischer Tropsch and Methanol synthe…
robindesmit-quintel May 21, 2026
68a1c5e
Add emissions groups and ccus_captured groups to relevant molecule no…
robindesmit-quintel May 21, 2026
0e22131
Remove emissions_lulucf_removalsm group and replace with ccus_capture…
louispt1 May 21, 2026
b745435
Remove ccus_utilised group from utilisation molecule node
kndehaan May 21, 2026
a3c288e
Restore emissions_lulucf_removals grouop
kndehaan May 21, 2026
f182e6f
Correction in molecule node groups
kndehaan May 21, 2026
e3079d9
Fix spelling mistake in emissions group of domestic aviation.
robindesmit-quintel May 22, 2026
3d8fd65
Update the co2 utilisation of Fischer Tropsch molecule node.
robindesmit-quintel May 22, 2026
5856e95
More decimals in co2_utilization of Fischer Tropsch nodes.
robindesmit-quintel May 22, 2026
aaa5e76
Add molecule nodes for subcategories of food and paper.
robindesmit-quintel May 22, 2026
799f49d
Round to 6 decimals the co2 utilisation of Fischer Tropsch nodes.
robindesmit-quintel May 22, 2026
4bae05e
Update methanol synthesis utilisation conversion factor molecule nodes
kndehaan May 24, 2026
700d36f
Dummy values for industry food and paper non-energetic
kndehaan May 24, 2026
7589918
Exclude fishing from nl datasets
kndehaan May 24, 2026
42b4fee
Apply UNFCCC API source for emissions country datasets
kndehaan May 26, 2026
270eb16
Correct utilisation factor in fischer tropsch molecule nodes
kndehaan May 27, 2026
5aa783f
Split 2.H and reallocate fishing
kndehaan May 27, 2026
a97905d
Add emissions.csv dummy for eu
kndehaan May 27, 2026
becd987
Bump Atlas to quintel/atlas@515a69c
kndehaan May 27, 2026
ffcdcf9
Bump Atlas to quintel/atlas@b6e9aea
kndehaan May 29, 2026
2b3f743
Split refineries process emissions from 1.B
kndehaan May 29, 2026
620564b
Emissions CSV export (#3443)
aaccensi Jun 1, 2026
18f80a3
Fix in emissions config description
mabijkerk Jun 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -123,6 +123,7 @@ PLATFORMS

DEPENDENCIES
atlas!
ostruct
rake
refinery!
roo
Expand Down
1 change: 1 addition & 0 deletions carriers/ambient_cold.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = deepskyblue2

~ co2_conversion_per_mj = 0.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These attributes are now specified twice: once in their carrier files and once in the dataset files. Perhaps we can create an issue for this to remove this redundancy?

~ cost_per_mj = CARRIER(ambient_cold, cost_per_mj)
1 change: 1 addition & 0 deletions carriers/ambient_heat.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = firebrick2

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(ambient_heat, cost_per_mj)
2 changes: 2 additions & 0 deletions carriers/car_kms.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
2 changes: 2 additions & 0 deletions carriers/cooling.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
2 changes: 2 additions & 0 deletions carriers/dumped_heat.ad
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
- infinite = false

~ co2_conversion_per_mj = 0.0
2 changes: 2 additions & 0 deletions carriers/freight_tonne_kms.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = red

~ co2_conversion_per_mj = 0.0
2 changes: 2 additions & 0 deletions carriers/hot_water.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
1 change: 1 addition & 0 deletions carriers/light.ad
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(light, cost_per_mj)
1 change: 1 addition & 0 deletions carriers/loss.ad
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- infinite = false
- graphviz_color = gray46

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(loss, cost_per_mj)
1 change: 1 addition & 0 deletions carriers/not_defined.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = false
- graphviz_color = gray46

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(not_defined, cost_per_mj)
2 changes: 2 additions & 0 deletions carriers/other_ghg.ad
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- infinite = false
- graphviz_color = black
2 changes: 2 additions & 0 deletions carriers/passenger_kms.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
2 changes: 2 additions & 0 deletions carriers/shipping_kms.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
1 change: 1 addition & 0 deletions carriers/solar_radiation.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = gold2

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(solar_radiation, cost_per_mj)
1 change: 1 addition & 0 deletions carriers/solar_thermal.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = green

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(solar_thermal, cost_per_mj)
2 changes: 2 additions & 0 deletions carriers/truck_kms.ad
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- infinite = false
- graphviz_color = purple

~ co2_conversion_per_mj = 0.0
1 change: 1 addition & 0 deletions carriers/uranium_oxide.ad
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions carriers/water.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = deepskyblue

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(water, cost_per_mj)
1 change: 1 addition & 0 deletions carriers/wind.ad
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- infinite = true
- graphviz_color = goldenrod2

~ co2_conversion_per_mj = 0.0
~ cost_per_mj = CARRIER(wind, cost_per_mj)
207 changes: 207 additions & 0 deletions config/direct_emissions_csv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
# 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:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This data-exports seems to be alphabetically sorted on Group, does that makes sense? Isn't there given order that we can follow that matches more with UNFCC, EU, PBL...? Something like Energy, Industry, Transport, Households, Services, Agriculture...

- Group: emissions_agriculture_electricity_and_heat_production
Sector: Agriculture
Subsector: Electricity and heat production
- Group: emissions_agriculture_heating
Sector: Agriculture
Subsector: Heating
- Group: emissions_agriculture_non_specified
Sector: Agriculture
Subsector: Non-specified
- Group: emissions_buildings_appliances
Sector: Buildings
Subsector: Appliances
- Group: emissions_buildings_cooling
Sector: Buildings
Subsector: Cooling
- Group: emissions_buildings_non_specified
Sector: Buildings
Subsector: Non-specified
- Group: emissions_buildings_space_heating
Sector: Buildings
Subsector: Space heating
- Group: emissions_energy_ccus
Sector: Energy
Subsector: CCUS
- 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_fugitive_emissions
Sector: Energy
Subsector: Fugitive emissions
- Group: emissions_energy_hydrogen_production
Sector: Energy
Subsector: Hydrogen production
- Group: emissions_energy_methanol_production
Sector: Energy
Subsector: Methanol production
- Group: emissions_energy_steel
Sector: Energy
Subsector: Steel
- Group: emissions_households_cooking
Sector: Households
Subsector: Cooking
- Group: emissions_households_hot_water
Sector: Households
Subsector: Hot water
- Group: emissions_households_non_specified
Sector: Households
Subsector: Non-specified
- Group: emissions_households_space_heating
Sector: Households
Subsector: Space heating
- Group: emissions_industry_aluminium
Sector: Industry
Subsector: Aluminium
- Group: emissions_industry_chemicals
Sector: Industry
Subsector: Chemicals
- Group: emissions_industry_electricity_and_heat_production
Sector: Industry
Subsector: Electricity and heat production
- Group: emissions_industry_fertilizers
Sector: Industry
Subsector: Fertilizers
- Group: emissions_industry_food
Sector: Industry
Subsector: Food
- Group: emissions_industry_non_specified
Sector: Industry
Subsector: Non-specified
- Group: emissions_industry_other
Sector: Industry
Subsector: Other
- Group: emissions_industry_other_metals
Sector: Industry
Subsector: Other metals
- Group: emissions_industry_paper
Sector: Industry
Subsector: Paper
- Group: emissions_industry_refineries
Sector: Industry
Subsector: Refineries
- Group: emissions_industry_steel
Sector: Industry
Subsector: Steel
- Group: emissions_international_transport_international_aviation
Sector: International transport
Subsector: International aviation
- Group: emissions_international_transport_international_navigation
Sector: International transport
Subsector: International navigation
Comment on lines +154 to +159
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These values need to be dependent on the sliders settings bunkers_allocated_percentage_aviation and bunkers_allocated_percentage_shipping.

- Group: emissions_lulucf_emissions
Sector: LULUCF
Subsector: Emissions
- Group: emissions_lulucf_removals
Sector: LULUCF
Subsector: Removals
- Group: emissions_national_transport_buses
Sector: National transport
Subsector: Buses
- Group: emissions_national_transport_cars
Sector: National transport
Subsector: Cars
- Group: emissions_national_transport_domestic_aviation
Sector: National transport
Subsector: Domestic aviation
- Group: emissions_national_transport_domestic_navigation
Sector: National transport
Subsector: Domestic navigation
- Group: emissions_national_transport_motorcycles
Sector: National transport
Subsector: Motorcycles
- Group: emissions_national_transport_non_specified
Sector: National transport
Subsector: Non-specified
- Group: emissions_national_transport_trains
Sector: National transport
Subsector: Trains
- Group: emissions_national_transport_trucks
Sector: National transport
Subsector: Trucks
- Group: emissions_national_transport_vans
Sector: National transport
Subsector: Vans
- Group: emissions_other_heating
Sector: Other
Subsector: Heating
- Group: emissions_other_indirect_emissions
Sector: Other
Subsector: Indirect emissions
- Group: emissions_other_non_specified
Sector: Other
Subsector: Non-specified
- Group: emissions_other_other_transportation
Sector: Other
Subsector: Other transportation
- Group: emissions_waste_non_specified
Sector: Waste
Subsector: Non-specified
Loading