Add (imported) propane as carrier to feed into gas network (#3013)

quintel · Mar 5, 2024 · df8d425 · df8d425
1 parent 4ed0d49
commit df8d425
Show file tree

Hide file tree

Showing 267 changed files with 1,190 additions and 214 deletions.
diff --git a/carriers/lng.ad b/carriers/lng.ad
@@ -2,7 +2,7 @@
 - infinite = false
 - mj_per_kg = 49.5
 - kg_per_liter = 0.432
-- graphviz_color = saddlebrown
+- graphviz_color = grey
 
 ~ co2_conversion_per_mj = CARRIER(lng, co2_conversion_per_mj)
 ~ cost_per_mj = CARRIER(lng, cost_per_mj)
diff --git a/carriers/propane.ad b/carriers/propane.ad
@@ -0,0 +1,7 @@
+- sustainable = 0.0
+- infinite = false
+- mj_per_kg = 46.53
+- graphviz_color = grey
+
+~ co2_conversion_per_mj = CARRIER(propane, co2_conversion_per_mj)
+~ cost_per_mj = CARRIER(propane, cost_per_mj)
diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml
@@ -601,7 +601,7 @@ energy_distribution_gasoline:
   "y": 8380
 energy_distribution_greengas:
   x: 6060
-  "y": 7000
+  "y": 6960
 energy_distribution_heavy_fuel_oil:
   x: 6060
   "y": 8560
@@ -647,6 +647,9 @@ energy_distribution_non_biogenic_waste:
 energy_distribution_oily_biomass:
   x: 7520
   "y": 2780
+energy_distribution_propane:
+  x: 6060
+  "y": 7020
 energy_distribution_torrefied_biomass_pellets:
   x: 7180
   "y": 2300
@@ -796,13 +799,13 @@ energy_flexibility_wind_batteries_electricity:
   "y": 1960
 energy_greengas_gasification_dry_biomass:
   x: 6420
-  "y": 7060
+  "y": 7020
 energy_greengas_gasification_wet_biomass:
   x: 6420
-  "y": 7000
+  "y": 6960
 energy_greengas_upgrade_biogas:
   x: 6420
-  "y": 6940
+  "y": 6900
 energy_heat_backup_burner_ht_network_gas:
   x: 6060
   "y": 6740
@@ -1088,6 +1091,9 @@ energy_import_non_biogenic_waste:
 energy_import_oily_biomass:
   x: 7700
   "y": 2740
+energy_import_propane:
+  x: 7700
+  "y": 4600
 energy_import_uranium_oxide:
   x: 7700
   "y": 4160
@@ -1348,7 +1354,7 @@ energy_production_biodiesel:
   "y": 2740
 energy_production_biogenic_waste:
   x: 7700
-  "y": 4920
+  "y": 4880
 energy_production_drink_water_ambient_heat:
   x: 7200
   "y": 5720
@@ -1399,7 +1405,7 @@ energy_production_wood_pellets:
   "y": 2360
 energy_regasification_lng:
   x: 6060
-  "y": 6880
+  "y": 6840
 energy_residual_heat:
   x: 7700
   "y": 4040
@@ -1432,7 +1438,7 @@ energy_transport_hydrogen_pipelines:
   "y": 7400
 energy_treatment_natural_gas:
   x: 6060
-  "y": 6940
+  "y": 6900
 environment_air_ambient_cold:
   x: 7700
   "y": 5800

diff --git a/config/sankey_csv.yml b/config/sankey_csv.yml
@@ -972,7 +972,7 @@ rows:
     Carrier: Natural gas
     Category: Import
     Type: Output
-    Value: import_of_natural_gas
+    Value: import_of_natural_gas_and_derivatives
   - Group: Primary demand
     Carrier: Natural gas
     Category: Extraction

diff --git a/datasets/AT_austria/carriers.csv b/datasets/AT_austria/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/BEGM11002_antwerpen/carriers.csv b/datasets/BEGM11002_antwerpen/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/BEGM13040_turnhout/carriers.csv b/datasets/BEGM13040_turnhout/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/BEGM35013_oostende/carriers.csv b/datasets/BEGM35013_oostende/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/BE_belgium/carriers.csv b/datasets/BE_belgium/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/BG_bulgaria/carriers.csv b/datasets/BG_bulgaria/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/CY_cyprus/carriers.csv b/datasets/CY_cyprus/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/CZ_czechia/carriers.csv b/datasets/CZ_czechia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/DE_germany/carriers.csv b/datasets/DE_germany/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/DKGM751_aarhus/carriers.csv b/datasets/DKGM751_aarhus/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/DK_denmark/carriers.csv b/datasets/DK_denmark/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/EE_estonia/carriers.csv b/datasets/EE_estonia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/EL_greece/carriers.csv b/datasets/EL_greece/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/ES_spain/carriers.csv b/datasets/ES_spain/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/EU27_european_union_27_countries/carriers.csv b/datasets/EU27_european_union_27_countries/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/FI_finland/carriers.csv b/datasets/FI_finland/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/FR_france/carriers.csv b/datasets/FR_france/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/HR_croatia/carriers.csv b/datasets/HR_croatia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/HU_hungary/carriers.csv b/datasets/HU_hungary/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/IE_ireland/carriers.csv b/datasets/IE_ireland/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/IT_italy/carriers.csv b/datasets/IT_italy/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/LT_lithuania/carriers.csv b/datasets/LT_lithuania/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/LU_luxembourg/carriers.csv b/datasets/LU_luxembourg/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/LV_latvia/carriers.csv b/datasets/LV_latvia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/MT_malta/carriers.csv b/datasets/MT_malta/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/PL_poland/carriers.csv b/datasets/PL_poland/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/PT_portugal/carriers.csv b/datasets/PT_portugal/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/RO_romania/carriers.csv b/datasets/RO_romania/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/SE_sweden/carriers.csv b/datasets/SE_sweden/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/SG_singapore/carriers.csv b/datasets/SG_singapore/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/SI_slovenia/carriers.csv b/datasets/SI_slovenia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/SK_slovakia/carriers.csv b/datasets/SK_slovakia/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/UKNI01_northern_ireland/carriers.csv b/datasets/UKNI01_northern_ireland/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/UK_united_kingdom/carriers.csv b/datasets/UK_united_kingdom/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/VUNH5_efate/carriers.csv b/datasets/VUNH5_efate/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/de/carriers.csv b/datasets/de/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/dk/carriers.csv b/datasets/dk/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/eu/carriers.csv b/datasets/eu/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/nl/carriers.csv b/datasets/nl/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/nl2016/carriers.csv b/datasets/nl2016/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/nl2017/carriers.csv b/datasets/nl2017/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/nl2018/carriers.csv b/datasets/nl2018/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/datasets/nl2019/carriers.csv b/datasets/nl2019/carriers.csv
@@ -55,3 +55,4 @@ liquid_hydrogen,0.0,0.02089,
 imported_liquid_hydrogen,0.0975,0.02089,
 imported_lohc,0.08211,0.01759,
 lohc,0.0,0.01759,
+propane,0.06448,0.00768,
diff --git a/gqueries/general/carrier_groups/all_carriers/carrier_group_natural_gas.gql b/gqueries/general/carrier_groups/all_carriers/carrier_group_natural_gas.gql
@@ -1,4 +1,4 @@
 # Carrier group of natural gas
 
-- query = CARRIER(natural_gas, low_caloric_gas, high_caloric_gas, compressed_network_gas, lng)
+- query = CARRIER(natural_gas, low_caloric_gas, high_caloric_gas, compressed_network_gas, lng, propane)
 - unit =
diff --git a/...al/carrier_groups/final_demand/final_demand_carrier_group_natural_gas_and_derivatives.gql b/...al/carrier_groups/final_demand/final_demand_carrier_group_natural_gas_and_derivatives.gql
@@ -5,5 +5,6 @@
     CARRIER(
       network_gas,
       compressed_network_gas,
-      lng
+      lng,
+      propane
     )
diff --git a/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives.gql b/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives.gql
@@ -4,5 +4,6 @@
 - query =
     SUM(
       V(G(co2_emissions_primary),primary_demand_of_natural_gas).sum * V(CARRIER(natural_gas), co2_per_mj),
-      V(G(co2_emissions_primary),primary_demand_of_lng).sum * V(CARRIER(lng), co2_per_mj)
+      V(G(co2_emissions_primary),primary_demand_of_lng).sum * V(CARRIER(lng), co2_per_mj),
+      V(G(co2_emissions_primary),primary_demand_of_propane).sum * V(CARRIER(propane), co2_per_mj)
     ) / THOUSANDS
diff --git a/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql b/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql
@@ -5,5 +5,6 @@
     SUM(
       V(INTERSECTION(G(co2_emissions_primary),SECTOR(transport)).select {|node| node.input_slots.detect { |slot| slot.carrier.network_gas? }}, "network_gas_input_conversion * primary_co2_emission"),
       V(INTERSECTION(G(co2_emissions_primary),SECTOR(transport)).select {|node| node.input_slots.detect { |slot| slot.carrier.compressed_network_gas? }}, "compressed_network_gas_input_conversion * primary_co2_emission"),
-      V(INTERSECTION(G(co2_emissions_primary),SECTOR(transport)).select {|node| node.input_slots.detect { |slot| slot.carrier.lng? }}, "lng_input_conversion * primary_co2_emission")
+      V(INTERSECTION(G(co2_emissions_primary),SECTOR(transport)).select {|node| node.input_slots.detect { |slot| slot.carrier.lng? }}, "lng_input_conversion * primary_co2_emission"),
+      V(INTERSECTION(G(co2_emissions_primary),SECTOR(transport)).select {|node| node.input_slots.detect { |slot| slot.carrier.lng? }}, "propane_input_conversion * primary_co2_emission")
     ) / THOUSANDS
diff --git a/...ricity/carrier_for_electricity_conversion/biomass_products_for_electricity_conversion.gql b/...ricity/carrier_for_electricity_conversion/biomass_products_for_electricity_conversion.gql
@@ -25,6 +25,6 @@
       BILLIONS
     ),
     Q(gas_power_fuelmix_for_electricity_conversion) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion),
