Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
622c413
Add inputs to final demand transport and chemical industry
kaskranenburgQ Aug 21, 2025
4843097
Update external coupling inputs with bionaphtha
kaskranenburgQ Aug 21, 2025
d150f07
Move transport fuels section to demand
kndehaan Aug 28, 2025
1446d5b
Add domestic aviation kerosene mix
kndehaan Aug 29, 2025
f7ae772
Apply interface groups to existing transport fuel slides
kndehaan Aug 29, 2025
6be6989
Update node references to plane using kerosene mix
kndehaan Aug 29, 2025
cec7944
Add methanol mix incl inputs to domestic navigation
kndehaan Aug 29, 2025
4dc8fef
Locales for transport fuels
kndehaan Aug 29, 2025
968f5ab
Add methanol mixer to international navigation
kndehaan Aug 29, 2025
6f60715
Rename plane kerosene to kerosene mix
kndehaan Aug 29, 2025
af68592
Move transport fuel sliders to demand locales file
kndehaan Aug 29, 2025
06d3ab7
Locales transport and chemical industry
kndehaan Aug 29, 2025
cc3343b
Add input external coupling bionaphtha heater in chemical other sector
claudiavalkenier Sep 3, 2025
63a76b0
Update final demand charts with new carriers
kndehaan Sep 4, 2025
74fa57d
Rename fuel production section to fuel extraction
kndehaan Aug 28, 2025
98ca429
Setup of new slide Liquid fuels
kndehaan Aug 28, 2025
6f63155
Rename locales file fuel production to fuel extaction
kndehaan Aug 28, 2025
f598723
Update fuel production section
kndehaan Aug 28, 2025
7fc70e4
Apply group headers to inputs
kndehaan Aug 29, 2025
4003526
Add input for potential of non-biogenic waste
kaskranenburgQ Sep 1, 2025
3941ce0
Placing fossil refinery in supply sector
kaskranenburgQ Sep 1, 2025
82e62ae
Remove replaced methanol and kerosene inputs
kaskranenburgQ Sep 1, 2025
0c9eb22
Alter naming of processes slides
kaskranenburgQ Sep 1, 2025
8704f21
Add baseload export for new carriers
kaskranenburgQ Sep 1, 2025
462bef9
Rename potential of biomass section
kndehaan Sep 2, 2025
f309fa8
Update labels
kndehaan Sep 2, 2025
1338c1e
Move dispatchable kerosene slider to liquids production section
kndehaan Sep 2, 2025
a3b4c7b
Various locales and slide updates
kndehaan Sep 2, 2025
b2cc30e
Update labels
kndehaan Sep 2, 2025
f99536e
Update slide text CCS
kndehaan Sep 2, 2025
a051151
Add related nodes to process inputs
kndehaan Sep 2, 2025
2aa777f
Add locales for presentation_group
kndehaan Sep 2, 2025
d0218ec
Rename pyrolysis oil fractionation nodes
kndehaan Sep 3, 2025
303531e
Update nodes download source with new NSA
claudiavalkenier Sep 3, 2025
4fd89db
Rename fractionation process nodes'
kndehaan Sep 3, 2025
ddc8818
Update external coupling inputs conifguration
kndehaan Sep 8, 2025
908c92b
Update refinery sankey to include new processes (excluding pyrolysis)
kaskranenburgQ Sep 9, 2025
de3321a
New section Liquid fuels costs including inputs
kndehaan Sep 9, 2025
b7d7b50
Remove outdated cost inputs of CO2 utilisation and update slide text
kndehaan Sep 9, 2025
4d10ab4
Add liquid fuels Sankey as output element of liquid fuels slides
kndehaan Sep 9, 2025
e6d8ad9
Inputs for costs of bio-ethanol production and locales
kndehaan Sep 10, 2025
53f771c
Update liquid fuels sankey
kaskranenburgQ Sep 10, 2025
b9cfd95
Icon for liquid fuels sections
kndehaan Sep 10, 2025
8eba24e
Rename refinery where necessity
kaskranenburgQ Sep 10, 2025
0c2da6c
Update kerosene mix mekko
kaskranenburgQ Sep 10, 2025
2310a19
Update co2-sankey
kaskranenburgQ Sep 10, 2025
45d68c2
Update co2_mekko
kaskranenburgQ Sep 10, 2025
09eabc0
Update slider label en text of dispatchable kerosene WTP
kndehaan Sep 10, 2025
1d4bf09
Various improvements to liquid fuels sankey'
kndehaan Sep 10, 2025
813a3e6
Update energy use of ccus chart
kaskranenburgQ Sep 11, 2025
fd1beb2
Add pyrolysis and pyrolysis fractionation flows to liquid fuels sankey
kaskranenburgQ Sep 11, 2025
be73a11
Fix labeling in CCUS charts
kaskranenburgQ Sep 11, 2025
afb61a5
Split dispatchable and must-run synthetic kerosene produciton in kero…
kaskranenburgQ Sep 11, 2025
e5607ec
Remove external coupling inputs for synthetic methanol and kerosene
kndehaan Sep 11, 2025
395aea3
Add methanol baseload export input
kaskranenburgQ Sep 12, 2025
303b0cb
Add costs for liquid fuels
kaskranenburgQ Sep 12, 2025
3c479ca
Update user output and locales
kndehaan Sep 12, 2025
99cd377
Update industrial steam network mekko
kaskranenburgQ Sep 12, 2025
99f8a62
Locales
kndehaan Sep 12, 2025
0c6cf80
Change labels in chart Feedstock for biogenic energy carriers
claudiavalkenier Sep 15, 2025
2cc3249
Update refinery sankey
kaskranenburgQ Sep 15, 2025
01414ff
Update liquid fuels sankey
kaskranenburgQ Sep 15, 2025
3179350
Update biomass Sankey
kndehaan Sep 16, 2025
aeb5e59
Update biomass Sankey
kndehaan Sep 16, 2025
a663917
Update kerosene mekko queries
kndehaan Sep 16, 2025
476c919
Update slider texts of (bio)methanol and (bio)kerosene sliders, and …
claudiavalkenier Sep 17, 2025
0ebf482
Update slider texts of Supply of Biomass and update slide texts
claudiavalkenier Sep 17, 2025
137add7
Minor update of slider texts of (non)biogenic waste
claudiavalkenier Sep 17, 2025
ad6b82a
Renaming of front-end inputs
claudiavalkenier Sep 17, 2025
b91e7b5
Update biomass sankey flows
kndehaan Sep 17, 2025
1d6999f
Locales
kndehaan Sep 17, 2025
c62f88d
Revert old slider texts in Biomass sector, except for potentials of b…
claudiavalkenier Sep 19, 2025
a28c207
Revert old slider texts in Biomass sector, except for potentials of b…
claudiavalkenier Sep 19, 2025
0f46a17
Locales
kndehaan Sep 22, 2025
57c6447
Merge pyrolysis and fractionation processes in Sankey queries
kndehaan Sep 23, 2025
808d452
Corrections in liquid fuels Sankey
kndehaan Sep 23, 2025
a9aa878
Update primary energy demand chart
kndehaan Sep 23, 2025
e67b326
Update energy flow overview sankey
kaskranenburgQ Sep 23, 2025
b6da344
Update energy flow overview sankey
kaskranenburgQ Sep 23, 2025
813c9a6
Remove heat supply pyrolysis oil in Industrial steam network chart
claudiavalkenier Sep 24, 2025
d4e162e
Change setup of pyrolysis inputs
kndehaan Sep 24, 2025
6c7ada0
Update front-end labels
claudiavalkenier Sep 24, 2025
8f9ba2a
Minor update front-end labels
claudiavalkenier Sep 24, 2025
89313df
Update labels
kndehaan Sep 24, 2025
c3ce832
Update labels
kndehaan Sep 24, 2025
9146a36
Update flows for industry transformation
kaskranenburgQ Sep 24, 2025
c264d41
Locales
kndehaan Sep 25, 2025
bc73e57
Update Sankey
kndehaan Sep 26, 2025
fe36ac9
Update kerosene mekko
kaskranenburgQ Sep 29, 2025
c657c93
Update hydrogen charts for carbon modelling
kaskranenburgQ Sep 30, 2025
001a389
Update sankey energy overview
kaskranenburgQ Sep 30, 2025
7a5badc
Update energy flow overview sankey
kaskranenburgQ Sep 30, 2025
ed363ad
Update locales
kndehaan Sep 30, 2025
7ed7e2f
Update slide and slider texts
kndehaan Oct 1, 2025
744758b
Locales changes
kndehaan Oct 1, 2025
c8e23dd
Corrections in rebase
kndehaan Oct 2, 2025
d1dea81
Write Dutch slider texts
claudiavalkenier Oct 2, 2025
7d6bfa1
Locales
kndehaan Oct 3, 2025
9314076
Visual improvement Sankey chart
kndehaan Oct 7, 2025
9ffe0db
Add missing slide text
kndehaan Oct 7, 2025
e512e48
Update liquid fuels sankey
kndehaan Oct 7, 2025
774ea53
Update biomass sankey
kaskranenburgQ Oct 8, 2025
f29b547
Sankey visual improvement
kndehaan Oct 8, 2025
977f68f
Update charts with network gas input of processes
kndehaan Oct 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/sidebar/liquid_fuels.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
540 changes: 376 additions & 164 deletions app/assets/javascripts/d3/sankey.coffee

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/javascripts/lib/models/chart.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class @Chart extends Backbone.Model
when 'scatter'
if d3_support then D3.scatter.View else ScatterChartView
when 'sankey' then D3.sankey.View
when 'refinery' then D3.sankey.View
when 'liquid_fuels' then D3.sankey.View
when 'target_bar' then D3.target_bar.View
when 'cost_capacity_bar' then D3.cost_capacity_bar.View
when 'd3' then @d3_view_factory()
Expand Down
8 changes: 5 additions & 3 deletions app/assets/stylesheets/_sidebar-icons.sass
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
@include sidebar-icon(agriculture)
#transport
@include sidebar-icon(transport)
#transport_fuels
@include sidebar-icon(transport)
#other
@include sidebar-icon(other)
#export_energy
Expand All @@ -42,6 +40,8 @@
@include sidebar-icon(renew_heat)
#costs_hydrogen
@include sidebar-icon(hydrogen)
#costs_fuel_production
@include sidebar-icon(liquid_fuels)
#wacc
@include sidebar-icon(wacc)
#costs_flexibility
Expand All @@ -66,9 +66,11 @@
@include sidebar-icon(fuels)
#other_fuels
@include sidebar-icon(fuels)
#fuel_production
@include sidebar-icon(liquid_fuels)
#biomass
@include sidebar-icon(biomass)
#fuel_production
#fuel_extraction
@include sidebar-icon(curves)
#hydrogen
@include sidebar-icon(hydrogen)
Expand Down
2 changes: 1 addition & 1 deletion app/views/content/whats_new.en.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ ___
# December 2022

