Merge pull request #4305 from quintel/ctm-etm-coupling

Expand the external coupling of the CTM to the ETM
quintel · Jul 24, 2024 · cd8145f · cd8145f
2 parents 7dbb6bb + cf17357
commit cd8145f
Show file tree

Hide file tree

Showing 23 changed files with 344 additions and 33 deletions.
diff --git 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,22 +76,31 @@ 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'},
 
           {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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,25 +1,37 @@
 ---
 - 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: 
   output_element_key: use_of_final_demand_in_industry_aluminium
   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
@@ -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