-    Q(network_gas_for_electricity_conversion) * Q(share_of_greengas_in_gas_network)
+    Q(network_gas_for_electricity_conversion) * Q(share_of_sustainable_gas_in_gas_network)
     )
 - unit = PJ
diff --git a/...version/electricity/carrier_for_electricity_conversion/gas_for_electricity_conversion.gql b/...version/electricity/carrier_for_electricity_conversion/gas_for_electricity_conversion.gql
@@ -8,12 +8,13 @@
           Q(electricity_producing_converters_sankey),
           input_of(
             natural_gas,
-            lng
+            lng,
+            propane
           )
         )
       ),
       BILLIONS
     ),
-    Q(network_gas_for_electricity_conversion) * Q(share_of_natural_gas_in_gas_network)
+    Q(network_gas_for_electricity_conversion) * Q(share_of_fossil_gas_in_gas_network)
     )
 - unit = PJ
diff --git a/...n/electricity/carrier_for_electricity_conversion/green_gas_for_electricity_conversion.gql b/...n/electricity/carrier_for_electricity_conversion/green_gas_for_electricity_conversion.gql
@@ -1,5 +1,5 @@
 # Query for scenario tools regional overview: direct conversion demand of green gas for electricity production
 
 - query =
-    Q(network_gas_for_electricity_conversion) * Q(share_of_greengas_in_gas_network)
+    Q(network_gas_for_electricity_conversion) * Q(share_of_sustainable_gas_in_gas_network)
 - unit = PJ