## Bio-ethanol for inland shipping
Currently, ships for inland waterway transport are often fitted with conventional diesel engines. Advanced multifuel diesel engines are being developed that can run on a range of fuels, including bio-ethanol. You can set the share of diesel engines in *Demand → Transport* → **[Freight transport](/scenario/demand/transport_freight_transport/domestic-navigation-technology)**. You can then add bio-ethanol by changing the fuel mix of these engines in *Supply → Transport fuels* → **[Domestic navigation](/scenario/supply/transport_fuels/domestic-navigation)**.
Currently, ships for inland waterway transport are often fitted with conventional diesel engines. Advanced multifuel diesel engines are being developed that can run on a range of fuels, including bio-ethanol. You can set the share of diesel engines in *Demand → Transport* → **[Freight transport](/scenario/demand/transport_freight_transport/domestic-navigation-technology)**. You can then add bio-ethanol by changing the fuel mix of these engines in *Supply → Transport fuels* → **[Domestic navigation](/scenario/demand/transport_fuels/domestic-navigation)**.

-> ![](/assets/pages/whats_new/bio_ethanol_inland_shipping_en.png) <-

Expand Down
2 changes: 1 addition & 1 deletion app/views/content/whats_new.nl.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ ___

## Bio-ethanol voor binnenvaart
Binnenvaartschepen zijn tegenwoordig typisch uitgerust met conventionele dieselmotoren. Er zijn geavanceerde multi-fuelmotoren in ontwikkeling die verscheidene brandstoffen kunnen gebruiken, waaronder ook bio-ethanol. Je kunt het aandeel dieselmotoren instellen bij *Vraag → Vrachtvervoer* → **[Technologie binnenvaartschepen](/scenario/demand/transport_freight_transport/domestic-navigation-technology)**.
Vervolgens kun je bio-ethanol toevoegen door de brandstofmix aan te passen in *Aanbod → Transportbrandstoffen* → **[Binnenlandse scheepvaart](/scenario/supply/transport_fuels/domestic-navigation)**.
Vervolgens kun je bio-ethanol toevoegen door de brandstofmix aan te passen in *Aanbod → Transportbrandstoffen* → **[Binnenlandse scheepvaart](/scenario/demand/transport_fuels/domestic-navigation)**.

