diff --git a/app/assets/javascripts/d3/sankey.coffee b/app/assets/javascripts/d3/sankey.coffee index 4334b7442..d7d9ec11e 100644 --- a/app/assets/javascripts/d3/sankey.coffee +++ b/app/assets/javascripts/d3/sankey.coffee @@ -25,11 +25,14 @@ D3.sankey = {id: 'extracted_oil', column: 0, label: 'extracted_oil', color: '#8c564b'}, {id: 'imported_oil', column: 0, label: 'imported_oil', color: '#8c564b'}, {id: 'oil_products', column: 0, label: 'oil_products', color: '#8c564b'}, + {id: 'imported_methanol', column: 0, label: 'imported_methanol', color: '#FF8C8C'}, {id: 'electricity', column: 1, label: 'electricity', color: '#1f77b4'}, {id: 'heat', column: 1, label: 'heat', color: '#cc0000'}, {id: 'hydrogen', column: 1, label: 'hydrogen', color: '#87cfeb'}, {id: 'oil_and_oil_products', column: 1, label: 'oil_and_oil_products', color: '#8c564b'}, + {id: 'waste_mix', column: 1, label: 'waste_mix', color: '#CE7013'}, + {id: 'methanol', column: 1, label: 'methanol', color: '#FF8C8C'}, {id: 'agriculture', column: 2, label: 'agriculture', color: '#332288'}, {id: 'households', column: 2, label: 'households', color: '#117733'}, @@ -73,15 +76,22 @@ D3.sankey = {left: 'imported_ammonia', right: 'hydrogen', gquery: 'sankey_0_to_1_ammonia_to_hydrogen', color: '#1ce6d6'}, {left: 'residual_hydrogen', right: 'hydrogen', gquery: 'sankey_0_to_1_residual_hydrogen_to_hydrogen', color: '#87cfeb'}, - {left: 'extracted_oil', right: 'oil_and_oil_products', gquery: 'sankey_0_to_1_crude_oil_to_oil_and_oil_products', color: '#8c564b'}, - {left: 'imported_oil', right: 'oil_and_oil_products', gquery: 'sankey_0_to_1_imported_oil_and_oil_products_to_oil_and_oil_products', color: '#8c564b'}, + {left: 'extracted_oil', right: 'oil_and_oil_products', gquery: 'sankey_0_to_1_crude_oil_to_oil_and_oil_products', color: '#8c564b'}, + {left: 'imported_oil', right: 'oil_and_oil_products', gquery: 'sankey_0_to_1_imported_oil_and_oil_products_to_oil_and_oil_products', color: '#8c564b'}, + {left: 'biomass_products', right: 'oil_and_oil_products', gquery: 'sankey_0_to_1_biomass_products_to_oil_and_oil_products', color: '#2ca02c'}, + {left: 'biomass_products', right: 'waste_mix', gquery: 'sankey_0_to_1_biomass_products_to_waste_mix', color: '#2ca02c'}, + {left: 'non_biogenic_waste', right: 'waste_mix', gquery: 'sankey_0_to_1_non_biogenic_waste_to_waste_mix', color: '#BA7D40'}, + + {left: 'imported_methanol', right: 'methanol', gquery: 'sankey_0_to_1_imported_methanol_to_methanol', color: '#FF8C8C'}, {left: 'hydrogen', right: 'electricity', gquery: 'sankey_1_to_1_hydrogen_to_electricity', color: '#87cfeb'}, {left: 'oil_and_oil_products', right: 'electricity', gquery: 'sankey_1_to_1_oil_and_oil_products_to_electricity', color: '#8c564b'}, + {left: 'waste_mix', right: 'electricity', gquery: 'sankey_1_to_1_waste_mix_to_electricity', color: '#CE7013'}, {left: 'electricity', right: 'heat', gquery: 'sankey_1_to_1_electricity_to_heat', color: '#1f77b4'}, {left: 'hydrogen', right: 'heat', gquery: 'sankey_1_to_1_hydrogen_to_heat', color: '#87cfeb'}, + {left: 'waste_mix', right: 'heat', gquery: 'sankey_1_to_1_waste_mix_to_heat', color: '#CE7013'}, {left: 'electricity', right: 'hydrogen', gquery: 'sankey_1_to_1_electricity_to_hydrogen', color: '#1f77b4'}, {left: 'oil_and_oil_products', right: 'hydrogen', gquery: 'sankey_1_to_1_oil_and_oil_products_to_hydrogen', color: '#8c564b'}, @@ -89,6 +99,8 @@ D3.sankey = {left: 'electricity', right: 'oil_and_oil_products', gquery: 'sankey_1_to_1_electricity_to_oil_and_oil_products', color: '#1f77b4'}, {left: 'hydrogen', right: 'oil_and_oil_products', gquery: 'sankey_1_to_1_hydrogen_to_oil_and_oil_products', color: '#87cfeb'}, + {left: 'electricity', right: 'methanol', gquery: 'sankey_1_to_1_electricity_to_methanol', color: '#1f77b4'}, + {left: 'hydrogen', right: 'methanol', gquery: 'sankey_1_to_1_hydrogen_to_methanol', color: '#87cfeb'}, {left: 'imported_ammonia', right: 'agriculture', gquery: 'sankey_0_to_2_ammonia_to_agriculture', color: '#1ce6d6'}, {left: 'imported_ammonia', right: 'households', gquery: 'sankey_0_to_2_ammonia_to_households', color: '#1ce6d6'}, @@ -210,7 +222,13 @@ D3.sankey = {left: 'oil_and_oil_products', right: 'bunkers', gquery: 'sankey_1_to_2_oil_and_oil_products_to_bunkers', color: '#8c564b'}, {left: 'oil_and_oil_products', right: 'feedstock', gquery: 'sankey_1_to_2_oil_and_oil_products_to_feedstock', color: '#8c564b'}, {left: 'oil_and_oil_products', right: 'export', gquery: 'sankey_1_to_2_oil_and_oil_products_to_export', color: '#8c564b'}, - {left: 'oil_and_oil_products', right: 'losses', gquery: 'sankey_1_to_2_oil_and_oil_products_to_loss', color: '#DCDCDC'} + {left: 'oil_and_oil_products', right: 'losses', gquery: 'sankey_1_to_2_oil_and_oil_products_to_loss', color: '#DCDCDC'}, + + {left: 'waste_mix', right: 'feedstock', gquery: 'sankey_1_to_2_waste_mix_to_feedstock', color: '#CE7013'}, + + {left: 'methanol', right: 'feedstock', gquery: 'sankey_1_to_2_methanol_to_feedstock', color: '#FF8C8C'}, + {left: 'methanol', right: 'export', gquery: 'sankey_1_to_2_methanol_to_export', color: '#FF8C8C'}, + {left: 'methanol', right: 'losses', gquery: 'sankey_1_to_2_methanol_to_loss', color: '#DCDCDC'} ] @@ -463,6 +481,7 @@ D3.sankey = {left: 'biogenic_waste', right: 'electricity_prod', gquery: 'biogenic_waste_to_electricity_prod_in_biomass_sankey', color: '#006266'}, {left: 'biogenic_waste', right: 'central_heat_prod', gquery: 'biogenic_waste_to_central_heat_prod_in_biomass_sankey', color: '#006266'}, {left: 'biogenic_waste', right: 'export', gquery: 'biogenic_waste_to_export_in_biomass_sankey', color: '#006266'}, + {left: 'biogenic_waste', right: 'industry', gquery: 'biogenic_waste_to_industry_in_biomass_sankey', color: '#006266'}, {left: 'electricity_prod', right: 'electricity_dem', gquery: 'electricity_prod_to_electricity_dem_in_biomass_sankey', color: '#1f77b4'}, {left: 'electricity_prod', right: 'heat_dem', gquery: 'electricity_prod_to_heat_dem_in_biomass_sankey', color: '#d62728'}, {left: 'electricity_prod', right: 'losses', gquery: 'electricity_prod_to_losses_in_biomass_sankey', color: '#DCDCDC'}, diff --git a/config/interface/output_element_series/costs_overview_detailed.yml b/config/interface/output_element_series/costs_overview_detailed.yml index 412c6ceda..b407783bf 100644 --- a/config/interface/output_element_series/costs_overview_detailed.yml +++ b/config/interface/output_element_series/costs_overview_detailed.yml @@ -168,6 +168,18 @@ dependent_on: output_element_key: costs_overview_detailed key: costs_carriers_ammonia_costs_overview_detailed +- label: costs_carriers_methanol + color: "#FF8C8C" + order_by: 295 + group: + show_at_first: + is_target_line: false + target_line_position: + gquery: costs_carriers_methanol + is_1990: false + dependent_on: + output_element_key: costs_overview_detailed + key: costs_carriers_methanol_costs_overview_detailed - label: costs_production_biomass color: "#C5D75F" diff --git a/config/interface/output_element_series/final_demand_per_carrier_non_energetic.yml b/config/interface/output_element_series/final_demand_per_carrier_non_energetic.yml index 234b3f7f6..f30125b36 100644 --- a/config/interface/output_element_series/final_demand_per_carrier_non_energetic.yml +++ b/config/interface/output_element_series/final_demand_per_carrier_non_energetic.yml @@ -131,3 +131,27 @@ dependent_on: output_element_key: final_demand_per_carrier_non_energetic key: solar_final_demand_per_carrier_non_energetic +- label: methanol + color: "#FF8C8C" + order_by: 160 + group: + show_at_first: false + is_target_line: false + target_line_position: + gquery: final_demand_of_methanol_non_energetic_in_bezier + is_1990: false + dependent_on: + output_element_key: final_demand_per_carrier_non_energetic + key: methanol_demand_per_carrier_non_energetic +- label: waste_mix + color: "#CE7013" + order_by: 170 + group: + show_at_first: false + is_target_line: false + target_line_position: + gquery: final_demand_of_waste_mix_non_energetic_in_bezier + is_1990: false + dependent_on: + output_element_key: final_demand_per_carrier_non_energetic + key: waste_mix_demand_per_carrier_non_energetic diff --git a/config/interface/output_element_series/industrial_heat_mekko.yml b/config/interface/output_element_series/industrial_heat_mekko.yml index 5e607182c..374da8bf5 100644 --- a/config/interface/output_element_series/industrial_heat_mekko.yml +++ b/config/interface/output_element_series/industrial_heat_mekko.yml @@ -122,7 +122,7 @@ key: industry_heat_backup_burner_network_gas_in_industrial_heat_network_mekko_supply_industrial_heat_mekko - label: industry_heat_burner_coal_in_industrial_heat_network_mekko color: "#333333" - order_by: 305 + order_by: 306 group: supply show_at_first: is_target_line: false diff --git a/config/interface/output_element_series/mekko_of_ammonia_demand_supply.yml b/config/interface/output_element_series/mekko_of_ammonia_demand_supply.yml index 7c0557e08..398eb40a7 100644 --- a/config/interface/output_element_series/mekko_of_ammonia_demand_supply.yml +++ b/config/interface/output_element_series/mekko_of_ammonia_demand_supply.yml @@ -35,6 +35,18 @@ dependent_on: output_element_key: mekko_of_ammonia_demand_supply key: ammonia_demand_fertilizer_industry_mekko_of_ammonia_demand_supply +- label: ammonia_demand_other_industry + color: "#0d370d" + order_by: 120 + group: demand + show_at_first: false + is_target_line: false + target_line_position: + gquery: ammonia_demand_other_industry + is_1990: false + dependent_on: + output_element_key: mekko_of_ammonia_demand_supply + key: ammonia_demand_other_industry_mekko_of_ammonia_demand_supply - label: ammonia_demand_hydrogen_ammonia_reformer_must_run color: "#569CB9" order_by: 130 @@ -72,6 +84,7 @@ output_element_key: mekko_of_ammonia_demand_supply key: ammonia_demand_export_mekko_of_ammonia_demand_supply + - label: ammonia_supply_import_baseload color: "#bdfff6" order_by: 200 diff --git a/config/interface/output_element_series/mekko_of_detailed_final_demand_in_industry.yml b/config/interface/output_element_series/mekko_of_detailed_final_demand_in_industry.yml index abec1916e..8d9159c7b 100644 --- a/config/interface/output_element_series/mekko_of_detailed_final_demand_in_industry.yml +++ b/config/interface/output_element_series/mekko_of_detailed_final_demand_in_industry.yml @@ -971,3 +971,39 @@ dependent_on: output_element_key: mekko_of_detailed_final_demand_in_industry key: heat_unused_heat_mekko_of_detailed_final_demand_in_industry +- label: methanol + color: "#FF8C8C" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_methanol_in_other_non_specified_industry + is_1990: false + dependent_on: + output_element_key: mekko_of_detailed_final_demand_in_industry + key: methanol_aggregated_other_mekko_of_detailed_final_demand_in_industry +- label: ammonia + color: "#1ce6d6" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_ammonia_in_other_non_specified_industry + is_1990: false + dependent_on: + output_element_key: mekko_of_detailed_final_demand_in_industry + key: ammonia_aggregated_other_mekko_of_detailed_final_demand_in_industry +- label: waste_mix + color: "#CE7013" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_waste_mix_in_other_non_specified_industry + is_1990: false + dependent_on: + output_element_key: mekko_of_detailed_final_demand_in_industry + key: waste_mix_aggregated_other_mekko_of_detailed_final_demand_in_industry diff --git a/config/interface/output_element_series/mekko_of_oil_mix.yml b/config/interface/output_element_series/mekko_of_oil_mix.yml index 06da2f953..0525fef2b 100644 --- a/config/interface/output_element_series/mekko_of_oil_mix.yml +++ b/config/interface/output_element_series/mekko_of_oil_mix.yml @@ -107,6 +107,7 @@ dependent_on: output_element_key: mekko_of_oil_mix key: final_demand_other_sector_non_energetic_oil_mekko_of_oil_mix + - label: diesel color: "#645070" order_by: 10 diff --git a/config/interface/output_element_series/mekko_of_primary_demand.yml b/config/interface/output_element_series/mekko_of_primary_demand.yml index 3bbecff3d..dbf505070 100644 --- a/config/interface/output_element_series/mekko_of_primary_demand.yml +++ b/config/interface/output_element_series/mekko_of_primary_demand.yml @@ -1535,3 +1535,27 @@ dependent_on: output_element_key: mekko_of_primary_demand key: imported_ammonia_export_and_curtailment_mekko_of_primary_demand +- label: imported_methanol + color: "#FF8C8C" + order_by: 16 + group: energy_industry + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: imported_methanol_industry_in_mekko_of_primary_demand + is_1990: false + dependent_on: + output_element_key: mekko_of_primary_demand + key: imported_methanol_industry_mekko_of_primary_demand +- label: imported_methanol + color: "#FF8C8C" + order_by: 16 + group: export_and_curtailment + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: imported_methanol_export_and_curtailment_in_mekko_of_primary_demand + is_1990: false + dependent_on: + output_element_key: mekko_of_primary_demand + key: imported_methanol_export_and_curtailment_mekko_of_primary_demand diff --git a/config/interface/output_element_series/use_of_final_demand_in_industry_aluminium.yml b/config/interface/output_element_series/use_of_final_demand_in_industry_aluminium.yml index 13cd3c33b..967de70d0 100644 --- a/config/interface/output_element_series/use_of_final_demand_in_industry_aluminium.yml +++ b/config/interface/output_element_series/use_of_final_demand_in_industry_aluminium.yml @@ -1,11 +1,11 @@ --- - label: network_gas color: "#CCCCCC" - order_by: 1 + order_by: 10 group: '' show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: network_gas_in_use_of_final_demand_in_industry_aluminium is_1990: dependent_on: @@ -13,13 +13,25 @@ key: network_gas_use_of_final_demand_in_industry_aluminium - label: electricity color: "#4169E1" - order_by: 2 + order_by: 20 group: '' show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: electricity_in_use_of_final_demand_in_industry_aluminium is_1990: dependent_on: output_element_key: use_of_final_demand_in_industry_aluminium key: electricity_use_of_final_demand_in_industry_aluminium +- label: hydrogen + color: "#87CEEB" + order_by: 30 + group: '' + show_at_first: false + is_target_line: false + target_line_position: + gquery: hydrogen_in_use_of_final_demand_in_industry_aluminium + is_1990: + dependent_on: + output_element_key: use_of_final_demand_in_industry_aluminium + key: hydrogen_use_of_final_demand_in_industry_aluminium diff --git a/config/interface/output_element_series/use_of_final_demand_in_industry_other.yml b/config/interface/output_element_series/use_of_final_demand_in_industry_other.yml index fb48b67b1..c907efb53 100644 --- a/config/interface/output_element_series/use_of_final_demand_in_industry_other.yml +++ b/config/interface/output_element_series/use_of_final_demand_in_industry_other.yml @@ -203,3 +203,39 @@ dependent_on: output_element_key: use_of_final_demand_in_industry_other key: solar_aggregated_other_use_of_final_demand_in_industry_other +- label: methanol_non_energetic + color: "#FF8C8C" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_methanol_in_other_non_specified_industry_non_energetic + is_1990: false + dependent_on: + output_element_key: use_of_final_demand_in_industry_other + key: methanol_aggregated_other_use_of_final_demand_in_industry_other +- label: ammonia_non_energetic + color: "#1ce6d6" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_ammonia_in_other_non_specified_industry_non_energetic + is_1990: false + dependent_on: + output_element_key: use_of_final_demand_in_industry_other + key: ammonia_aggregated_other_use_of_final_demand_in_industry_other +- label: waste_mix_non_energetic + color: "#CE7013" + order_by: 7 + group: aggregated_other + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: final_demand_of_waste_mix_in_other_non_specified_industry_non_energetic + is_1990: false + dependent_on: + output_element_key: use_of_final_demand_in_industry_other + key: waste_mix_aggregated_other_use_of_final_demand_in_industry_other diff --git a/config/interface/output_element_series/use_of_final_demand_in_industry_other_metals.yml b/config/interface/output_element_series/use_of_final_demand_in_industry_other_metals.yml index a37f7786f..9b605b09c 100644 --- a/config/interface/output_element_series/use_of_final_demand_in_industry_other_metals.yml +++ b/config/interface/output_element_series/use_of_final_demand_in_industry_other_metals.yml @@ -1,11 +1,11 @@ --- - label: coal_and_derivatives color: "#333333" - order_by: 2 - group: '' + order_by: 10 + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: coal_in_use_of_final_demand_in_industry_other_metals is_1990: dependent_on: @@ -13,11 +13,11 @@ key: coal_and_derivatives_use_of_final_demand_in_industry_other_metals - label: oil_and_derivatives color: "#854321" - order_by: 4 - group: '' + order_by: 20 + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: oil_in_use_of_final_demand_in_industry_other_metals is_1990: dependent_on: @@ -25,11 +25,11 @@ key: oil_and_derivatives_use_of_final_demand_in_industry_other_metals - label: natural_gas_and_derivatives color: "#CCCCCC" - order_by: 3 - group: '' + order_by: 30 + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: network_gas_in_use_of_final_demand_in_industry_other_metals is_1990: dependent_on: @@ -37,11 +37,11 @@ key: natural_gas_and_derivatives_use_of_final_demand_in_industry_other_metals - label: electricity color: "#4169E1" - order_by: 4 - group: '' + order_by: 40 + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: electricity_in_use_of_final_demand_in_industry_other_metals is_1990: dependent_on: @@ -49,13 +49,25 @@ key: electricity_use_of_final_demand_in_industry_other_metals - label: heat color: "#8B0000" - order_by: 1 - group: '' + order_by: 50 + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: steam_hot_water_in_use_of_final_demand_in_industry_other_metals + is_1990: + dependent_on: + output_element_key: use_of_final_demand_in_industry_other_metals + key: heat_use_of_final_demand_in_industry_other_metals +- label: hydrogen + color: "#87CEEB" + order_by: 60 + group: + show_at_first: false + is_target_line: false + target_line_position: + gquery: hydrogen_in_use_of_final_demand_in_industry_other_metals is_1990: dependent_on: output_element_key: use_of_final_demand_in_industry_other_metals - key: heat_use_of_final_demand_in_industry_other_metals + key: hydrogen_use_of_final_demand_in_industry_other_metals diff --git a/config/interface/output_element_series/waterfall_future_energy_exports.yml b/config/interface/output_element_series/waterfall_future_energy_exports.yml index 1afc1fd8f..74558e035 100644 --- a/config/interface/output_element_series/waterfall_future_energy_exports.yml +++ b/config/interface/output_element_series/waterfall_future_energy_exports.yml @@ -180,3 +180,16 @@ dependent_on: output_element_key: waterfall_future_energy_exports key: uranium_oxide_future_energy_exports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: future + show_at_first: false + is_target_line: false + target_line_position: + gquery: methanol_in_future_energy_exports + is_1990: false + dependent_on: + output_element_key: waterfall_future_energy_exports + key: methanol_future_energy_exports diff --git a/config/interface/output_element_series/waterfall_future_energy_imports.yml b/config/interface/output_element_series/waterfall_future_energy_imports.yml index 7d06f62e0..854c5e553 100644 --- a/config/interface/output_element_series/waterfall_future_energy_imports.yml +++ b/config/interface/output_element_series/waterfall_future_energy_imports.yml @@ -180,3 +180,16 @@ dependent_on: output_element_key: waterfall_future_energy_imports key: uranium_oxide_future_energy_imports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: future + show_at_first: false + is_target_line: false + target_line_position: + gquery: methanol_in_future_energy_imports + is_1990: false + dependent_on: + output_element_key: waterfall_future_energy_imports + key: methanol_future_energy_imports diff --git a/config/interface/output_element_series/waterfall_future_energy_net_imports.yml b/config/interface/output_element_series/waterfall_future_energy_net_imports.yml index 974ffe8b4..2cb20952b 100644 --- a/config/interface/output_element_series/waterfall_future_energy_net_imports.yml +++ b/config/interface/output_element_series/waterfall_future_energy_net_imports.yml @@ -179,4 +179,17 @@ is_1990: false dependent_on: output_element_key: waterfall_future_energy_net_imports - key: uranium_oxide_future_energy_net_imports + key: uranium_oxide_future_energy_net_imports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: future + show_at_first: false + is_target_line: false + target_line_position: + gquery: methanol_in_future_energy_net_imports + is_1990: false + dependent_on: + output_element_key: waterfall_future_energy_net_imports + key: methanol_future_energy_net_imports diff --git a/config/interface/output_element_series/waterfall_future_energy_transit_flows.yml b/config/interface/output_element_series/waterfall_future_energy_transit_flows.yml index a8075b669..17762b1f5 100644 --- a/config/interface/output_element_series/waterfall_future_energy_transit_flows.yml +++ b/config/interface/output_element_series/waterfall_future_energy_transit_flows.yml @@ -179,4 +179,17 @@ is_1990: false dependent_on: output_element_key: waterfall_future_energy_transit_flows - key: uranium_oxide_future_energy_transit_flows + key: uranium_oxide_future_energy_transit_flows + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: future + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: methanol_in_future_energy_transit + is_1990: false + dependent_on: + output_element_key: waterfall_future_energy_transit_flows + key: methanol_future_energy_transit_flows diff --git a/config/interface/output_element_series/waterfall_present_energy_exports.yml b/config/interface/output_element_series/waterfall_present_energy_exports.yml index f2e3a63c4..761966089 100644 --- a/config/interface/output_element_series/waterfall_present_energy_exports.yml +++ b/config/interface/output_element_series/waterfall_present_energy_exports.yml @@ -179,4 +179,17 @@ is_1990: false dependent_on: output_element_key: waterfall_present_energy_exports - key: uranium_oxide_present_energy_exports + key: uranium_oxide_present_energy_exports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: present + show_at_first: false + is_target_line: false + target_line_position: + gquery: methanol_in_present_energy_exports + is_1990: false + dependent_on: + output_element_key: waterfall_present_energy_exports + key: methanol_present_energy_exports diff --git a/config/interface/output_element_series/waterfall_present_energy_imports.yml b/config/interface/output_element_series/waterfall_present_energy_imports.yml index a14b0c671..0aa220645 100644 --- a/config/interface/output_element_series/waterfall_present_energy_imports.yml +++ b/config/interface/output_element_series/waterfall_present_energy_imports.yml @@ -180,3 +180,16 @@ dependent_on: output_element_key: waterfall_present_energy_imports key: uranium_oxide_present_energy_imports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: present + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: methanol_in_present_energy_imports + is_1990: false + dependent_on: + output_element_key: waterfall_present_energy_imports + key: methanol_present_energy_imports diff --git a/config/interface/output_element_series/waterfall_present_energy_net_imports.yml b/config/interface/output_element_series/waterfall_present_energy_net_imports.yml index 077af2678..2b0ae2893 100644 --- a/config/interface/output_element_series/waterfall_present_energy_net_imports.yml +++ b/config/interface/output_element_series/waterfall_present_energy_net_imports.yml @@ -180,3 +180,16 @@ dependent_on: output_element_key: waterfall_present_energy_net_imports key: uranium_oxide_present_energy_net_imports + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: present + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: methanol_in_present_energy_net_imports + is_1990: false + dependent_on: + output_element_key: waterfall_present_energy_net_imports + key: methanol_present_energy_net_imports diff --git a/config/interface/output_element_series/waterfall_present_energy_transit_flows.yml b/config/interface/output_element_series/waterfall_present_energy_transit_flows.yml index b79f074d6..17112fd4b 100644 --- a/config/interface/output_element_series/waterfall_present_energy_transit_flows.yml +++ b/config/interface/output_element_series/waterfall_present_energy_transit_flows.yml @@ -180,3 +180,16 @@ dependent_on: output_element_key: waterfall_present_energy_transit_flows key: uranium_oxide_present_energy_transit_flows + +- label: methanol + color: "#FF8C8C" + order_by: 150 + group: present + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: methanol_in_present_energy_transit + is_1990: false + dependent_on: + output_element_key: waterfall_present_energy_transit_flows + key: methanol_present_energy_transit_flows diff --git a/config/locales/interface/output_element_series/en_labels.yml b/config/locales/interface/output_element_series/en_labels.yml index bf69f095e..252ba0bad 100644 --- a/config/locales/interface/output_element_series/en_labels.yml +++ b/config/locales/interface/output_element_series/en_labels.yml @@ -43,6 +43,7 @@ en: costs_carriers_heat: "Energy carriers import/export: Heat" costs_carriers_hydrogen: "Energy carriers import/export: Hydrogen" costs_carriers_hydrogen_carriers: "Energy carriers import/export: Hydrogen carriers" + costs_carriers_methanol: "Energy carriers import/export: Methanol" costs_carriers_natural_gas: "Energy carriers import/export: Natural gas" costs_carriers_oil_and_products: "Energy carriers import/export: Oil" costs_carriers_uranium: "Energy carriers import/export: Uranium" @@ -216,6 +217,7 @@ en: ammonia_demand_domestic_navigation: "Fuel for domestic navigation" ammonia_demand_international_navigation: "Fuel for international navigation" ammonia_demand_fertilizer_industry: "Fertilizer production (feedstock)" + ammonia_demand_other_industry: "Other industry (feedstock)" ammonia_demand_hydrogen_ammonia_reformer_must_run: "Reforming to hydrogen (must-run)" ammonia_demand_hydrogen_ammonia_reformer_dispatchable: "Reforming to hydrogen (dispatchable)" ammonia_supply_import_baseload: "Import (baseload)" @@ -945,6 +947,7 @@ en: imported: "Imported" imported_electricity: "Imported electricity" imported_ammonia: "Imported ammonia" + imported_methanol: "Imported methanol" individual: "Individual heating" interconnector_1_marginal_cost_curve: "Price of interconnector 1" interconnector_2_marginal_cost_curve: "Price of interconnector 2" @@ -1101,6 +1104,8 @@ en: merit_transport_other: "Transport - Other" methane_import: "Methane import" methane_export: "Methane export" + methanol: "Methanol" + methanol_non_energetic: "Methanol (feedstock)" motorcycles: "Motorcycles" must_run: "Must-run CHP" must_run_electricity_production_capacity: "Must-run production capacity" @@ -1116,7 +1121,7 @@ en: nationally_refined: "Refinery" natural_gas: "Natural gas" natural_gas_national_transport: "Natural gas for national transport" - natural_gas_and_derivatives: "Network gas (natural and green gas)" + natural_gas_and_derivatives: "Network gas" natural_gas_and_derivatives_hot_water: "Network gas (for hot water)" natural_gas_and_derivatives_heating: "Network gas (for heating)" natural_gas_and_derivatives_non_energetic: "Non-energetic network gas" @@ -1485,7 +1490,7 @@ en: industry_chp_ultra_supercritical_coal_in_industrial_heat_network_mekko: "Coal CHP" industry_chp_wood_pellets_in_industrial_heat_network_mekko: "Biomass CHP" industry_chp_turbine_hydrogen_in_industrial_heat_network_mekko: "Hydrogen turbine CHP" - industry_heat_backup_burner_network_gas_in_industrial_heat_network_mekko: "Heat shortage (gas backup)" + industry_heat_backup_burner_network_gas_in_industrial_heat_network_mekko: "Heat backup (from network gas)" industry_heat_burner_coal_in_industrial_heat_network_mekko: "Coal heater" industry_heat_burner_crude_oil_in_industrial_heat_network_mekko: "Oil heater" industry_heat_burner_lignite_in_industrial_heat_network_mekko: "Lignite heater" @@ -1518,4 +1523,5 @@ en: households_number_of_residences_1985_2004: "Total 1985 - 2004" households_number_of_residences_2005_present: "Total 2005 - present" households_number_of_residences_future: "Total newly built" - + waste_mix: "Waste mix" + waste_mix_non_energetic: "Waste mix (feedstock)" diff --git a/config/locales/interface/output_element_series/nl_labels.yml b/config/locales/interface/output_element_series/nl_labels.yml index a7771266a..e0889ba16 100644 --- a/config/locales/interface/output_element_series/nl_labels.yml +++ b/config/locales/interface/output_element_series/nl_labels.yml @@ -43,6 +43,7 @@ nl: costs_carriers_heat: "Energiedragers import/export: Warmte" costs_carriers_hydrogen: "Energiedragers import/export: Waterstof" costs_carriers_hydrogen_carriers: "Energiedragers import/export: Waterstofdragers" + costs_carriers_methanol: "Energiedragers import/export: Methanol" costs_carriers_natural_gas: "Energiedragers import/export: Aardgas" costs_carriers_oil_and_products: "Energiedragers import/export: Olie" costs_carriers_uranium: "Energiedragers import/export: Uranium" @@ -205,6 +206,7 @@ nl: ammonia_demand_domestic_navigation: "Brandstof voor binnenvaartschepen" ammonia_demand_international_navigation: "Brandstof voor internationale scheepvaart" ammonia_demand_fertilizer_industry: "Kunstmestproductie (grondstof)" + ammonia_demand_other_industry: "Overige industrie (grondstof)" ammonia_demand_hydrogen_ammonia_reformer_must_run: "Reforming naar waterstof (must-run)" ammonia_demand_hydrogen_ammonia_reformer_dispatchable: "Reforming naar waterstof (regelbaar)" ammonia_supply_import_baseload: "Import (basislast)" @@ -946,6 +948,7 @@ nl: imported: "Geïmporteerde" imported_electricity: "Geïmporteerde elektriciteit" imported_ammonia: "Geïmporteerde ammoniak" + imported_methanol: "Geïmporteerde methanol" individual: "Individuele verwarming" interconnector_1_marginal_cost_curve: "Prijs van interconnector 1" interconnector_2_marginal_cost_curve: "Prijs van interconnector 2" @@ -1113,6 +1116,8 @@ nl: merit_transport_other: "Transport - Overig" methane_import: "Methaan import" methane_export: "Methaan export" + methanol: "Methanol" + methanol_non_energetic: "Methanol (grondstof)" motorcycles: "Motorfietsen" must_run: "Must-run WKK" must_run_electricity_production_capacity: "Must-run productiecapaciteit" @@ -1128,7 +1133,7 @@ nl: nationally_refined: "Raffinaderij" natural_gas: "Aardgas" natural_gas_national_transport: "Aardgas voor nationaal transport" - natural_gas_and_derivatives: "Netwerkgas (aard-/groengas)" + natural_gas_and_derivatives: "Netwerkgas" natural_gas_and_derivatives_hot_water: "Netwerkgas (voor warm water)" natural_gas_and_derivatives_heating: "Netwerkgas (voor verwarming)" natural_gas_and_derivatives_non_energetic: "Niet-energetisch netwerkgas" @@ -1487,7 +1492,7 @@ nl: industry_chp_ultra_supercritical_coal_in_industrial_heat_network_mekko: "Kolen WKK" industry_chp_wood_pellets_in_industrial_heat_network_mekko: "Biomassa WKK" industry_chp_turbine_hydrogen_in_industrial_heat_network_mekko: "Waterstofturbine WKK" - industry_heat_backup_burner_network_gas_in_industrial_heat_network_mekko: "Warmtetekort (gas back-up) " + industry_heat_backup_burner_network_gas_in_industrial_heat_network_mekko: "Warmte back-up (van netwerkgas)" industry_heat_burner_coal_in_industrial_heat_network_mekko: "Kolenketel" industry_heat_burner_crude_oil_in_industrial_heat_network_mekko: "Olieketel" industry_heat_burner_lignite_in_industrial_heat_network_mekko: "Bruinkoolketel" @@ -1513,5 +1518,7 @@ nl: residences_future: "Woningen nieuwbouw" buildings_present: "Bestaande gebouwen" buildings_future: "Nieuwe gebouwen" + waste_mix: "Afvalmix" + waste_mix_non_energetic: "Afvalmix (grondstof)" wind_inland_small: "Wind op land (klein)" wind_inland_large: "Wind op land (groot)" diff --git a/config/locales/interface/output_elements/labels_groups/en_labels.yml b/config/locales/interface/output_elements/labels_groups/en_labels.yml index f3773637d..38289254d 100644 --- a/config/locales/interface/output_elements/labels_groups/en_labels.yml +++ b/config/locales/interface/output_elements/labels_groups/en_labels.yml @@ -358,4 +358,6 @@ en: offshore_electrolyser: "electrolyser" onshore_hv_network: "HV network" onshore_hydrogen_network: "hydrogen network" - + waste_mix: "waste mix" + methanol: "methanol" + imported_methanol: "imported methanol" diff --git a/config/locales/interface/output_elements/labels_groups/nl_labels.yml b/config/locales/interface/output_elements/labels_groups/nl_labels.yml index 6f1b19481..78ab76de3 100644 --- a/config/locales/interface/output_elements/labels_groups/nl_labels.yml +++ b/config/locales/interface/output_elements/labels_groups/nl_labels.yml @@ -340,3 +340,6 @@ nl: offshore_electrolyser: "elektrolyser" onshore_hv_network: "HV-net" onshore_hydrogen_network: "waterstofnet" + waste_mix: "afvalmix" + methanol: "methanol" + imported_methanol: "geïmporteerde methanol"