Carbon modelling improvements

app/assets/javascripts/lib/models/chart.coffee

@@ -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()

app/assets/stylesheets/_sidebar-icons.sass

@@ -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
@@ -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
@@ -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)

app/views/content/whats_new.en.html.md

@@ -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) <-
 

app/views/content/whats_new.nl.html.md

@@ -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) <-
 

config/interface/input_elements/costs_fuel_production_processes.yml

@@ -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

config/interface/input_elements/demand_export_energy.yml

@@ -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
@@ -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         

config/interface/input_elements/demand_industry_chemical_other.yml

@@ -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
@@ -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

config/interface/input_elements/demand_transport_domestic_aviation.yml

@@ -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

config/interface/input_elements/demand_transport_domestic_aviation_technology.yml

@@ -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

config/interface/input_elements/demand_transport_domestic_navigation_technology.yml

@@ -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

config/interface/input_elements/supply_transport_international_aviation.yml → config/interface/input_elements/demand_transport_international_aviation.yml

@@ -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

config/interface/input_elements/demand_transport_international_navigation_technology.yml

@@ -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

config/interface/input_elements/demand_transport_international_shipping.yml

@@ -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