-> ![](/assets/pages/whats_new/bio_ethanol_inland_shipping_nl.png) <-

Expand Down
11 changes: 0 additions & 11 deletions config/interface/input_elements/costs_co2_utilisation.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
---
- key: investment_costs_fischer_tropsch
interface_group: costs_fischer_tropsch
step_value: 1.0
unit: "%"
position: 100
slide_key: costs_fuel_production_processes
- key: om_costs_fischer_tropsch
interface_group: costs_fischer_tropsch
step_value: 1.0
unit: "%"
position: 110
slide_key: costs_fuel_production_processes
- key: investment_costs_methanol_synthesis
interface_group: costs_methanol_synthesis
step_value: 1.0
unit: "%"
position: 120
slide_key: costs_fuel_production_processes
- key: om_costs_methanol_synthesis
interface_group: costs_methanol_synthesis
step_value: 1.0
unit: "%"
position: 130
slide_key: costs_fuel_production_processes
- key: investment_costs_fractionation_pyrolysis_oil
interface_group: costs_fractionation_pyrolysis_oil
step_value: 1.0
unit: "%"
position: 140
slide_key: costs_fuel_production_processes
- key: om_costs_fractionation_pyrolysis_oil
interface_group: costs_fractionation_pyrolysis_oil
step_value: 1.0
unit: "%"
position: 150
slide_key: costs_fuel_production_processes
- key: investment_costs_pyrolysis
interface_group: costs_pyrolysis
step_value: 1.0
unit: "%"
position: 160
slide_key: costs_fuel_production_processes
- key: om_costs_pyrolysis
interface_group: costs_pyrolysis
step_value: 1.0
unit: "%"
position: 170
slide_key: costs_fuel_production_processes
- key: investment_costs_hvo
interface_group: costs_hvo
step_value: 1.0
unit: "%"
position: 180
slide_key: costs_fuel_production_processes
- key: om_costs_hvo
interface_group: costs_hvo
step_value: 1.0
unit: "%"
position: 190
slide_key: costs_fuel_production_processes
- key: investment_costs_bio_ethanol
interface_group: costs_bio_ethanol
step_value: 1.0
unit: "%"
position: 200
slide_key: costs_fuel_production_processes
- key: om_costs_bio_ethanol
interface_group: costs_bio_ethanol
step_value: 1.0
unit: "%"
position: 210
slide_key: costs_fuel_production_processes
51 changes: 51 additions & 0 deletions config/interface/input_elements/demand_export_energy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,19 @@
interface_group: oil_products
position: 55
slide_key: demand_export_energy
- key: volume_of_baseload_export_pyrolysis_oil
step_value: 0.1
unit: "PJ"
interface_group: oil_products
position: 58
slide_key: demand_export_energy

