Skip to content

Commit

Permalink
CTM-ETM additional carriers (#4351)
Browse files Browse the repository at this point in the history
* Sliders for external coupling inputs added transformation carriers

* Adding missing share group in external refineries external coupling

* Adding flows to and from biofuels in biomass sankey:

* Redirecting industry transformation flows in biomass sankey

---------

Co-authored-by: Kyra de Haan <[email protected]>
  • Loading branch information
kaskranenburgQ and kndehaan authored Oct 30, 2024
1 parent a45dcaf commit 70d0114
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 3 deletions.
7 changes: 5 additions & 2 deletions app/assets/javascripts/d3/sankey.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ D3.sankey =
{left: 'wet', right: 'biofuels', gquery: 'wet_biomass_to_biofuels_in_biomass_sankey', color: '#38ada9'},
{left: 'wet', right: 'export', gquery: 'wet_biomass_to_export_in_biomass_sankey', color: '#38ada9'},
{left: 'oily', right: 'biofuels', gquery: 'oily_biomass_to_biofuels_in_biomass_sankey', color: '#f9ca24'},
{left: 'oily', right: 'export', gquery: 'oily_biomass_to_export_in_biomass_sankey', color: '#f9ca24'},
{left: 'dry', right: 'greengas', gquery: 'dry_biomass_to_greengas_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'households', gquery: 'dry_biomass_to_households_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'buildings', gquery: 'dry_biomass_to_buildings_in_biomass_sankey', color: '#009432'},
Expand All @@ -555,11 +554,12 @@ D3.sankey =
{left: 'dry', right: 'agriculture', gquery: 'dry_biomass_to_agriculture_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'other', gquery: 'dry_biomass_to_other_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'bunkers', gquery: 'dry_biomass_to_bunkers_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'export', gquery: 'dry_biomass_to_export_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'export', gquery: 'dry_biomass_to_export_i3n_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'losses', gquery: 'dry_biomass_to_losses_in_biomass_sankey', color: '#DCDCDC'},
{left: 'dry', right: 'biofuels', gquery: 'dry_biomass_to_biofuels_in_biomass_sankey', color: '#009432'},
{left: 'dry', right: 'non_biogenic_carriers_demand',gquery: 'dry_biomass_to_non_biogenic_carriers_in_biomass_sankey', color: '#009432'},
{left: 'non_biogenic_carriers_supply', right: 'greengas', gquery: 'non_biogenic_carriers_to_greengas_in_biomass_sankey', color: '#8c564b'},
{left: 'non_biogenic_carriers_supply', right: 'biofuels', gquery: 'non_biogenic_carriers_to_biofuels_in_biomass_sankey', color: '#8c564b'},
{left: 'biogas', right: 'losses', gquery: 'biogas_to_losses_in_biomass_sankey', color: '#DCDCDC'},
{left: 'biogas', right: 'non_biogenic_carriers_demand',gquery: 'biogas_to_non_biogenic_carriers_in_biomass_sankey', color: '#ffff99'},
{left: 'greengas', right: 'households', gquery: 'greengas_to_households_in_biomass_sankey', color: '#A3CB38'},
Expand All @@ -572,12 +572,15 @@ D3.sankey =
{left: 'greengas', right: 'export', gquery: 'greengas_to_export_in_biomass_sankey', color: '#A3CB38'},
{left: 'greengas', right: 'losses', gquery: 'greengas_to_losses_in_biomass_sankey', color: '#DCDCDC'},
{left: 'greengas', right: 'non_biogenic_carriers_demand',gquery: 'greengas_to_non_biogenic_carriers_in_biomass_sankey', color: '#DCDCDC'},
{left: 'greengas', right: 'biofuels', gquery: 'greengas_to_biofuels_in_biomass_sankey', color: '#DCDCDC'},
{left: 'biofuels', right: 'greengas', gquery: 'biofuels_to_greengas_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'households', gquery: 'biofuels_to_households_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'buildings', gquery: 'biofuels_to_buildings_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'transport', gquery: 'biofuels_to_transport_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'industry', gquery: 'biofuels_to_industry_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'agriculture', gquery: 'biofuels_to_agriculture_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'bunkers', gquery: 'biofuels_to_bunkers_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'export', gquery: 'biofuels_to_export_in_biomass_sankey', color: '#00b894'},
{left: 'biofuels', right: 'losses', gquery: 'biofuels_to_losses_in_biomass_sankey', color: '#DCDCDC'},
{left: 'biofuels', right: 'non_biogenic_carriers_demand',gquery: 'biofuels_to_non_biogenic_carriers_in_biomass_sankey', color: '#00b894'},
{left: 'biogenic_waste', right: 'non_biogenic_carriers_demand',gquery: 'biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey', color: '#006266'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,14 @@
share_group: external_coupling_chemical_fertilizers_transformation_input
interface_group: external_coupling_industry_chemical_fertilizers_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_input_share
step_value: 0.1
unit: '%'
position: 460
slide_key: demand_industry_chemical_fertilizers
share_group: external_coupling_chemical_fertilizers_transformation_input
interface_group: external_coupling_industry_chemical_fertilizers_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_natural_gas_output_share
step_value: 0.1
unit: '%'
Expand Down Expand Up @@ -335,6 +343,30 @@
share_group: external_coupling_chemical_fertilizers_transformation_output
interface_group: external_coupling_industry_chemical_fertilizers_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_kerosene_output_share
step_value: 0.1
unit: '%'
position: 570
slide_key: demand_industry_chemical_fertilizers
share_group: external_coupling_chemical_fertilizers_transformation_output
interface_group: external_coupling_industry_chemical_fertilizers_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_output_share
step_value: 0.1
unit: '%'
position: 580
slide_key: demand_industry_chemical_fertilizers
share_group: external_coupling_chemical_fertilizers_transformation_output
interface_group: external_coupling_industry_chemical_fertilizers_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_biodiesel_output_share
step_value: 0.1
unit: '%'
position: 590
slide_key: demand_industry_chemical_fertilizers
share_group: external_coupling_chemical_fertilizers_transformation_output
interface_group: external_coupling_industry_chemical_fertilizers_transformation_output
coupling_icon: true
- key: external_coupling_industry_chemical_fertilizers_p2h_wtp
step_value: 0.1
unit: "€/MWh"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,14 @@
share_group: external_coupling_chemical_other_transformation_input
interface_group: external_coupling_industry_chemical_other_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_input_share
step_value: 0.1
unit: '%'
position: 460
slide_key: demand_industry_chemical_other
share_group: external_coupling_chemical_other_transformation_input
interface_group: external_coupling_industry_chemical_other_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_other_transformation_external_coupling_node_natural_gas_output_share
step_value: 0.1
unit: '%'
Expand Down Expand Up @@ -351,6 +359,30 @@
share_group: external_coupling_chemical_other_transformation_output
interface_group: external_coupling_industry_chemical_other_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_kerosene_output_share
step_value: 0.1
unit: '%'
position: 570
slide_key: demand_industry_chemical_other
share_group: external_coupling_chemical_other_transformation_output
interface_group: external_coupling_industry_chemical_other_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_output_share
step_value: 0.1
unit: '%'
position: 580
slide_key: demand_industry_chemical_other
share_group: external_coupling_chemical_other_transformation_output
interface_group: external_coupling_industry_chemical_other_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_other_transformation_external_coupling_node_biodiesel_output_share
step_value: 0.1
unit: '%'
position: 590
slide_key: demand_industry_chemical_other
share_group: external_coupling_chemical_other_transformation_output
interface_group: external_coupling_industry_chemical_other_transformation_output
coupling_icon: true
- key: external_coupling_industry_chemical_other_p2h_wtp
step_value: 0.1
unit: "€/MWh"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,14 @@
share_group: external_coupling_chemical_refineries_transformation_input
interface_group: external_coupling_industry_chemical_refineries_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_input_share
step_value: 0.1
unit: '%'
position: 460
slide_key: demand_industry_chemical_refineries
share_group: external_coupling_chemical_refineries_transformation_input
interface_group: external_coupling_industry_chemical_refineries_transformation_input
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_natural_gas_output_share
step_value: 0.1
unit: '%'
Expand Down Expand Up @@ -252,7 +260,7 @@
unit: '%'
position: 445
slide_key: demand_industry_chemical_refineries
share_group: ''
share_group: external_coupling_chemical_refineries_transformation_output
interface_group: external_coupling_industry_chemical_refineries_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_loss_output_share
Expand All @@ -279,6 +287,30 @@
share_group: external_coupling_chemical_refineries_transformation_output
interface_group: external_coupling_industry_chemical_refineries_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_kerosene_output_share
step_value: 0.1
unit: '%'
position: 570
slide_key: demand_industry_chemical_refineries
share_group: external_coupling_chemical_refineries_transformation_output
interface_group: external_coupling_industry_chemical_refineries_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_output_share
step_value: 0.1
unit: '%'
position: 580
slide_key: demand_industry_chemical_refineries
share_group: external_coupling_chemical_refineries_transformation_output
interface_group: external_coupling_industry_chemical_refineries_transformation_output
coupling_icon: true
- key: external_coupling_energy_chemical_refineries_transformation_external_coupling_node_biodiesel_output_share
step_value: 0.1
unit: '%'
position: 590
slide_key: demand_industry_chemical_refineries
share_group: external_coupling_chemical_refineries_transformation_output
interface_group: external_coupling_industry_chemical_refineries_transformation_output
coupling_icon: true
- key: external_coupling_industry_chemical_refineries_p2h_wtp
step_value: 0.1
unit: "€/MWh"
Expand Down
48 changes: 48 additions & 0 deletions config/locales/interface/input_elements/en_external_coupling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,54 @@ en:
title: Hydrogen
description: |
Share of hydrogen in input of industrial transformation
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-oil
description: |
Share of bio-oil in input of industrial transformation
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-oil
description: |
Share of bio-oil in input of industrial transformation
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-oil
description: |
Share of bio-oil in input of industrial transformation
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-oil
description: |
Share of bio-oil in output of industrial transformation
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-oil
description: |
Share of bio-oil in output of industrial transformation
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-oil
description: |
Share of bio-oil in output of industrial transformation
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosene
description: |
Share of biokerosene in output of industrial transformation
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosene
description: |
Share of biokerosene in output of industrial transformation
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosene
description: |
Share of biokerosene in output of industrial transformation
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Share of biodiesel in output of industrial transformation
external_coupling_energy_chemical_other_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Share of biodiesel in output of industrial transformation
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Share of biodiesel in output of industrial transformation
external_coupling_industry_chemical_fertilizers_non_energetic_hydrogen_share:
title: Hydrogen
description: |
Expand Down
48 changes: 48 additions & 0 deletions config/locales/interface/input_elements/nl_external_coupling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,54 @@ nl:
title: Waterstof
description: |
Aandeel van waterstof in de input van industriële transformatie
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de input van industriële transformatie
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de input van industriële transformatie
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_input_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de input van industriële transformatie
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de output van industriële transformatie
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de output van industriële transformatie
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_oil_output_share:
title: Bio-olie
description: |
Aandeel van bio-olie in de output van industriële transformatie
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosine
description: |
Aandeel van biokerosine in de output van industriële transformatie
external_coupling_energy_chemical_other_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosine
description: |
Aandeel van biokerosine in de output van industriële transformatie
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_bio_kerosene_output_share:
title: Biokerosine
description: |
Aandeel van biokerosine in de output van industriële transformatie
external_coupling_energy_chemical_fertilizers_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Aandeel van biodiesel in de output van industriële transformatie
external_coupling_energy_chemical_other_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Aandeel van biodiesel in de output van industriële transformatie
external_coupling_energy_chemical_refineries_transformation_external_coupling_node_biodiesel_output_share:
title: Biodiesel
description: |
Aandeel van biodiesel in de output van industriële transformatie
external_coupling_industry_chemical_fertilizers_non_energetic_hydrogen_share:
title: Waterstof
description: |
Expand Down

0 comments on commit 70d0114

Please sign in to comment.