diff --git a/...onversion_from_carrier_to_electricity/conversion_from_biomass_products_to_electricity.gql b/...onversion_from_carrier_to_electricity/conversion_from_biomass_products_to_electricity.gql
@@ -7,14 +7,14 @@
       Q(conversion_from_bio_ethanol_to_electricity),
       Q(conversion_from_wood_pellets_to_electricity),
       Q(conversion_from_bio_lng_to_electricity),
-      PRODUCT(Q(conversion_from_network_gas_to_electricity),Q(share_of_greengas_in_gas_network)),
-      PRODUCT(Q(conversion_from_compressed_network_gas_to_electricity),Q(share_of_greengas_in_gas_network)),
+      PRODUCT(Q(conversion_from_network_gas_to_electricity),Q(share_of_sustainable_gas_in_gas_network)),
+      PRODUCT(Q(conversion_from_compressed_network_gas_to_electricity),Q(share_of_sustainable_gas_in_gas_network)),
       PRODUCT(
         PRODUCT(
           Q(conversion_from_gas_power_fuelmix_to_electricity),
           V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion)
         ),
-        Q(share_of_greengas_in_gas_network)
+        Q(share_of_sustainable_gas_in_gas_network)
       ),
       PRODUCT(
         Q(conversion_from_gas_power_fuelmix_to_electricity),