- key: volume_of_baseload_export_methanol
step_value: 0.1
unit: "PJ"
interface_group: oil_products
position: 59
slide_key: demand_export_energy

- key: volume_of_baseload_export_network_gas
step_value: 0.1
Expand Down Expand Up @@ -98,3 +111,41 @@
interface_group: hydrogen_carriers
position: 80
slide_key: demand_export_energy


- key: volume_of_baseload_export_bio_ethanol
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 100
slide_key: demand_export_energy
- key: volume_of_baseload_export_biomethanol
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 105
slide_key: demand_export_energy
- key: volume_of_baseload_export_bio_kerosene
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 110
slide_key: demand_export_energy
- key: volume_of_baseload_export_bio_pyrolysis_oil
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 115
slide_key: demand_export_energy
- key: volume_of_baseload_export_biodiesel
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 120
slide_key: demand_export_energy
- key: volume_of_baseload_export_bionaphtha
step_value: 0.1
unit: "PJ"
interface_group: biomass_products
position: 125
slide_key: demand_export_energy
45 changes: 37 additions & 8 deletions config/interface/input_elements/demand_industry_chemical_other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,60 +42,68 @@
related_node: industry_chemicals_other_burner_naphtha
position: 210
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_burner_bionaphtha_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_burner_bionaphtha
position: 215
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_burner_coal_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_burner_coal
position: 215
position: 220
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_burner_wood_pellets_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_burner_wood_pellets
position: 220
position: 225
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_burner_hydrogen_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_burner_hydrogen
position: 225
position: 230
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_heater_electricity_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_heater_electricity
position: 230
position: 235
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_steam_recompression_electricity_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_steam_recompression_electricity
position: 235
position: 240
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_heatpump_water_water_electricity_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
related_node: industry_chemicals_other_heatpump_water_water_electricity
position: 240
position: 245
slide_key: demand_industry_chemical_other
- key: industry_final_demand_for_chemical_other_steam_hot_water_share
share_group: chemical_other_heat
step_value: 0.1
unit: "%"
interface_group: heat_production
position: 245
position: 250
slide_key: demand_industry_chemical_other

- key: capacity_of_industry_chemicals_other_flexibility_p2h_electricity
Expand Down Expand Up @@ -141,10 +149,31 @@
interface_group: chemical_other_non_energetic
position: 420
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_coal_non_energetic_share
- key: industry_chemicals_other_bionaphtha_non_energetic_share
share_group: chemical_other_non_energetic
step_value: 0.1
unit: "%"
interface_group: chemical_other_non_energetic
position: 425
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_coal_non_energetic_share
share_group: chemical_other_non_energetic
step_value: 0.1
unit: "%"
interface_group: chemical_other_non_energetic
position: 430
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_methanol_non_energetic_share
share_group: chemical_other_non_energetic
step_value: 0.1
unit: "%"
interface_group: chemical_other_non_energetic
position: 435
slide_key: demand_industry_chemical_other
- key: industry_chemicals_other_biomethanol_non_energetic_share
share_group: chemical_other_non_energetic
step_value: 0.1
unit: "%"
interface_group: chemical_other_non_energetic
position: 440
slide_key: demand_industry_chemical_other
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
- key: transport_aviation_mixer_kerosene_kerosene_share
share_group: transport_kerosene_aviation
step_value: 0.1
unit: "%"
interface_group: kerosene_mix
position: 100
slide_key: demand_transport_domestic_aviation
- key: transport_aviation_mixer_kerosene_bio_kerosene_share
share_group: transport_kerosene_aviation
step_value: 0.1
unit: "%"
interface_group: kerosene_mix
position: 110
slide_key: demand_transport_domestic_aviation
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
- key: transport_plane_using_kerosene_share
- key: transport_plane_using_kerosene_mix_share
share_group: transport_aviation
step_value: 0.1
unit: "%"
position: 1
related_node: transport_plane_using_kerosene
related_node: transport_plane_using_kerosene_mix
slide_key: demand_transport_domestic_aviation_technology
- key: transport_plane_using_gasoline_share
share_group: transport_aviation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@
position: 5
related_node: transport_ship_using_ammonia
slide_key: demand_transport_domestic_navigation_technology
- key: transport_ship_using_methanol_mix_share
share_group: transport_marine
step_value: 0.1
unit: "%"
position: 6
related_node: transport_ship_using_methanol_mix
slide_key: demand_transport_domestic_navigation_technology
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
step_value: 0.1
unit: "%"
position: 1
slide_key: supply_transport_international_aviation
interface_group: kerosene_mix
slide_key: demand_transport_international_aviation
- key: bunkers_plane_using_bio_kerosene_share
share_group: supply_bunkers_aviation
step_value: 0.1
unit: "%"
position: 2
slide_key: supply_transport_international_aviation
interface_group: kerosene_mix
slide_key: demand_transport_international_aviation
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@
unit: "%"
position: 5
slide_key: demand_transport_international_navigation_technology
- key: bunkers_ship_using_methanol_mix_share
share_group: bunkers_shipping
step_value: 0.1
unit: "%"
position: 6
slide_key: demand_transport_international_navigation_technology
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
- key: bunkers_ship_using_methanol_share
share_group: methanol_mix_navigation
step_value: 0.1
unit: "%"
position: 1
interface_group: methanol_mix
slide_key: demand_transport_international_shipping
- key: bunkers_ship_using_biomethanol_share
share_group: methanol_mix_navigation
step_value: 0.1
unit: "%"
position: 2
interface_group: methanol_mix
slide_key: demand_transport_international_shipping
Loading