From df8d42523a9a7b5b02bdb8545266ecd3d6b65d5b Mon Sep 17 00:00:00 2001 From: kmkranenburg <150331345+kaskranenburgQ@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:10:19 +0100 Subject: [PATCH] Add (imported) propane as carrier to feed into gas network (#3013) --- carriers/lng.ad | 2 +- carriers/propane.ad | 7 +++++ config/energy_node_positions.yml | 20 +++++++++----- config/sankey_csv.yml | 2 +- datasets/AT_austria/carriers.csv | 1 + datasets/BEGM11002_antwerpen/carriers.csv | 1 + datasets/BEGM13040_turnhout/carriers.csv | 1 + datasets/BEGM35013_oostende/carriers.csv | 1 + datasets/BE_belgium/carriers.csv | 1 + datasets/BG_bulgaria/carriers.csv | 1 + datasets/CY_cyprus/carriers.csv | 1 + datasets/CZ_czechia/carriers.csv | 1 + datasets/DE_germany/carriers.csv | 1 + datasets/DKGM751_aarhus/carriers.csv | 1 + datasets/DK_denmark/carriers.csv | 1 + datasets/EE_estonia/carriers.csv | 1 + datasets/EL_greece/carriers.csv | 1 + datasets/ES_spain/carriers.csv | 1 + .../carriers.csv | 1 + datasets/FI_finland/carriers.csv | 1 + datasets/FR_france/carriers.csv | 1 + datasets/HR_croatia/carriers.csv | 1 + datasets/HU_hungary/carriers.csv | 1 + datasets/IE_ireland/carriers.csv | 1 + datasets/IT_italy/carriers.csv | 1 + datasets/LT_lithuania/carriers.csv | 1 + datasets/LU_luxembourg/carriers.csv | 1 + datasets/LV_latvia/carriers.csv | 1 + datasets/MT_malta/carriers.csv | 1 + datasets/PL_poland/carriers.csv | 1 + datasets/PT_portugal/carriers.csv | 1 + datasets/RO_romania/carriers.csv | 1 + datasets/SE_sweden/carriers.csv | 1 + datasets/SG_singapore/carriers.csv | 1 + datasets/SI_slovenia/carriers.csv | 1 + datasets/SK_slovakia/carriers.csv | 1 + datasets/UKNI01_northern_ireland/carriers.csv | 1 + datasets/UK_united_kingdom/carriers.csv | 1 + datasets/VUNH5_efate/carriers.csv | 1 + datasets/de/carriers.csv | 1 + datasets/dk/carriers.csv | 1 + datasets/eu/carriers.csv | 1 + datasets/nl/carriers.csv | 1 + datasets/nl2016/carriers.csv | 1 + datasets/nl2017/carriers.csv | 1 + datasets/nl2018/carriers.csv | 1 + datasets/nl2019/carriers.csv | 1 + .../carrier_group_natural_gas.gql | 2 +- ...rier_group_natural_gas_and_derivatives.gql | 3 ++- ...ary_co2_of_natural_gas_and_derivatives.gql | 3 ++- ...tural_gas_and_derivatives_in_transport.gql | 3 ++- ...ss_products_for_electricity_conversion.gql | 2 +- .../gas_for_electricity_conversion.gql | 5 ++-- .../green_gas_for_electricity_conversion.gql | 2 +- ...n_from_biomass_products_to_electricity.gql | 6 ++--- ...gas_and_gas_derivatives_to_electricity.gql | 7 ++--- ...conversion_from_propane_to_electricity.gql | 13 ++++++++++ ...s_products_for_central_heat_conversion.gql | 2 +- ...nversion_from_biomass_products_to_heat.gql | 6 ++--- ...n_from_gas_and_gas_derivatives_to_heat.gql | 7 ++--- .../conversion_from_propane_to_heat.gql | 13 ++++++++++ ...s_in_source_of_central_heat_production.gql | 2 +- ...n_source_of_ht_heat_network_conversion.gql | 2 +- ...n_source_of_ht_heat_network_conversion.gql | 13 ++++++++++ ...n_source_of_ht_heat_network_conversion.gql | 4 ++- ...n_source_of_ht_heat_network_conversion.gql | 13 ++++++++++ ...n_source_of_lt_heat_network_conversion.gql | 2 +- ...n_source_of_lt_heat_network_conversion.gql | 13 ++++++++++ ...n_source_of_lt_heat_network_conversion.gql | 2 +- ...n_source_of_lt_heat_network_conversion.gql | 13 ++++++++++ ...n_source_of_mt_heat_network_conversion.gql | 2 +- ...n_source_of_mt_heat_network_conversion.gql | 13 ++++++++++ ...n_source_of_mt_heat_network_conversion.gql | 2 +- ...n_source_of_mt_heat_network_conversion.gql | 13 ++++++++++ ...atural_gas_for_central_heat_conversion.gql | 5 ++-- ...s_in_source_of_central_heat_production.gql | 2 +- ...omass_products_for_hydrogen_conversion.gql | 2 +- .../gas_for_hydrogen_conversion.gql | 5 ++-- ...or_biomass_gasification_ccs_conversion.gql | 2 +- ...as_for_biomass_gasification_conversion.gql | 2 +- ...or_biomass_gasification_ccs_conversion.gql | 2 +- ...as_for_biomass_gasification_conversion.gql | 2 +- ...sion_from_biomass_products_to_hydrogen.gql | 4 +-- ...om_gas_and_gas_derivatives_to_hydrogen.gql | 5 ++-- .../conversion_from_propane_to_hydrogen.gql | 13 ++++++++++ .../costs_carriers_natural_gas.gql | 3 ++- .../electricity_produced_from_greengas.gql | 2 +- .../electricity_produced_from_natural_gas.gql | 4 ++- ...ivatives_used_for_heating_in_buildings.gql | 2 +- ...ergy_used_for_heat_and_cold_production.gql | 2 +- ...ossil_energy_used_for_heat_in_industry.gql | 2 +- ...l_energy_used_for_heating_in_buildings.gql | 2 +- ...ngas_in_buildings_appliances_energetic.gql | 2 +- ..._gas_in_buildings_appliances_energetic.gql | 2 +- ...reengas_in_buildings_cooling_energetic.gql | 2 +- ...ral_gas_in_buildings_cooling_energetic.gql | 2 +- ...eengas_in_buildings_lighting_energetic.gql | 2 +- ...al_gas_in_buildings_lighting_energetic.gql | 2 +- ...s_in_buildings_space_heating_energetic.gql | 2 +- ...s_in_buildings_space_heating_energetic.gql | 2 +- ...gas_in_households_appliances_energetic.gql | 2 +- ...gas_in_households_appliances_energetic.gql | 2 +- ...eengas_in_households_cooking_energetic.gql | 2 +- ...al_gas_in_households_cooking_energetic.gql | 2 +- ...eengas_in_households_cooling_energetic.gql | 2 +- ...al_gas_in_households_cooling_energetic.gql | 2 +- ...ngas_in_households_hot_water_energetic.gql | 2 +- ..._gas_in_households_hot_water_energetic.gql | 2 +- ...engas_in_households_lighting_energetic.gql | 2 +- ...l_gas_in_households_lighting_energetic.gql | 2 +- ..._in_households_space_heating_energetic.gql | 2 +- ..._in_households_space_heating_energetic.gql | 2 +- ...vatives_in_chemical_industry_energetic.gql | 24 +++++++++++++++++ ...ves_in_chemical_industry_non_energetic.gql | 24 +++++++++++++++++ ...derivatives_in_other_chemical_industry.gql | 18 +++++++++++++ ...s_in_other_chemical_industry_energetic.gql | 24 +++++++++++++++++ ..._other_chemical_industry_non_energetic.gql | 24 +++++++++++++++++ ...and_derivatives_in_refineries_industry.gql | 18 +++++++++++++ ...tives_in_refineries_industry_energetic.gql | 24 +++++++++++++++++ ...s_in_refineries_industry_non_energetic.gql | 24 +++++++++++++++++ ...nd_derivatives_in_fertilizers_industry.gql | 18 +++++++++++++ ...ives_in_fertilizers_industry_energetic.gql | 24 +++++++++++++++++ ..._in_fertilizers_industry_non_energetic.gql | 24 +++++++++++++++++ ..._gas_and_derivatives_in_metal_industry.gql | 20 +++++++++++++- ...erivatives_in_metal_industry_energetic.gql | 26 ++++++++++++++++++- ...atives_in_metal_industry_non_energetic.gql | 26 ++++++++++++++++++- ..._of_greengas_in_ict_industry_energetic.gql | 2 +- ...l_gas_and_derivatives_in_food_industry.gql | 18 +++++++++++++ ...derivatives_in_food_industry_energetic.gql | 24 +++++++++++++++++ ...vatives_in_food_industry_non_energetic.gql | 24 +++++++++++++++++ ...al_gas_and_derivatives_in_ict_industry.gql | 19 ++++++++++++++ ..._derivatives_in_ict_industry_energetic.gql | 26 ++++++++++++++++++- ...ivatives_in_ict_industry_non_energetic.gql | 24 +++++++++++++++++ ...atives_in_other_non_specified_industry.gql | 18 +++++++++++++ ...other_non_specified_industry_energetic.gql | 24 +++++++++++++++++ ...r_non_specified_industry_non_energetic.gql | 24 +++++++++++++++++ ..._gas_and_derivatives_in_paper_industry.gql | 18 +++++++++++++ ...erivatives_in_paper_industry_energetic.gql | 24 +++++++++++++++++ ...atives_in_paper_industry_non_energetic.gql | 24 +++++++++++++++++ ..._natural_gas_in_ict_industry_energetic.gql | 2 +- ...ral_gas_and_derivatives_in_agriculture.gql | 9 +++++++ ...tural_gas_and_derivatives_in_buildings.gql | 9 +++++++ ...natural_gas_and_derivatives_in_bunkers.gql | 10 +++++++ ..._natural_gas_and_derivatives_in_energy.gql | 9 +++++++ ...ural_gas_and_derivatives_in_households.gql | 9 +++++++ ...atural_gas_and_derivatives_in_industry.gql | 9 +++++++ ...f_natural_gas_and_derivatives_in_other.gql | 9 +++++++ ...tural_gas_and_derivatives_in_transport.gql | 9 +++++++ ..._demand_of_natural_gas_and_derivatives.gql | 2 +- ...d_derivatives_in_agriculture_energetic.gql | 2 +- ...and_derivatives_in_buildings_energetic.gql | 2 +- ...s_and_derivatives_in_bunkers_energetic.gql | 2 +- ...as_and_derivatives_in_energy_energetic.gql | 2 +- ...nd_derivatives_in_households_energetic.gql | 2 +- ..._and_derivatives_in_industry_energetic.gql | 2 +- ...gas_and_derivatives_in_other_energetic.gql | 2 +- ...and_derivatives_in_transport_energetic.gql | 2 +- ..._natural_gas_and_derivatives_energetic.gql | 2 +- ...ural_gas_and_derivatives_non_energetic.gql | 2 +- .../export/export_of_propane.gql | 15 +++++++++++ .../import/import_of_propane.gql | 15 +++++++++++ ...import_of_natural_gas_and_derivatives.gql} | 3 ++- .../production/propane_network_gas_output.gql | 2 ++ .../propane_network_gas_output_curve.gql | 2 ++ .../general/shares/propane_in_gas_network.gql | 4 +++ .../share_of_fossil_gas_in_gas_network.gql | 3 ++- .../share_of_propane_in_gas_network.gql | 3 +++ ...newables_in_heat_produced_in_buildings.gql | 2 +- ...hare_of_sustainable_gas_in_gas_network.gql | 3 +++ ..._sankey_efficiency_correction_greengas.gql | 2 +- ...final_demand_of_biomass_products_nodes.gql | 4 +-- ...nd_gas_from_biogas_greengas_collective.gql | 2 +- ...nd_gas_from_biogas_greengas_individual.gql | 2 +- ...mand_gas_from_biogas_greengas_industry.gql | 2 +- ...heet_demand_gas_from_fossil_collective.gql | 2 +- ...heet_demand_gas_from_fossil_individual.gql | 2 +- ...tsheet_demand_gas_from_fossil_industry.gql | 2 +- .../factsheet_supply_gas_from_biogas.gql | 2 +- .../factsheet_supply_gas_from_fossil.gql | 2 +- .../modules/etflex/etflex_score_greengas.gql | 2 +- ..._demand_of_natural_gas_and_derivatives.gql | 3 ++- ...s_biomass_products_to_biomass_products.gql | 4 +-- ...n_loss_biomass_products_to_electricity.gql | 2 +- ...sion_loss_biomass_products_to_hydrogen.gql | 2 +- ...roducts_to_natural_gas_and_derivatives.gql | 4 +-- ...ss_biomass_products_to_steam_hot_water.gql | 2 +- ...n_loss_electricity_to_biomass_products.gql | 2 +- ...tricity_to_natural_gas_and_derivatives.gql | 2 +- ...as_and_derivatives_to_biomass_products.gql | 4 +-- ...ral_gas_and_derivatives_to_electricity.gql | 2 +- ...atural_gas_and_derivatives_to_hydrogen.gql | 2 +- ...vatives_to_natural_gas_and_derivatives.gql | 4 +-- ...gas_and_derivatives_to_steam_hot_water.gql | 2 +- ...n_loss_network_gas_to_biomass_products.gql | 2 +- ...ork_gas_to_natural_gas_and_derivatives.gql | 2 +- ...mand_of_greengas_in_industry_energetic.gql | 2 +- ...d_of_natural_gas_in_industry_energetic.gql | 2 +- ...eat_prod_to_heat_dem_in_biomass_sankey.gql | 2 +- ..._heat_prod_to_losses_in_biomass_sankey.gql | 2 +- ...d_to_electricity_dem_in_biomass_sankey.gql | 4 +-- ...ity_prod_to_heat_dem_in_biomass_sankey.gql | 4 +-- ...icity_prod_to_losses_in_biomass_sankey.gql | 4 +-- ...engas_to_agriculture_in_biomass_sankey.gql | 2 +- ...reengas_to_buildings_in_biomass_sankey.gql | 2 +- .../greengas_to_bunkers_in_biomass_sankey.gql | 2 +- ...to_central_heat_prod_in_biomass_sankey.gql | 2 +- ..._to_electricity_prod_in_biomass_sankey.gql | 4 +-- ...eengas_to_households_in_biomass_sankey.gql | 2 +- ...gas_to_hydrogen_prod_in_biomass_sankey.gql | 2 +- ...greengas_to_industry_in_biomass_sankey.gql | 2 +- .../greengas_to_losses_in_biomass_sankey.gql | 4 +-- .../greengas_to_other_in_biomass_sankey.gql | 2 +- ...reengas_to_transport_in_biomass_sankey.gql | 2 +- ...prod_to_hydrogen_dem_in_biomass_sankey.gql | 2 +- ...rogen_prod_to_losses_in_biomass_sankey.gql | 2 +- ...mass_products_to_agriculture_in_sankey.gql | 2 +- ...iomass_products_to_buildings_in_sankey.gql | 2 +- .../biomass_products_to_bunkers_in_sankey.gql | 2 +- .../biomass_products_to_energy_in_sankey.gql | 2 +- .../biomass_products_to_export_in_sankey.gql | 2 +- ...iomass_products_to_feedstock_in_sankey.gql | 2 +- ...omass_products_to_households_in_sankey.gql | 2 +- ...biomass_products_to_industry_in_sankey.gql | 2 +- .../biomass_products_to_other_in_sankey.gql | 2 +- ...iomass_products_to_transport_in_sankey.gql | 2 +- ...products_to_transport_losses_in_sankey.gql | 4 +-- .../natural_gas_to_agriculture_in_sankey.gql | 4 +-- .../natural_gas_to_buildings_in_sankey.gql | 4 +-- .../natural_gas_to_bunkers_in_sankey.gql | 4 +-- ...ural_gas_to_electricity_prod_in_sankey.gql | 2 +- .../natural_gas_to_energy_in_sankey.gql | 4 +-- .../natural_gas_to_export_in_sankey.gql | 4 +-- .../natural_gas_to_feedstock_in_sankey.gql | 11 ++++---- .../natural_gas_to_households_in_sankey.gql | 4 +-- ...natural_gas_to_hydrogen_prod_in_sankey.gql | 2 +- .../natural_gas_to_industry_in_sankey.gql | 4 +-- .../sankey/natural_gas_to_other_in_sankey.gql | 4 +-- .../natural_gas_to_transport_in_sankey.gql | 4 +-- ...ural_gas_to_transport_losses_in_sankey.gql | 4 +-- ...griculture_biomass_total_in_co2_sankey.gql | 2 +- .../buildings_biomass_total_in_co2_sankey.gql | 2 +- .../bunkers_biomass_total_in_co2_sankey.gql | 2 +- .../energy_biomass_total_in_co2_sankey.gql | 2 +- ...households_biomass_total_in_co2_sankey.gql | 2 +- .../industry_biomass_total_in_co2_sankey.gql | 2 +- .../other_biomass_total_in_co2_sankey.gql | 2 +- .../transport_biomass_total_in_co2_sankey.gql | 2 +- .../greengas_in_use_of_transport_fuels.gql | 2 +- .../natural_gas_in_use_of_transport_fuels.gql | 2 +- ...al_gas_and_derivatives_in_renewability.gql | 3 ++- ...al_gas_and_derivatives_in_renewability.gql | 2 ++ .../propane_in_gas_network_mix.gql | 2 ++ ...ourly_supply_electricity_from_greengas.gql | 2 +- ...ly_supply_electricity_from_natural_gas.gql | 2 +- .../natural_gas_in_future_energy_exports.gql | 7 ++++- .../natural_gas_in_future_energy_imports.gql | 6 ++++- ...tural_gas_in_future_energy_net_imports.gql | 12 ++++++++- .../natural_gas_in_future_energy_transit.gql | 12 ++++++++- .../natural_gas_in_present_energy_exports.gql | 8 +++++- .../natural_gas_in_present_energy_imports.gql | 7 ++++- ...ural_gas_in_present_energy_net_imports.gql | 13 +++++++++- .../natural_gas_in_present_energy_transit.gql | 13 +++++++++- ...ational_gas_network_natural_gas@propane.ad | 2 ++ ...ane-energy_distribution_propane@propane.ad | 2 ++ .../energy/energy_distribution_propane.ad | 7 +++++ .../nodes/energy/energy_import_propane.ad | 4 +++ .../fuels_gas/propane_gas_total_share.ad | 9 +++++++ 267 files changed, 1190 insertions(+), 214 deletions(-) create mode 100644 carriers/propane.ad create mode 100644 gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_propane_to_electricity.gql create mode 100644 gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_propane_to_heat.gql create mode 100644 gqueries/general/conversion/heat/ht_heat/lng_in_source_of_ht_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/heat/ht_heat/propane_in_source_of_ht_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/heat/lt_heat/lng_in_source_of_lt_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/heat/lt_heat/propane_in_source_of_lt_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/heat/mt_heat/lng_in_source_of_mt_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/heat/mt_heat/propane_in_source_of_mt_heat_network_conversion.gql create mode 100644 gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_propane_to_hydrogen.gql create mode 100644 gqueries/general/import_export/export/export_of_propane.gql create mode 100644 gqueries/general/import_export/import/import_of_propane.gql rename gqueries/general/import_export/{import_of_natural_gas.gql => import_of_natural_gas_and_derivatives.gql} (80%) create mode 100644 gqueries/general/network_gas/production/propane_network_gas_output.gql create mode 100644 gqueries/general/network_gas/production/propane_network_gas_output_curve.gql create mode 100644 gqueries/general/shares/propane_in_gas_network.gql create mode 100644 gqueries/general/shares/share_of_propane_in_gas_network.gql create mode 100644 gqueries/general/shares/share_of_sustainable_gas_in_gas_network.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_77_gas_network_mix/propane_in_gas_network_mix.gql create mode 100644 graphs/energy/edges/energy/energy_distribution_propane-energy_national_gas_network_natural_gas@propane.ad create mode 100644 graphs/energy/edges/energy/energy_import_propane-energy_distribution_propane@propane.ad create mode 100644 graphs/energy/nodes/energy/energy_distribution_propane.ad create mode 100644 graphs/energy/nodes/energy/energy_import_propane.ad create mode 100644 inputs/supply/fuels_gas/propane_gas_total_share.ad diff --git a/carriers/lng.ad b/carriers/lng.ad index 8777b4f18c..4c2dc35fae 100644 --- 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 new file mode 100644 index 0000000000..2dacddd7a4 --- /dev/null +++ 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 index 2d015646ce..d3fbe335a6 100644 --- 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 index 11a624a0d5..800dd87e9d 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 2f0814ccd2..a4761447e3 100644 --- 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 index ec134add71..0571674869 100644 --- 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 index d09ae089d3..e364be6853 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index c44d125d36..2c7ebbff0d 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 6c2756ece0..3e92adb332 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 6c2756ece0..3e92adb332 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 1705d1973e..f07867e9e9 100644 --- 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 index 742042f86f..41e4145b19 100644 --- 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 index 108329edfa..d435526f51 100644 --- 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 index 18a6366125..339c267e25 100644 --- 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 index 27563f5deb..afcf87d03d 100644 --- 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 index a38311747f..3ffb4e7115 100644 --- 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 index 3cd2a1f983..56dff0b4c2 100644 --- 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 index 0777b36ebc..633b1e4035 100644 --- 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 index b750e14f81..c7d5592f69 100644 --- 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 index 457ac47fea..f252a1aea4 100644 --- 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 index a195d35332..c92be6f985 100644 --- 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 index df184dd149..8a52b23ff3 100644 --- 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/gqueries/general/carrier_groups/final_demand/final_demand_carrier_group_natural_gas_and_derivatives.gql b/gqueries/general/carrier_groups/final_demand/final_demand_carrier_group_natural_gas_and_derivatives.gql index 7478ded8c2..ae455151b8 100644 --- a/gqueries/general/carrier_groups/final_demand/final_demand_carrier_group_natural_gas_and_derivatives.gql +++ b/gqueries/general/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 index 57d5861f96..5aad31b6b8 100644 --- 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 index 150671612b..fc34654a4e 100644 --- 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 \ No newline at end of file diff --git a/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/biomass_products_for_electricity_conversion.gql b/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/biomass_products_for_electricity_conversion.gql index f100aa1416..1c0b9ea05e 100644 --- a/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/biomass_products_for_electricity_conversion.gql +++ b/gqueries/general/conversion/electricity/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/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/gas_for_electricity_conversion.gql b/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/gas_for_electricity_conversion.gql index 98b16c2ae7..3ea70a81f9 100644 --- a/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/gas_for_electricity_conversion.gql +++ b/gqueries/general/conversion/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/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/green_gas_for_electricity_conversion.gql b/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/green_gas_for_electricity_conversion.gql index fcd060064c..5c36d07a54 100644 --- a/gqueries/general/conversion/electricity/carrier_for_electricity_conversion/green_gas_for_electricity_conversion.gql +++ b/gqueries/general/conversion/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/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biomass_products_to_electricity.gql b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biomass_products_to_electricity.gql index 254e32e186..706e11ab58 100644 --- a/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biomass_products_to_electricity.gql +++ b/gqueries/general/conversion/electricity/conversion_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), diff --git a/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_gas_and_gas_derivatives_to_electricity.gql b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_gas_and_gas_derivatives_to_electricity.gql index da5d47b8e3..d7f2bc2733 100644 --- a/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_gas_and_gas_derivatives_to_electricity.gql +++ b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_gas_and_gas_derivatives_to_electricity.gql @@ -4,14 +4,15 @@ SUM( Q(conversion_from_natural_gas_to_electricity), Q(conversion_from_lng_to_electricity), - PRODUCT(Q(conversion_from_network_gas_to_electricity),Q(share_of_natural_gas_in_gas_network)), + Q(conversion_from_propane_to_electricity), + PRODUCT(Q(conversion_from_network_gas_to_electricity),Q(share_of_fossil_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_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), - PRODUCT(Q(conversion_from_compressed_network_gas_to_electricity),Q(share_of_natural_gas_in_gas_network)) + PRODUCT(Q(conversion_from_compressed_network_gas_to_electricity),Q(share_of_fossil_gas_in_gas_network)) ) - unit = PJ diff --git a/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_propane_to_electricity.gql b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_propane_to_electricity.gql new file mode 100644 index 0000000000..f13cae296c --- /dev/null +++ b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_propane_to_electricity.gql @@ -0,0 +1,13 @@ +# Direct conversion input of natural gas for central electricity production + +- query = + DIVIDE( + SUM( + V( + G(electricity_production), + "electricity_output_conversion / (1 - loss_output_conversion) * input_of_propane" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/biomass_products_for_central_heat_conversion.gql b/gqueries/general/conversion/heat/biomass_products_for_central_heat_conversion.gql index 97457b3f01..449aa1e2f6 100644 --- a/gqueries/general/conversion/heat/biomass_products_for_central_heat_conversion.gql +++ b/gqueries/general/conversion/heat/biomass_products_for_central_heat_conversion.gql @@ -25,6 +25,6 @@ BILLIONS ), Q(gas_power_fuelmix_for_central_heat_conversion) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - Q(network_gas_for_central_heat_conversion) * Q(share_of_greengas_in_gas_network) + Q(network_gas_for_central_heat_conversion) * Q(share_of_sustainable_gas_in_gas_network) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_biomass_products_to_heat.gql b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_biomass_products_to_heat.gql index bcd0acb348..b7ef08c833 100644 --- a/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_biomass_products_to_heat.gql +++ b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_biomass_products_to_heat.gql @@ -7,14 +7,14 @@ Q(conversion_from_bio_ethanol_to_heat), Q(conversion_from_wood_pellets_to_heat), Q(conversion_from_bio_lng_to_heat), - PRODUCT(Q(conversion_from_network_gas_to_heat),Q(share_of_greengas_in_gas_network)), - PRODUCT(Q(conversion_from_compressed_network_gas_to_heat),Q(share_of_greengas_in_gas_network)), + PRODUCT(Q(conversion_from_network_gas_to_heat),Q(share_of_sustainable_gas_in_gas_network)), + PRODUCT(Q(conversion_from_compressed_network_gas_to_heat),Q(share_of_sustainable_gas_in_gas_network)), PRODUCT( PRODUCT( Q(conversion_from_gas_power_fuelmix_to_heat), 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_heat), diff --git a/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_gas_and_gas_derivatives_to_heat.gql b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_gas_and_gas_derivatives_to_heat.gql index b6e838e741..5466b6fa66 100644 --- a/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_gas_and_gas_derivatives_to_heat.gql +++ b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_gas_and_gas_derivatives_to_heat.gql @@ -4,14 +4,15 @@ SUM( Q(conversion_from_natural_gas_to_heat), Q(conversion_from_lng_to_heat), - PRODUCT(Q(conversion_from_network_gas_to_heat),Q(share_of_natural_gas_in_gas_network)), + Q(conversion_from_propane_to_heat), + PRODUCT(Q(conversion_from_network_gas_to_heat),Q(share_of_fossil_gas_in_gas_network)), PRODUCT( PRODUCT( Q(conversion_from_gas_power_fuelmix_to_heat), V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), - PRODUCT(Q(conversion_from_compressed_network_gas_to_heat),Q(share_of_natural_gas_in_gas_network)), + PRODUCT(Q(conversion_from_compressed_network_gas_to_heat),Q(share_of_fossil_gas_in_gas_network)), ) - unit = PJ diff --git a/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_propane_to_heat.gql b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_propane_to_heat.gql new file mode 100644 index 0000000000..ce0702f624 --- /dev/null +++ b/gqueries/general/conversion/heat/conversion_from_carrier_to_heat/conversion_from_propane_to_heat.gql @@ -0,0 +1,13 @@ +# Direct conversion input of lng for central heat production + +- query = + DIVIDE( + SUM( + V( + G(heat_production), + "steam_hot_water_output_conversion / (1 - loss_output_conversion) * input_of_propane" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/greengas_in_source_of_central_heat_production.gql b/gqueries/general/conversion/heat/greengas_in_source_of_central_heat_production.gql index f3ea77211f..b0b9ebd88a 100644 --- a/gqueries/general/conversion/heat/greengas_in_source_of_central_heat_production.gql +++ b/gqueries/general/conversion/heat/greengas_in_source_of_central_heat_production.gql @@ -1,5 +1,5 @@ # Direct conversion output of steam hot water from central heating through green gas heaters - query = - Q(network_gas_in_source_of_central_heat_production) * Q(share_of_greengas_in_gas_network) + Q(network_gas_in_source_of_central_heat_production) * Q(share_of_sustainable_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/heat/ht_heat/biomass_products_in_source_of_ht_heat_network_conversion.gql b/gqueries/general/conversion/heat/ht_heat/biomass_products_in_source_of_ht_heat_network_conversion.gql index add1a366f5..c67e5bdf0f 100644 --- a/gqueries/general/conversion/heat/ht_heat/biomass_products_in_source_of_ht_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/ht_heat/biomass_products_in_source_of_ht_heat_network_conversion.gql @@ -12,7 +12,7 @@ ), PRODUCT( Q(network_gas_in_source_of_ht_heat_network_conversion), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/ht_heat/lng_in_source_of_ht_heat_network_conversion.gql b/gqueries/general/conversion/heat/ht_heat/lng_in_source_of_ht_heat_network_conversion.gql new file mode 100644 index 0000000000..2e5265866e --- /dev/null +++ b/gqueries/general/conversion/heat/ht_heat/lng_in_source_of_ht_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on HT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_ht"), + "output_of_steam_hot_water * lng_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/ht_heat/natural_gas_and_derivatives_in_source_of_ht_heat_network_conversion.gql b/gqueries/general/conversion/heat/ht_heat/natural_gas_and_derivatives_in_source_of_ht_heat_network_conversion.gql index 6654abbc75..12853bda36 100644 --- a/gqueries/general/conversion/heat/ht_heat/natural_gas_and_derivatives_in_source_of_ht_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/ht_heat/natural_gas_and_derivatives_in_source_of_ht_heat_network_conversion.gql @@ -3,9 +3,11 @@ - query = SUM( Q(natural_gas_in_source_of_ht_heat_network_conversion), + Q(propane_in_source_of_ht_heat_network_conversion), + Q(lng_in_source_of_ht_heat_network_conversion), PRODUCT( Q(network_gas_in_source_of_ht_heat_network_conversion), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/ht_heat/propane_in_source_of_ht_heat_network_conversion.gql b/gqueries/general/conversion/heat/ht_heat/propane_in_source_of_ht_heat_network_conversion.gql new file mode 100644 index 0000000000..163d181cd7 --- /dev/null +++ b/gqueries/general/conversion/heat/ht_heat/propane_in_source_of_ht_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on HT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_ht"), + "output_of_steam_hot_water * propane_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/lt_heat/biomass_products_in_source_of_lt_heat_network_conversion.gql b/gqueries/general/conversion/heat/lt_heat/biomass_products_in_source_of_lt_heat_network_conversion.gql index d10f91a335..9986661a19 100644 --- a/gqueries/general/conversion/heat/lt_heat/biomass_products_in_source_of_lt_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/lt_heat/biomass_products_in_source_of_lt_heat_network_conversion.gql @@ -12,7 +12,7 @@ ), PRODUCT( Q(network_gas_in_source_of_lt_heat_network_conversion), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/lt_heat/lng_in_source_of_lt_heat_network_conversion.gql b/gqueries/general/conversion/heat/lt_heat/lng_in_source_of_lt_heat_network_conversion.gql new file mode 100644 index 0000000000..251ce360d4 --- /dev/null +++ b/gqueries/general/conversion/heat/lt_heat/lng_in_source_of_lt_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on LT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_lt"), + "output_of_steam_hot_water * lng_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/lt_heat/natural_gas_and_derivatives_in_source_of_lt_heat_network_conversion.gql b/gqueries/general/conversion/heat/lt_heat/natural_gas_and_derivatives_in_source_of_lt_heat_network_conversion.gql index 1eab910e9c..9df528d092 100644 --- a/gqueries/general/conversion/heat/lt_heat/natural_gas_and_derivatives_in_source_of_lt_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/lt_heat/natural_gas_and_derivatives_in_source_of_lt_heat_network_conversion.gql @@ -5,7 +5,7 @@ Q(natural_gas_in_source_of_lt_heat_network_conversion), PRODUCT( Q(network_gas_in_source_of_lt_heat_network_conversion), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/lt_heat/propane_in_source_of_lt_heat_network_conversion.gql b/gqueries/general/conversion/heat/lt_heat/propane_in_source_of_lt_heat_network_conversion.gql new file mode 100644 index 0000000000..ffd2fa179f --- /dev/null +++ b/gqueries/general/conversion/heat/lt_heat/propane_in_source_of_lt_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on LT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_lt"), + "output_of_steam_hot_water * propane_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/mt_heat/biomass_products_in_source_of_mt_heat_network_conversion.gql b/gqueries/general/conversion/heat/mt_heat/biomass_products_in_source_of_mt_heat_network_conversion.gql index 2728404392..ca4f6687c3 100644 --- a/gqueries/general/conversion/heat/mt_heat/biomass_products_in_source_of_mt_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/mt_heat/biomass_products_in_source_of_mt_heat_network_conversion.gql @@ -12,7 +12,7 @@ ), PRODUCT( Q(network_gas_in_source_of_mt_heat_network_conversion), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/mt_heat/lng_in_source_of_mt_heat_network_conversion.gql b/gqueries/general/conversion/heat/mt_heat/lng_in_source_of_mt_heat_network_conversion.gql new file mode 100644 index 0000000000..a2f98b1055 --- /dev/null +++ b/gqueries/general/conversion/heat/mt_heat/lng_in_source_of_mt_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on MT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_mt"), + "output_of_steam_hot_water * lng_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/mt_heat/natural_gas_and_derivatives_in_source_of_mt_heat_network_conversion.gql b/gqueries/general/conversion/heat/mt_heat/natural_gas_and_derivatives_in_source_of_mt_heat_network_conversion.gql index 7e88c57af9..dc828d34bc 100644 --- a/gqueries/general/conversion/heat/mt_heat/natural_gas_and_derivatives_in_source_of_mt_heat_network_conversion.gql +++ b/gqueries/general/conversion/heat/mt_heat/natural_gas_and_derivatives_in_source_of_mt_heat_network_conversion.gql @@ -5,7 +5,7 @@ Q(natural_gas_in_source_of_mt_heat_network_conversion), PRODUCT( Q(network_gas_in_source_of_mt_heat_network_conversion), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/mt_heat/propane_in_source_of_mt_heat_network_conversion.gql b/gqueries/general/conversion/heat/mt_heat/propane_in_source_of_mt_heat_network_conversion.gql new file mode 100644 index 0000000000..69151ab603 --- /dev/null +++ b/gqueries/general/conversion/heat/mt_heat/propane_in_source_of_mt_heat_network_conversion.gql @@ -0,0 +1,13 @@ +# Direct conversion output of steam hot water on MT heat network through natural gas + +- query = + DIVIDE( + SUM( + V( + FILTER(G(heat_production),"heat_network_mt"), + "output_of_steam_hot_water * propane_input_conversion" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/heat/natural_gas_for_central_heat_conversion.gql b/gqueries/general/conversion/heat/natural_gas_for_central_heat_conversion.gql index c3f8e128f2..fe64b29a83 100644 --- a/gqueries/general/conversion/heat/natural_gas_for_central_heat_conversion.gql +++ b/gqueries/general/conversion/heat/natural_gas_for_central_heat_conversion.gql @@ -9,12 +9,13 @@ input_of( natural_gas, lng, - compressed_natural_gas + compressed_natural_gas, + propane ) ) ), BILLIONS ), - Q(network_gas_for_central_heat_conversion) * Q(share_of_natural_gas_in_gas_network) + Q(network_gas_for_central_heat_conversion) * Q(share_of_fossil_gas_in_gas_network) ) - unit = PJ diff --git a/gqueries/general/conversion/heat/natural_gas_in_source_of_central_heat_production.gql b/gqueries/general/conversion/heat/natural_gas_in_source_of_central_heat_production.gql index e7c5a9b534..121460507d 100644 --- a/gqueries/general/conversion/heat/natural_gas_in_source_of_central_heat_production.gql +++ b/gqueries/general/conversion/heat/natural_gas_in_source_of_central_heat_production.gql @@ -1,5 +1,5 @@ # Direct conversion output of steam hot water from central heating through natural gas heaters - query = - Q(network_gas_in_source_of_central_heat_production) * Q(share_of_natural_gas_in_gas_network) + Q(network_gas_in_source_of_central_heat_production) * Q(share_of_fossil_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/biomass_products_for_hydrogen_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/biomass_products_for_hydrogen_conversion.gql index 3ab0cf89ce..ee9a11dccf 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/biomass_products_for_hydrogen_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/biomass_products_for_hydrogen_conversion.gql @@ -21,7 +21,7 @@ BILLIONS ), Q(gas_power_fuelmix_for_hydrogen_conversion) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - Q(network_gas_for_hydrogen_conversion) * Q(share_of_greengas_in_gas_network), + Q(network_gas_for_hydrogen_conversion) * Q(share_of_sustainable_gas_in_gas_network), Q(waste_mix_for_hydrogen_conversion) * Q(share_of_biogenic_waste_in_waste_mix) ) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/gas_for_hydrogen_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/gas_for_hydrogen_conversion.gql index ba2ccc3ee4..5a98c34be8 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/gas_for_hydrogen_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/gas_for_hydrogen_conversion.gql @@ -6,12 +6,13 @@ G(hydrogen_production), input_of( natural_gas, - lng + lng, + propane ) ) ), BILLIONS ), - Q(network_gas_for_hydrogen_conversion) * Q(share_of_natural_gas_in_gas_network) + Q(network_gas_for_hydrogen_conversion) * Q(share_of_fossil_gas_in_gas_network) ) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_ccs_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_ccs_conversion.gql index b041b91a83..7c8005d113 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_ccs_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_ccs_conversion.gql @@ -8,5 +8,5 @@ input_of_network_gas ), BILLIONS - ) * Q(share_of_greengas_in_gas_network) + ) * Q(share_of_sustainable_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_conversion.gql index 6f8ca938a8..8a65537f7a 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/greengas_for_biomass_gasification_conversion.gql @@ -8,5 +8,5 @@ input_of_network_gas ), BILLIONS - ) * Q(share_of_greengas_in_gas_network) + ) * Q(share_of_sustainable_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_ccs_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_ccs_conversion.gql index 3fcd00836b..4f3572c6ac 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_ccs_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_ccs_conversion.gql @@ -8,5 +8,5 @@ input_of_network_gas ), BILLIONS - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_conversion.gql b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_conversion.gql index 294320210b..66ceb28faf 100644 --- a/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_conversion.gql +++ b/gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/natural_gas_for_biomass_gasification_conversion.gql @@ -8,5 +8,5 @@ input_of_network_gas ), BILLIONS - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql index a24d475357..6be2832897 100644 --- a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql +++ b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql @@ -9,7 +9,7 @@ Q(conversion_from_torrefied_biomass_pellets_to_hydrogen), Q(conversion_from_bio_lng_to_hydrogen), Q(conversion_from_green_gas_to_hydrogen), - PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_greengas_in_gas_network)), - PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_greengas_in_gas_network)), + PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)), + PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)), ) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_gas_and_gas_derivatives_to_hydrogen.gql b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_gas_and_gas_derivatives_to_hydrogen.gql index 4faef9e1d1..5d367f173f 100644 --- a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_gas_and_gas_derivatives_to_hydrogen.gql +++ b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_gas_and_gas_derivatives_to_hydrogen.gql @@ -4,7 +4,8 @@ SUM( Q(conversion_from_natural_gas_to_hydrogen), Q(conversion_from_lng_to_hydrogen), - PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_natural_gas_in_gas_network)), - PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_natural_gas_in_gas_network)) + Q(conversion_from_propane_to_hydrogen), + PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_fossil_gas_in_gas_network)), + PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_fossil_gas_in_gas_network)) ) - unit = PJ diff --git a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_propane_to_hydrogen.gql b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_propane_to_hydrogen.gql new file mode 100644 index 0000000000..9a13251951 --- /dev/null +++ b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_propane_to_hydrogen.gql @@ -0,0 +1,13 @@ +# Direct conversion input of propane for central hydrogen production + +- query = + DIVIDE( + SUM( + V( + G(hydrogen_production), + "hydrogen_output_conversion / (1 - loss_output_conversion) * input_of_propane" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/costs/mece_costs/4_energy_carriers/costs_carriers_natural_gas.gql b/gqueries/general/costs/mece_costs/4_energy_carriers/costs_carriers_natural_gas.gql index a12c5c6ae5..dc5ba60afc 100644 --- a/gqueries/general/costs/mece_costs/4_energy_carriers/costs_carriers_natural_gas.gql +++ b/gqueries/general/costs/mece_costs/4_energy_carriers/costs_carriers_natural_gas.gql @@ -3,7 +3,8 @@ SUM( PRODUCT(V(CARRIER(natural_gas), cost_per_mj), V(energy_extraction_natural_gas, demand)), PRODUCT(V(CARRIER(natural_gas), cost_per_mj), V(energy_import_natural_gas, demand)), - PRODUCT(V(CARRIER(lng), cost_per_mj), V(energy_import_lng, demand)) + PRODUCT(V(CARRIER(lng), cost_per_mj), V(energy_import_lng, demand)), + PRODUCT(V(CARRIER(propane), cost_per_mj), V(energy_import_propane, demand)) ) - PRODUCT(V(CARRIER(natural_gas), cost_per_mj), V(energy_export_natural_gas_backup, demand)) diff --git a/gqueries/general/energy_production/electricity_produced_from_greengas.gql b/gqueries/general/energy_production/electricity_produced_from_greengas.gql index 5c18ff6315..0a910ed77a 100644 --- a/gqueries/general/energy_production/electricity_produced_from_greengas.gql +++ b/gqueries/general/energy_production/electricity_produced_from_greengas.gql @@ -3,7 +3,7 @@ SUM( V(G(electricity_production),"output_of_electricity * greengas_input_conversion "), PRODUCT( - Q(share_of_greengas_in_gas_network), + Q(share_of_sustainable_gas_in_gas_network), SUM( V(G(electricity_production),"output_of_electricity * network_gas_input_conversion "), V(G(electricity_production),"output_of_electricity * gas_power_fuelmix_input_conversion ").sum * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) diff --git a/gqueries/general/energy_production/electricity_produced_from_natural_gas.gql b/gqueries/general/energy_production/electricity_produced_from_natural_gas.gql index 1e3dd9001f..476c4bbac4 100644 --- a/gqueries/general/energy_production/electricity_produced_from_natural_gas.gql +++ b/gqueries/general/energy_production/electricity_produced_from_natural_gas.gql @@ -2,8 +2,10 @@ - query = SUM( V(G(electricity_production),"output_of_electricity * natural_gas_input_conversion "), + V(G(electricity_production),"output_of_electricity * propane_input_conversion "), + V(G(electricity_production),"output_of_electricity * lng_input_conversion "), PRODUCT( - Q(share_of_natural_gas_in_gas_network), + Q(share_of_fossil_gas_in_gas_network), SUM( V(G(electricity_production),"output_of_electricity * network_gas_input_conversion "), V(G(electricity_production),"output_of_electricity * gas_power_fuelmix_input_conversion ").sum * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) diff --git a/gqueries/general/energy_use/biomass_derivatives_used_for_heating_in_buildings.gql b/gqueries/general/energy_use/biomass_derivatives_used_for_heating_in_buildings.gql index 7a137634a5..075016bd86 100644 --- a/gqueries/general/energy_use/biomass_derivatives_used_for_heating_in_buildings.gql +++ b/gqueries/general/energy_use/biomass_derivatives_used_for_heating_in_buildings.gql @@ -9,6 +9,6 @@ V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_bio_ethanol), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_bio_lng), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_biogas), - Q(share_of_greengas_in_gas_network)*V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_network_gas).sum + Q(share_of_sustainable_gas_in_gas_network)*V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_network_gas).sum ) - deprecated_key = buildings_heating_final_demand_biomass diff --git a/gqueries/general/energy_use/fossil_energy_used_for_heat_and_cold_production.gql b/gqueries/general/energy_use/fossil_energy_used_for_heat_and_cold_production.gql index f71351dcfe..757cbd026a 100644 --- a/gqueries/general/energy_use/fossil_energy_used_for_heat_and_cold_production.gql +++ b/gqueries/general/energy_use/fossil_energy_used_for_heat_and_cold_production.gql @@ -9,7 +9,7 @@ DIVIDE( SUM( V(G(heat_production),input_of_fossil_carriers), - V(G(heat_production),input_of_network_gas).sum * Q(share_of_natural_gas_in_gas_network) + V(G(heat_production),input_of_network_gas).sum * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/general/energy_use/fossil_energy_used_for_heat_in_industry.gql b/gqueries/general/energy_use/fossil_energy_used_for_heat_in_industry.gql index 0892c295e0..a4a050781c 100644 --- a/gqueries/general/energy_use/fossil_energy_used_for_heat_in_industry.gql +++ b/gqueries/general/energy_use/fossil_energy_used_for_heat_in_industry.gql @@ -9,7 +9,7 @@ ), PRODUCT( SUM(V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)),output_of_network_gas)), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - deprecated_key = fossil_heat_industry diff --git a/gqueries/general/energy_use/fossil_energy_used_for_heating_in_buildings.gql b/gqueries/general/energy_use/fossil_energy_used_for_heating_in_buildings.gql index 23c0a710d4..d60b06c4df 100644 --- a/gqueries/general/energy_use/fossil_energy_used_for_heating_in_buildings.gql +++ b/gqueries/general/energy_use/fossil_energy_used_for_heating_in_buildings.gql @@ -5,7 +5,7 @@ SUM( V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_coal), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_crude_oil), - PRODUCT(Q(share_of_natural_gas_in_gas_network),SUM(V(Q(heating_converters_in_buildings_incl_collective_heaters),"input_of_network_gas + input_of_gas_power_fuelmix"))), + PRODUCT(Q(share_of_fossil_gas_in_gas_network),SUM(V(Q(heating_converters_in_buildings_incl_collective_heaters),"input_of_network_gas + input_of_gas_power_fuelmix"))), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_lng), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_diesel), V(Q(heating_converters_in_buildings_incl_collective_heaters),input_of_gasoline), diff --git a/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_greengas_in_buildings_appliances_energetic.gql b/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_greengas_in_buildings_appliances_energetic.gql index c69d59137f..e1a9f56ebf 100644 --- a/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_greengas_in_buildings_appliances_energetic.gql +++ b/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_greengas_in_buildings_appliances_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_natural_gas_in_buildings_appliances_energetic.gql b/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_natural_gas_in_buildings_appliances_energetic.gql index 4402e9468c..ed8fdadc10 100644 --- a/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_natural_gas_in_buildings_appliances_energetic.gql +++ b/gqueries/general/final_demand/buildings/appliances_buildings/final_demand_of_natural_gas_in_buildings_appliances_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_greengas_in_buildings_cooling_energetic.gql b/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_greengas_in_buildings_cooling_energetic.gql index ccb213bafa..858643d35f 100644 --- a/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_greengas_in_buildings_cooling_energetic.gql +++ b/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_greengas_in_buildings_cooling_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_natural_gas_in_buildings_cooling_energetic.gql b/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_natural_gas_in_buildings_cooling_energetic.gql index fdfede4b2b..290f82afb2 100644 --- a/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_natural_gas_in_buildings_cooling_energetic.gql +++ b/gqueries/general/final_demand/buildings/cooling_buildings/final_demand_of_natural_gas_in_buildings_cooling_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_greengas_in_buildings_lighting_energetic.gql b/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_greengas_in_buildings_lighting_energetic.gql index 18a9fb7f55..b2ccb719ef 100644 --- a/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_greengas_in_buildings_lighting_energetic.gql +++ b/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_greengas_in_buildings_lighting_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_natural_gas_in_buildings_lighting_energetic.gql b/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_natural_gas_in_buildings_lighting_energetic.gql index 39668d5750..29d4eacf87 100644 --- a/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_natural_gas_in_buildings_lighting_energetic.gql +++ b/gqueries/general/final_demand/buildings/lighting_buildings/final_demand_of_natural_gas_in_buildings_lighting_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_greengas_in_buildings_space_heating_energetic.gql b/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_greengas_in_buildings_space_heating_energetic.gql index fbbd4ab755..7426d29042 100644 --- a/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_greengas_in_buildings_space_heating_energetic.gql +++ b/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_greengas_in_buildings_space_heating_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_natural_gas_in_buildings_space_heating_energetic.gql b/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_natural_gas_in_buildings_space_heating_energetic.gql index e447db92e0..3f85009468 100644 --- a/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_natural_gas_in_buildings_space_heating_energetic.gql +++ b/gqueries/general/final_demand/buildings/space_heating_buildings/final_demand_of_natural_gas_in_buildings_space_heating_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/appliances_households/final_demand_of_greengas_in_households_appliances_energetic.gql b/gqueries/general/final_demand/households/appliances_households/final_demand_of_greengas_in_households_appliances_energetic.gql index 02e151fedb..98135f7025 100644 --- a/gqueries/general/final_demand/households/appliances_households/final_demand_of_greengas_in_households_appliances_energetic.gql +++ b/gqueries/general/final_demand/households/appliances_households/final_demand_of_greengas_in_households_appliances_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/appliances_households/final_demand_of_natural_gas_in_households_appliances_energetic.gql b/gqueries/general/final_demand/households/appliances_households/final_demand_of_natural_gas_in_households_appliances_energetic.gql index 7e8c2cbac5..440f0a4b98 100644 --- a/gqueries/general/final_demand/households/appliances_households/final_demand_of_natural_gas_in_households_appliances_energetic.gql +++ b/gqueries/general/final_demand/households/appliances_households/final_demand_of_natural_gas_in_households_appliances_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/cooking_households/final_demand_of_greengas_in_households_cooking_energetic.gql b/gqueries/general/final_demand/households/cooking_households/final_demand_of_greengas_in_households_cooking_energetic.gql index 6dbf8fe4fe..ad468cfb1c 100644 --- a/gqueries/general/final_demand/households/cooking_households/final_demand_of_greengas_in_households_cooking_energetic.gql +++ b/gqueries/general/final_demand/households/cooking_households/final_demand_of_greengas_in_households_cooking_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/cooking_households/final_demand_of_natural_gas_in_households_cooking_energetic.gql b/gqueries/general/final_demand/households/cooking_households/final_demand_of_natural_gas_in_households_cooking_energetic.gql index 28d3a00ba6..155575a488 100644 --- a/gqueries/general/final_demand/households/cooking_households/final_demand_of_natural_gas_in_households_cooking_energetic.gql +++ b/gqueries/general/final_demand/households/cooking_households/final_demand_of_natural_gas_in_households_cooking_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/cooling_households/final_demand_of_greengas_in_households_cooling_energetic.gql b/gqueries/general/final_demand/households/cooling_households/final_demand_of_greengas_in_households_cooling_energetic.gql index eb363fddf4..f9b378456c 100644 --- a/gqueries/general/final_demand/households/cooling_households/final_demand_of_greengas_in_households_cooling_energetic.gql +++ b/gqueries/general/final_demand/households/cooling_households/final_demand_of_greengas_in_households_cooling_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/cooling_households/final_demand_of_natural_gas_in_households_cooling_energetic.gql b/gqueries/general/final_demand/households/cooling_households/final_demand_of_natural_gas_in_households_cooling_energetic.gql index d0bbabd001..649ecfc629 100644 --- a/gqueries/general/final_demand/households/cooling_households/final_demand_of_natural_gas_in_households_cooling_energetic.gql +++ b/gqueries/general/final_demand/households/cooling_households/final_demand_of_natural_gas_in_households_cooling_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/hot_water_households/final_demand_of_greengas_in_households_hot_water_energetic.gql b/gqueries/general/final_demand/households/hot_water_households/final_demand_of_greengas_in_households_hot_water_energetic.gql index 434428c1af..86e0f20b83 100644 --- a/gqueries/general/final_demand/households/hot_water_households/final_demand_of_greengas_in_households_hot_water_energetic.gql +++ b/gqueries/general/final_demand/households/hot_water_households/final_demand_of_greengas_in_households_hot_water_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/hot_water_households/final_demand_of_natural_gas_in_households_hot_water_energetic.gql b/gqueries/general/final_demand/households/hot_water_households/final_demand_of_natural_gas_in_households_hot_water_energetic.gql index a45ca81211..77a1dc5c7f 100644 --- a/gqueries/general/final_demand/households/hot_water_households/final_demand_of_natural_gas_in_households_hot_water_energetic.gql +++ b/gqueries/general/final_demand/households/hot_water_households/final_demand_of_natural_gas_in_households_hot_water_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/lighting_households/final_demand_of_greengas_in_households_lighting_energetic.gql b/gqueries/general/final_demand/households/lighting_households/final_demand_of_greengas_in_households_lighting_energetic.gql index cf7135e34f..b83b25dda7 100644 --- a/gqueries/general/final_demand/households/lighting_households/final_demand_of_greengas_in_households_lighting_energetic.gql +++ b/gqueries/general/final_demand/households/lighting_households/final_demand_of_greengas_in_households_lighting_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/lighting_households/final_demand_of_natural_gas_in_households_lighting_energetic.gql b/gqueries/general/final_demand/households/lighting_households/final_demand_of_natural_gas_in_households_lighting_energetic.gql index 37256cc531..4f67d5eb2f 100644 --- a/gqueries/general/final_demand/households/lighting_households/final_demand_of_natural_gas_in_households_lighting_energetic.gql +++ b/gqueries/general/final_demand/households/lighting_households/final_demand_of_natural_gas_in_households_lighting_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/space_heating_households/final_demand_of_greengas_in_households_space_heating_energetic.gql b/gqueries/general/final_demand/households/space_heating_households/final_demand_of_greengas_in_households_space_heating_energetic.gql index 30577bc6a0..870c8fb160 100644 --- a/gqueries/general/final_demand/households/space_heating_households/final_demand_of_greengas_in_households_space_heating_energetic.gql +++ b/gqueries/general/final_demand/households/space_heating_households/final_demand_of_greengas_in_households_space_heating_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/households/space_heating_households/final_demand_of_natural_gas_in_households_space_heating_energetic.gql b/gqueries/general/final_demand/households/space_heating_households/final_demand_of_natural_gas_in_households_space_heating_energetic.gql index a22780f8a6..1136524e00 100644 --- a/gqueries/general/final_demand/households/space_heating_households/final_demand_of_natural_gas_in_households_space_heating_energetic.gql +++ b/gqueries/general/final_demand/households/space_heating_households/final_demand_of_natural_gas_in_households_space_heating_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_energetic.gql index 4aa26db736..799cb73d0e 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(chemical_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(chemical_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_non_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_non_energetic.gql index 52a0604cf9..053080de0f 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_chemical_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(chemical_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(chemical_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry.gql index 50161d7d50..5f54048c12 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_energetic.gql index 91b03b7c5e..6c2de260b4 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_non_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_non_energetic.gql index 8bddd1929c..de6ba826aa 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_other_chemical_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_chemical_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry.gql index 51beab895a..e6d227e7b0 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_energetic.gql index ca3e6aee10..6cf8bd32f1 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_non_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_non_energetic.gql index c172401e0f..6cbf2ffe9a 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/final_demand_of_natural_gas_and_derivatives_in_refineries_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(refineries_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry.gql b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry.gql index 0c357983c2..33e52945bf 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_energetic.gql index 34533f084d..af15d3bf22 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_non_energetic.gql b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_non_energetic.gql index 72fa6c3b13..bfc4e8e6ae 100644 --- a/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/chemical_industry/nl/final_demand_of_natural_gas_and_derivatives_in_fertilizers_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(fertilizers_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry.gql b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry.gql index 938861c297..132d7f1e42 100644 --- a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry.gql +++ b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value - ) + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + propane? + ), + value + ), ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_energetic.gql b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_energetic.gql index 7232f23b1e..4313b41ddf 100644 --- a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value - ) + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + energetic? + ), + propane? + ), + value + ), ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_non_energetic.gql b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_non_energetic.gql index 55b3801720..d07f8bb725 100644 --- a/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/metal_industry/final_demand_of_natural_gas_and_derivatives_in_metal_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value - ) + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(metal_industry) + ), + "! energetic?" + ), + propane? + ), + value + ), ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_greengas_in_ict_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_greengas_in_ict_industry_energetic.gql index 2d44b4dfa6..07ba954a91 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_greengas_in_ict_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_greengas_in_ict_industry_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry.gql index 1369ba275c..ea939c9053 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_energetic.gql index e80727a235..bfebe41fea 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_non_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_non_energetic.gql index 633ddbde7c..599dd06388 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_food_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(food_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry.gql index d412812099..77e08575df 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,15 @@ lng? ), value + ), + + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_energetic.gql index 5d6cfb2b8c..f7ce6ed3b6 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value - ) + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + energetic? + ), + propane? + ), + value + ), ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_non_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_non_energetic.gql index 00d70a4d31..84e9837b74 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_ict_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(ict_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry.gql index cbb67e4578..45bef72483 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_energetic.gql index fa203ba1ed..0e6d7dc621 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_non_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_non_energetic.gql index c90465efb1..eff1757f9e 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_other_non_specified_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(other_non_specified_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry.gql index fb4e408243..50ebb19a17 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry.gql @@ -12,6 +12,15 @@ ), value ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + compressed_network_gas? + ), + value + ), V( FILTER( INTERSECTION( @@ -20,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_energetic.gql index 3d0d2b2a5c..aa424623b4 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + energetic? + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + energetic? + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_non_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_non_energetic.gql index 762bfe2fbd..c01ee9b8a0 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_non_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_and_derivatives_in_paper_industry_non_energetic.gql @@ -15,6 +15,18 @@ ), value ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + "! energetic?" + ), + compressed_network_gas? + ), + value + ), V( FILTER( FILTER( @@ -26,5 +38,17 @@ lng? ), value + ), + V( + FILTER( + FILTER( + INTERSECTION( + EG(final_demand),EG(paper_industry) + ), + "! energetic?" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_in_ict_industry_energetic.gql b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_in_ict_industry_energetic.gql index 957d2a8f1e..ea112baadc 100644 --- a/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_in_ict_industry_energetic.gql +++ b/gqueries/general/final_demand/industry/other_industry/final_demand_of_natural_gas_in_ict_industry_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_agriculture.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_agriculture.gql index f835c5aa6f..f04fa24079 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_agriculture.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_agriculture.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :agriculture" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_buildings.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_buildings.gql index c18fe761fc..8e44fb797b 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_buildings.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_buildings.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :buildings" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_bunkers.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_bunkers.gql index f427ab0402..758da70077 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_bunkers.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_bunkers.gql @@ -29,5 +29,15 @@ lng? ), value + ), + , + V( + FILTER( + FILTER( + EG(final_demand),"sector == :bunkers" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_energy.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_energy.gql index 54dfb1a11b..d4cdf30014 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_energy.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_energy.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :energy" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_households.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_households.gql index 0aa5d4bf91..404b6ce073 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_households.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_households.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :households" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_industry.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_industry.gql index 82152efae0..f0c3d7b590 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_industry.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_industry.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :industry" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_other.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_other.gql index 6eabb2d624..c80f0dae9b 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_other.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_other.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :other" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_transport.gql b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_transport.gql index c3ecb7e0b6..50065e7b2f 100644 --- a/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_transport.gql +++ b/gqueries/general/final_demand/mece/final_demand_of_natural_gas_and_derivatives_in_transport.gql @@ -29,5 +29,14 @@ lng? ), value + ), + V( + FILTER( + FILTER( + EG(final_demand),"sector == :transport" + ), + propane? + ), + value ) ) / BILLIONS diff --git a/gqueries/general/final_demand/mece/per_carrier/final_demand_of_natural_gas_and_derivatives.gql b/gqueries/general/final_demand/mece/per_carrier/final_demand_of_natural_gas_and_derivatives.gql index 4bd4d23158..09e91ec8fa 100644 --- a/gqueries/general/final_demand/mece/per_carrier/final_demand_of_natural_gas_and_derivatives.gql +++ b/gqueries/general/final_demand/mece/per_carrier/final_demand_of_natural_gas_and_derivatives.gql @@ -5,7 +5,7 @@ SUM( V( FILTER( - EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), value ) diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic.gql index 42d5e8e260..03e14ac65b 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :agriculture"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :agriculture"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_buildings_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_buildings_energetic.gql index 2d4d519bb0..537c4b31f4 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_buildings_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_buildings_energetic.gql @@ -6,7 +6,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :buildings"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :buildings"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic.gql index 1510bf5cd8..8ee481558f 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :bunkers"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :bunkers"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_energy_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_energy_energetic.gql index de96679a9d..5673d7f11d 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_energy_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_energy_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :energy"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :energy"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_households_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_households_energetic.gql index dfa1bb4b48..8ef925f344 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_households_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_households_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :households"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :households"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_industry_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_industry_energetic.gql index d8dba6262a..8786b25652 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_industry_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_industry_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :industry"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :industry"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_other_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_other_energetic.gql index 1a42621989..04d4d18885 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_other_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_other_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :other"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :other"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_transport_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_transport_energetic.gql index e4ad97ccf2..3bfeeeac5d 100644 --- a/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_transport_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/final_demand_of_natural_gas_and_derivatives_in_transport_energetic.gql @@ -7,7 +7,7 @@ FILTER( FILTER( FILTER( - EG(final_demand),"sector == :transport"), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand),"sector == :transport"), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "energetic?" ), diff --git a/gqueries/general/final_demand/mece_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_energetic.gql b/gqueries/general/final_demand/mece_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_energetic.gql index 290baca507..91df731a41 100644 --- a/gqueries/general/final_demand/mece_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_energetic.gql +++ b/gqueries/general/final_demand/mece_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_energetic.gql @@ -6,7 +6,7 @@ V( FILTER( FILTER( - EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), energetic? ), diff --git a/gqueries/general/final_demand/mece_non_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_non_energetic.gql b/gqueries/general/final_demand/mece_non_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_non_energetic.gql index 6f5af17642..b23d7823e5 100644 --- a/gqueries/general/final_demand/mece_non_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_non_energetic.gql +++ b/gqueries/general/final_demand/mece_non_energetic/per_carrier/final_demand_of_natural_gas_and_derivatives_non_energetic.gql @@ -6,7 +6,7 @@ V( FILTER( FILTER( - EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng?" + EG(final_demand), "network_gas? || compressed_network_gas? || natural_gas? || lng? || propane?" ), "!energetic?" ), diff --git a/gqueries/general/import_export/export/export_of_propane.gql b/gqueries/general/import_export/export/export_of_propane.gql new file mode 100644 index 0000000000..66d22e2965 --- /dev/null +++ b/gqueries/general/import_export/export/export_of_propane.gql @@ -0,0 +1,15 @@ +# Export of natural gas + +- query = + DIVIDE( + SUM( + V( + G(energy_export), + input_of( + propane + ) + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/import_export/import/import_of_propane.gql b/gqueries/general/import_export/import/import_of_propane.gql new file mode 100644 index 0000000000..06921771d6 --- /dev/null +++ b/gqueries/general/import_export/import/import_of_propane.gql @@ -0,0 +1,15 @@ +# Import of natural gas + +- query = + DIVIDE( + SUM( + V( + G(energy_import), + output_of( + propane + ) + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/import_export/import_of_natural_gas.gql b/gqueries/general/import_export/import_of_natural_gas_and_derivatives.gql similarity index 80% rename from gqueries/general/import_export/import_of_natural_gas.gql rename to gqueries/general/import_export/import_of_natural_gas_and_derivatives.gql index 6e8dbb3bb0..eacf647cc4 100644 --- a/gqueries/general/import_export/import_of_natural_gas.gql +++ b/gqueries/general/import_export/import_of_natural_gas_and_derivatives.gql @@ -8,7 +8,8 @@ output_of( natural_gas, lng, - compressed_natural_gas + compressed_natural_gas, + propane ) ) ), diff --git a/gqueries/general/network_gas/production/propane_network_gas_output.gql b/gqueries/general/network_gas/production/propane_network_gas_output.gql new file mode 100644 index 0000000000..9f6f263c4b --- /dev/null +++ b/gqueries/general/network_gas/production/propane_network_gas_output.gql @@ -0,0 +1,2 @@ +- query = V(energy_distribution_propane, demand) / BILLIONS +- unit = PJ diff --git a/gqueries/general/network_gas/production/propane_network_gas_output_curve.gql b/gqueries/general/network_gas/production/propane_network_gas_output_curve.gql new file mode 100644 index 0000000000..3ee1b387fe --- /dev/null +++ b/gqueries/general/network_gas/production/propane_network_gas_output_curve.gql @@ -0,0 +1,2 @@ +- query = V(energy_distribution_propane, network_gas_output_curve) +- unit = curve diff --git a/gqueries/general/shares/propane_in_gas_network.gql b/gqueries/general/shares/propane_in_gas_network.gql new file mode 100644 index 0000000000..fb2bd8403b --- /dev/null +++ b/gqueries/general/shares/propane_in_gas_network.gql @@ -0,0 +1,4 @@ +# The amount of propane that is put into the national gas network + +- unit = PJ +- query = V(energy_national_gas_network_natural_gas,input_of_propane) / BILLIONS diff --git a/gqueries/general/shares/share_of_fossil_gas_in_gas_network.gql b/gqueries/general/shares/share_of_fossil_gas_in_gas_network.gql index e854b199e6..95000e4a26 100644 --- a/gqueries/general/shares/share_of_fossil_gas_in_gas_network.gql +++ b/gqueries/general/shares/share_of_fossil_gas_in_gas_network.gql @@ -1,2 +1,3 @@ -- query = 1 - Q(share_of_greengas_in_gas_network) +- query = + 1 - V(energy_national_gas_network_natural_gas, sustainability_share) - unit = factor diff --git a/gqueries/general/shares/share_of_propane_in_gas_network.gql b/gqueries/general/shares/share_of_propane_in_gas_network.gql new file mode 100644 index 0000000000..2138fe0cae --- /dev/null +++ b/gqueries/general/shares/share_of_propane_in_gas_network.gql @@ -0,0 +1,3 @@ +- query = V(energy_national_gas_network_natural_gas,propane_input_conversion) +- unit = factor +- deprecated_key = propane_share diff --git a/gqueries/general/shares/share_of_renewables_in_heat_produced_in_buildings.gql b/gqueries/general/shares/share_of_renewables_in_heat_produced_in_buildings.gql index adc10c501d..5127120550 100644 --- a/gqueries/general/shares/share_of_renewables_in_heat_produced_in_buildings.gql +++ b/gqueries/general/shares/share_of_renewables_in_heat_produced_in_buildings.gql @@ -4,7 +4,7 @@ DIVIDE( SUM( SUM(V(Q(heating_converters_in_buildings_incl_collective_heaters),"input_of_wood_pellets + input_of_greengas + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_biogas + input_of_ambient_heat + input_of_solar_radiation + input_of_solar_thermal + input_of_geothermal")), - PRODUCT(SUM(V(Q(heating_converters_in_buildings_incl_collective_heaters),"input_of_network_gas + input_of_gas_power_fuelmix")),Q(share_of_greengas_in_gas_network)) + PRODUCT(SUM(V(Q(heating_converters_in_buildings_incl_collective_heaters),"input_of_network_gas + input_of_gas_power_fuelmix")),Q(share_of_sustainable_gas_in_gas_network)) ), Q(energy_used_for_heating_in_buildings) ) diff --git a/gqueries/general/shares/share_of_sustainable_gas_in_gas_network.gql b/gqueries/general/shares/share_of_sustainable_gas_in_gas_network.gql new file mode 100644 index 0000000000..7778c87aaf --- /dev/null +++ b/gqueries/general/shares/share_of_sustainable_gas_in_gas_network.gql @@ -0,0 +1,3 @@ +- query = + V(energy_national_gas_network_natural_gas, sustainability_share) +- unit = factor diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_central_heat_prod_in_biomass_sankey_efficiency_correction_greengas.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_central_heat_prod_in_biomass_sankey_efficiency_correction_greengas.gql index 50f8bdc3f1..3eef868726 100644 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_central_heat_prod_in_biomass_sankey_efficiency_correction_greengas.gql +++ b/gqueries/mechanical_turk/demand/biomass/turk_input_of_central_heat_prod_in_biomass_sankey_efficiency_correction_greengas.gql @@ -13,5 +13,5 @@ ), "input_of_network_gas * (steam_hot_water_output_conversion - 1)") ), - Q(share_of_greengas_in_gas_network)), + Q(share_of_sustainable_gas_in_gas_network)), BILLIONS) \ No newline at end of file diff --git a/gqueries/mechanical_turk/sankey/final_demand/turk_sankey_final_demand_of_biomass_products_nodes.gql b/gqueries/mechanical_turk/sankey/final_demand/turk_sankey_final_demand_of_biomass_products_nodes.gql index d889ea043f..ad98ba68d6 100644 --- a/gqueries/mechanical_turk/sankey/final_demand/turk_sankey_final_demand_of_biomass_products_nodes.gql +++ b/gqueries/mechanical_turk/sankey/final_demand/turk_sankey_final_demand_of_biomass_products_nodes.gql @@ -5,11 +5,11 @@ SUM( PRODUCT( Q(turk_sankey_final_demand_of_network_gas_nodes), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), PRODUCT( Q(turk_sankey_final_demand_of_compressed_network_gas_nodes), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), Q(final_demand_of_biomass_products) ) diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_collective.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_collective.gql index 21995b3da8..1574643dbe 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_collective.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_collective.gql @@ -5,6 +5,6 @@ V(buildings_collective_chp_network_gas, demand), V(energy_heater_for_heat_network_network_gas, demand), V(agriculture_chp_engine_network_gas, demand) - ) * Q(share_of_greengas_in_gas_network) + ) * Q(share_of_sustainable_gas_in_gas_network) - unit = MJ diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_individual.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_individual.gql index b69549ca64..bd79f31779 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_individual.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_individual.gql @@ -36,6 +36,6 @@ ), value ) - ) * Q(share_of_greengas_in_gas_network) + ) * Q(share_of_sustainable_gas_in_gas_network) - unit = MJ diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_industry.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_industry.gql index 37df3aae92..b3de913f58 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_industry.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_biogas_greengas_industry.gql @@ -12,6 +12,6 @@ ), value ) - ) * Q(share_of_greengas_in_gas_network) + ) * Q(share_of_sustainable_gas_in_gas_network) - unit = MJ diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_collective.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_collective.gql index 5266036755..037bc42dc4 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_collective.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_collective.gql @@ -5,6 +5,6 @@ energy_heat_burner_network_gas, demand ) - ) * (1 - Q(share_of_greengas_in_gas_network)) + ) * (1 - Q(share_of_sustainable_gas_in_gas_network)) - unit = MJ diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_individual.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_individual.gql index 97882e0d87..aa9be99f47 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_individual.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_individual.gql @@ -24,6 +24,6 @@ ), value ) - ) * (1.0 - Q(share_of_greengas_in_gas_network)) + ) * (1.0 - Q(share_of_sustainable_gas_in_gas_network)) - unit = MJ diff --git a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_industry.gql b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_industry.gql index b78b55c7b6..6ee5141aa5 100644 --- a/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_industry.gql +++ b/gqueries/modules/energy_mix/datadump/factsheet_demand_gas_from_fossil_industry.gql @@ -12,6 +12,6 @@ ), value ) - ) * (1.0 - Q(share_of_greengas_in_gas_network)) + ) * (1.0 - Q(share_of_sustainable_gas_in_gas_network)) - unit = MJ diff --git a/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_biogas.gql b/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_biogas.gql index a41216e6f3..313c26f43e 100644 --- a/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_biogas.gql +++ b/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_biogas.gql @@ -3,7 +3,7 @@ (V(energy_national_gas_network_natural_gas, demand) - V(INTERSECTION(G(final_demand_group), USE(non_energetic)), "input_of_network_gas").sum), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) + V(G(costs_production_chp_plants),input_of_biogas).sum diff --git a/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_fossil.gql b/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_fossil.gql index a354426a94..509056c301 100644 --- a/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_fossil.gql +++ b/gqueries/modules/energy_mix/supply_chart/factsheet_supply_gas_from_fossil.gql @@ -4,7 +4,7 @@ (V(energy_national_gas_network_natural_gas, demand) - V(INTERSECTION(G(final_demand_group), USE(non_energetic)), "input_of_network_gas").sum), - (1.0 - Q(share_of_greengas_in_gas_network)) + (1.0 - Q(share_of_sustainable_gas_in_gas_network)) ), V(energy_treatment_natural_gas, output_of_loss), V(energy_import_lpg, demand), diff --git a/gqueries/modules/etflex/etflex_score_greengas.gql b/gqueries/modules/etflex/etflex_score_greengas.gql index 4bd0ffb843..aa7e853195 100644 --- a/gqueries/modules/etflex/etflex_score_greengas.gql +++ b/gqueries/modules/etflex/etflex_score_greengas.gql @@ -1,4 +1,4 @@ # - (0.4 points for each percentage point of green gas)^2 -- query = -900 * Q(share_of_greengas_in_gas_network)**2 +- query = -900 * Q(share_of_sustainable_gas_in_gas_network)**2 - unit = # diff --git a/gqueries/modules/multi_year_charts/final_demand_chart/per_carrier/myc_final_demand_of_natural_gas_and_derivatives.gql b/gqueries/modules/multi_year_charts/final_demand_chart/per_carrier/myc_final_demand_of_natural_gas_and_derivatives.gql index b75880b8f5..f007f1c175 100644 --- a/gqueries/modules/multi_year_charts/final_demand_chart/per_carrier/myc_final_demand_of_natural_gas_and_derivatives.gql +++ b/gqueries/modules/multi_year_charts/final_demand_chart/per_carrier/myc_final_demand_of_natural_gas_and_derivatives.gql @@ -7,5 +7,6 @@ V(energy_national_gas_network_natural_gas,natural_gas_input_conversion), SUM(V(G(final_demand_group), input_of_compressed_network_gas)) * V(energy_national_gas_network_natural_gas,natural_gas_input_conversion), - SUM(V(G(final_demand_group), input_of_lng)) + SUM(V(G(final_demand_group), input_of_lng)), + SUM(V(G(final_demand_group), input_of_propane)) ) diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql index bce06f0674..6915ad1a33 100644 --- a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql +++ b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql @@ -2,11 +2,11 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_biomass_products), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_greengas_to_network_gas), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), Q(conversion_loss_bio_kerosene_to_bio_kerosene), Q(conversion_loss_bio_ethanol_to_bio_ethanol), diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_electricity.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_electricity.gql index 5a1630f6cd..8a0e654550 100644 --- a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_electricity.gql +++ b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_electricity.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_electricity), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_gas_power_fuelmix_to_electricity), diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_hydrogen.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_hydrogen.gql index 08f57db2b4..fff9a1c992 100644 --- a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_hydrogen.gql +++ b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_hydrogen.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_hydrogen), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), Q(conversion_loss_torrefied_biomass_pellets_to_hydrogen) ) diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_natural_gas_and_derivatives.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_natural_gas_and_derivatives.gql index 34c8a0de62..acf8fe2dfb 100644 --- a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_natural_gas_and_derivatives.gql +++ b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_natural_gas_and_derivatives.gql @@ -2,11 +2,11 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_natural_gas_and_derivatives), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_greengas_to_network_gas), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_steam_hot_water.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_steam_hot_water.gql index 50e004d634..63f4fc73b1 100644 --- a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_steam_hot_water.gql +++ b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_steam_hot_water.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_steam_hot_water), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_gas_power_fuelmix_to_steam_hot_water), diff --git a/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_biomass_products.gql b/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_biomass_products.gql index 571691b690..bb3a8306ba 100644 --- a/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_biomass_products.gql +++ b/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_biomass_products.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_electricity_to_compressed_network_gas), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_natural_gas_and_derivatives.gql b/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_natural_gas_and_derivatives.gql index 9e9a307ffd..8011e1bda4 100644 --- a/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_natural_gas_and_derivatives.gql +++ b/gqueries/modules/sankey_csv/conversion/electricity/conversion_loss_electricity_to_natural_gas_and_derivatives.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_electricity_to_compressed_network_gas), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_biomass_products.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_biomass_products.gql index c82c90e160..d6d89da7eb 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_biomass_products.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_biomass_products.gql @@ -2,11 +2,11 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_biomass_products), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_natural_gas_to_network_gas), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_electricity.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_electricity.gql index aa51fdb886..78ca7c545f 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_electricity.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_electricity.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_electricity), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_hydrogen.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_hydrogen.gql index ce40c6132e..643f187678 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_hydrogen.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_hydrogen.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_hydrogen), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), Q(conversion_loss_natural_gas_to_hydrogen) ) diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_natural_gas_and_derivatives.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_natural_gas_and_derivatives.gql index b457378f2a..c1c9be7a8f 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_natural_gas_and_derivatives.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_natural_gas_and_derivatives.gql @@ -2,11 +2,11 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_natural_gas_and_derivatives), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), PRODUCT( Q(conversion_loss_natural_gas_to_network_gas), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ), Q(conversion_loss_natural_gas_to_natural_gas), Q(conversion_loss_lng_to_natural_gas) diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_steam_hot_water.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_steam_hot_water.gql index 404df08f34..c02058a45a 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_steam_hot_water.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_natural_gas_and_derivatives_to_steam_hot_water.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_steam_hot_water), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_biomass_products.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_biomass_products.gql index 0dd32e8fd8..b832a231f2 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_biomass_products.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_biomass_products.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_compressed_network_gas), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_natural_gas_and_derivatives.gql b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_natural_gas_and_derivatives.gql index 8e19f9abf2..3ee9679136 100644 --- a/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_natural_gas_and_derivatives.gql +++ b/gqueries/modules/sankey_csv/conversion/natural_gas_and_derivatives/conversion_loss_network_gas_to_natural_gas_and_derivatives.gql @@ -2,7 +2,7 @@ SUM( PRODUCT( Q(conversion_loss_network_gas_to_compressed_network_gas), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) ) - unit = PJ diff --git a/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_greengas_in_industry_energetic.gql b/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_greengas_in_industry_energetic.gql index b3a7c563cd..f40b646aa9 100644 --- a/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_greengas_in_industry_energetic.gql +++ b/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_greengas_in_industry_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_greengas_in_gas_network) + Q(share_of_sustainable_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_natural_gas_in_industry_energetic.gql b/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_natural_gas_in_industry_energetic.gql index 9dcdb3471c..272b9333cf 100644 --- a/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_natural_gas_in_industry_energetic.gql +++ b/gqueries/modules/sankey_csv/industry_final_demand/final_demand_of_natural_gas_in_industry_energetic.gql @@ -14,5 +14,5 @@ value ), ), - Q(share_of_natural_gas_in_gas_network) + Q(share_of_fossil_gas_in_gas_network) ) / BILLIONS diff --git a/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_heat_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_heat_dem_in_biomass_sankey.gql index 65253ac11d..84e9a47ee3 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_heat_dem_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_heat_dem_in_biomass_sankey.gql @@ -9,6 +9,6 @@ SUM(V(Q(central_heat_producing_converters_sankey), "input_of_waste_mix * steam_hot_water_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(Q(central_heat_producing_converters_sankey), "input_of_wood_pellets * steam_hot_water_output_conversion")), SUM(V(Q(central_heat_producing_converters_sankey), "input_of_torrefied_biomass_pellets * steam_hot_water_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_greengas_in_gas_network)), + SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_losses_in_biomass_sankey.gql index 01217da074..2a0c329ac1 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_losses_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/central_heat_prod_to_losses_in_biomass_sankey.gql @@ -9,6 +9,6 @@ SUM(V(Q(central_heat_producing_converters_sankey), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(Q(central_heat_producing_converters_sankey), "input_of_wood_pellets * loss_output_conversion")), SUM(V(Q(central_heat_producing_converters_sankey), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_greengas_in_gas_network)), + SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_electricity_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_electricity_dem_in_biomass_sankey.gql index 12062661ac..5457752a59 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_electricity_dem_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_electricity_dem_in_biomass_sankey.gql @@ -9,7 +9,7 @@ SUM(V(G(electricity_production), "input_of_waste_mix * electricity_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(G(electricity_production), "input_of_wood_pellets * electricity_output_conversion")), SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * electricity_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * electricity_output_conversion")) * Q(share_of_greengas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * electricity_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_greengas_in_gas_network)), + SUM(V(G(electricity_production), "input_of_network_gas * electricity_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), + SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * electricity_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_heat_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_heat_dem_in_biomass_sankey.gql index bc47b36ee7..eff9e36bce 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_heat_dem_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_heat_dem_in_biomass_sankey.gql @@ -9,7 +9,7 @@ SUM(V(G(electricity_production), "input_of_waste_mix * steam_hot_water_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(G(electricity_production), "input_of_wood_pellets * steam_hot_water_output_conversion")), SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * steam_hot_water_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_greengas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * steam_hot_water_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_greengas_in_gas_network)), + SUM(V(G(electricity_production), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), + SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * steam_hot_water_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_losses_in_biomass_sankey.gql index 3aa9c6bf38..92e0ebd6fc 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_losses_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/electricity_prod_to_losses_in_biomass_sankey.gql @@ -9,7 +9,7 @@ SUM(V(G(electricity_production), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(G(electricity_production), "input_of_wood_pellets * loss_output_conversion")), SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * loss_output_conversion")) * Q(share_of_greengas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_greengas_in_gas_network)), + SUM(V(G(electricity_production), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), + SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_agriculture_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_agriculture_in_biomass_sankey.gql index b1af67b012..df2043d457 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_agriculture_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_agriculture_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(agriculture)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(agriculture)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_buildings_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_buildings_in_biomass_sankey.gql index 0f19e66a55..2f3aa764bb 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_buildings_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_buildings_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(buildings)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(buildings)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_bunkers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_bunkers_in_biomass_sankey.gql index 8a14e7b535..0d9e6c8f75 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_bunkers_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_bunkers_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(bunkers)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(bunkers)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_central_heat_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_central_heat_prod_in_biomass_sankey.gql index f1c2cda657..e0a461983a 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_central_heat_prod_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_central_heat_prod_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(Q(central_heat_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(Q(central_heat_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_electricity_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_electricity_prod_in_biomass_sankey.gql index 1f96a91071..c28130adf6 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_electricity_prod_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_electricity_prod_in_biomass_sankey.gql @@ -4,8 +4,8 @@ - query = DIVIDE( SUM( - SUM(V(G(electricity_production), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), - SUM(V(G(electricity_production), input_of_gas_power_fuelmix)) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_greengas_in_gas_network) + SUM(V(G(electricity_production), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), + SUM(V(G(electricity_production), input_of_gas_power_fuelmix)) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_households_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_households_in_biomass_sankey.gql index c0945b61db..bb08b01a6a 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_households_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_households_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(households)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(households)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_hydrogen_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_hydrogen_prod_in_biomass_sankey.gql index 592a14962c..1691cacdcf 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_hydrogen_prod_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_hydrogen_prod_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(Q(hydrogen_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(Q(hydrogen_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_in_biomass_sankey.gql index 493bcb9793..509c8482c0 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(industry)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(industry)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_losses_in_biomass_sankey.gql index c9748e0fbc..af41070b67 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_losses_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_losses_in_biomass_sankey.gql @@ -13,8 +13,8 @@ V(EDGE(energy_greengas_upgrade_biogas, energy_distribution_biogas), parent_share) ), V(energy_national_gas_network_natural_gas, - output_of_loss) * Q(share_of_greengas_in_gas_network), + output_of_loss) * Q(share_of_sustainable_gas_in_gas_network), V(energy_torrefaction_wood, - input_of_network_gas) * Q(share_of_greengas_in_gas_network)), + input_of_network_gas) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_other_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_other_in_biomass_sankey.gql index 636ad4fc3a..95d4a64f1a 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_other_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_other_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(other)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(other)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_transport_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_transport_in_biomass_sankey.gql index 7797bbf129..94beff5359 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_transport_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_transport_in_biomass_sankey.gql @@ -3,6 +3,6 @@ - unit = PJ - query = DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(transport)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network), + SUM(V(INTERSECTION(G(final_demand_group), SECTOR(transport)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql index 77454ed80a..d38fab7786 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql @@ -9,6 +9,6 @@ SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_waste_mix * hydrogen_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_wood_pellets * hydrogen_output_conversion")), SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_torrefied_biomass_pellets * hydrogen_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * hydrogen_output_conversion")) * Q(share_of_greengas_in_gas_network)), + SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * hydrogen_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_losses_in_biomass_sankey.gql index 1988179ae2..eb4a415e21 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_losses_in_biomass_sankey.gql +++ b/gqueries/output_elements/output_series/biomass_sankey/hydrogen_prod_to_losses_in_biomass_sankey.gql @@ -9,6 +9,6 @@ SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_wood_pellets * loss_output_conversion")), SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_greengas_in_gas_network)), + SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_agriculture_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_agriculture_in_sankey.gql index 91654dcc1b..dae87a11cc 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_agriculture_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_agriculture_in_sankey.gql @@ -5,7 +5,7 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_buildings_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_buildings_in_sankey.gql index 68f22cea1d..4ef02f7318 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_buildings_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_buildings_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_bunkers_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_bunkers_in_sankey.gql index 486f1790eb..d9fea34395 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_bunkers_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_bunkers_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_energy_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_energy_in_sankey.gql index 777217b9d7..f28887332f 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_energy_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_energy_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_export_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_export_in_sankey.gql index 4747077b9d..18b6b79b2b 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_export_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_export_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(G(energy_export), "input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene + input_of_greengas + input_of_dry_biomass + input_of_wet_biomass + input_of_oily_biomass + input_of_biogenic_waste + input_of_non_biogenic_waste"), - (V(G(energy_export), input_of(network_gas, compressed_network_gas)) * Q(share_of_greengas_in_gas_network)) + (V(G(energy_export), input_of(network_gas, compressed_network_gas)) * Q(share_of_sustainable_gas_in_gas_network)) ), BILLIONS) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_feedstock_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_feedstock_in_sankey.gql index 9107d297f2..a74a5a3ee6 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_feedstock_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_feedstock_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(G(final_demand_group),USE(non_energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(G(final_demand_group),USE(non_energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(G(final_demand_group),USE(non_energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_households_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_households_in_sankey.gql index eca4e18894..1ae392a63f 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_households_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_households_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_industry_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_industry_in_sankey.gql index 3daf5a162e..0398872579 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_industry_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_industry_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_other_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_other_in_sankey.gql index 174deec397..70bc8924ba 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_other_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_other_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_in_sankey.gql index 51c8ab0d65..d7b82b1dab 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_in_sankey.gql @@ -5,6 +5,6 @@ DIVIDE( SUM( V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)),"input_of_wood_pellets + input_of_biodiesel + input_of_bio_ethanol + input_of_bio_lng + input_of_bio_kerosene"), - SUM(V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_greengas_in_gas_network) + SUM(V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network) ), BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_losses_in_sankey.gql b/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_losses_in_sankey.gql index dc8695a693..a83d872078 100644 --- a/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_losses_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/biomass_products_to_transport_losses_in_sankey.gql @@ -20,7 +20,7 @@ energy_distribution_biogenic_waste, energy_distribution_bio_lng, output_of_loss), - (V(energy_compressor_network_gas, "output_of_loss * network_gas_input_conversion") * Q(share_of_greengas_in_gas_network)), - (V(energy_national_gas_network_natural_gas, output_of_loss) * Q(share_of_greengas_in_gas_network)) + (V(energy_compressor_network_gas, "output_of_loss * network_gas_input_conversion") * Q(share_of_sustainable_gas_in_gas_network)), + (V(energy_national_gas_network_natural_gas, output_of_loss) * Q(share_of_sustainable_gas_in_gas_network)) ) ,BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_agriculture_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_agriculture_in_sankey.gql index 155459e48b..9dfca2156b 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_agriculture_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_agriculture_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(agriculture),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_propane_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_buildings_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_buildings_in_sankey.gql index afc7008c1b..21bfe84387 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_buildings_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_buildings_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(buildings),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_bunkers_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_bunkers_in_sankey.gql index 57fa63655b..4d0705220e 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_bunkers_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_bunkers_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(bunkers),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_electricity_prod_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_electricity_prod_in_sankey.gql index 610c7c3287..6cfbac016e 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_electricity_prod_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_electricity_prod_in_sankey.gql @@ -1,4 +1,4 @@ # Query for Sankey diagram: connection between natural_gas and electricity - unit = PJ -- query = DIVIDE(SUM(V(Q(electricity_producing_converters_sankey), primary_demand_of(natural_gas , lng , compressed_network_gas , gas_power_fuelmix))),BILLIONS) +- query = DIVIDE(SUM(V(Q(electricity_producing_converters_sankey), primary_demand_of(natural_gas , lng , compressed_network_gas , propane , gas_power_fuelmix))),BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_energy_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_energy_in_sankey.gql index 668d518bf7..8015408648 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_energy_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_energy_in_sankey.gql @@ -6,11 +6,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(energy),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_export_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_export_in_sankey.gql index 06f2d15c29..3d5a7ac9ad 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_export_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_export_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(G(energy_export),"input_of_natural_gas + input_of_lng") + V(G(energy_export),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(G(energy_export),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_feedstock_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_feedstock_in_sankey.gql index 83a66174c8..fcb1f91f85 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_feedstock_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_feedstock_in_sankey.gql @@ -2,14 +2,15 @@ - unit = PJ - query = - DIVIDE( + DIVIDE( SUM( SUM( - V(INTERSECTION(G(final_demand_group),USE(non_energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(G(final_demand_group),USE(non_energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(G(final_demand_group),USE(non_energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) - ), + ) + ) + , BILLIONS - ) + ) * Q(share_of_fossil_gas_in_gas_network) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_households_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_households_in_sankey.gql index da4a950421..a5f77db54e 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_households_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_households_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(households),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_hydrogen_prod_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_hydrogen_prod_in_sankey.gql index 87299c449e..d135a24d28 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_hydrogen_prod_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_hydrogen_prod_in_sankey.gql @@ -1,4 +1,4 @@ # Query for Sankey diagram: connection between natural_gas and hydrogen_production - unit = PJ -- query = DIVIDE(SUM(V(Q(hydrogen_producing_converters_sankey), primary_demand_of(natural_gas , lng , compressed_network_gas , gas_power_fuelmix , network_gas))),BILLIONS) +- query = DIVIDE(SUM(V(Q(hydrogen_producing_converters_sankey), primary_demand_of(natural_gas , lng , compressed_network_gas , propane , gas_power_fuelmix , network_gas))),BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_industry_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_industry_in_sankey.gql index fb0a467c48..85f5003afd 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_industry_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_industry_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(industry),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_other_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_other_in_sankey.gql index 3238749fa1..45830e8e6a 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_other_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_other_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(other),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_in_sankey.gql index 09499ba117..1073cca947 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_in_sankey.gql @@ -5,11 +5,11 @@ DIVIDE( SUM( SUM( - V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng") + V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)),"input_of_natural_gas + input_of_lng + input_of_propane") ), SUM( V(INTERSECTION(INTERSECTION(SECTOR(transport),G(final_demand_group)),USE(energetic)),"input_of_compressed_network_gas + input_of_network_gas") - ) * Q(share_of_natural_gas_in_gas_network) + ) * Q(share_of_fossil_gas_in_gas_network) ), BILLIONS ) diff --git a/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_losses_in_sankey.gql b/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_losses_in_sankey.gql index 7ee54c507e..19b8cb124a 100644 --- a/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_losses_in_sankey.gql +++ b/gqueries/output_elements/output_series/sankey/natural_gas_to_transport_losses_in_sankey.gql @@ -6,6 +6,6 @@ SUM( V(energy_regasification_lng, output_of_loss), V(energy_treatment_natural_gas, output_of_loss), - (V(energy_compressor_network_gas, "output_of_loss * network_gas_input_conversion") * (1 - Q(share_of_greengas_in_gas_network))), - (V(energy_national_gas_network_natural_gas, output_of_loss) * (1 - Q(share_of_greengas_in_gas_network)))) + (V(energy_compressor_network_gas, "output_of_loss * network_gas_input_conversion") * (1 - Q(share_of_sustainable_gas_in_gas_network))), + (V(energy_national_gas_network_natural_gas, output_of_loss) * (1 - Q(share_of_sustainable_gas_in_gas_network)))) ,BILLIONS) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/agriculture_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/agriculture_biomass_total_in_co2_sankey.gql index 8193e05c14..7bba31c609 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/agriculture_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/agriculture_biomass_total_in_co2_sankey.gql @@ -8,5 +8,5 @@ V(CARRIER(wood_pellets), potential_co2_conversion_per_mj)) / THOUSANDS, PRODUCT( Q(agriculture_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/buildings_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/buildings_biomass_total_in_co2_sankey.gql index 878a20375f..ec6df86003 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/buildings_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/buildings_biomass_total_in_co2_sankey.gql @@ -8,5 +8,5 @@ V(CARRIER(wood_pellets), potential_co2_conversion_per_mj)) / THOUSANDS, PRODUCT( Q(buildings_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/bunkers_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/bunkers_biomass_total_in_co2_sankey.gql index 215fc08c05..b580ca4145 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/bunkers_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/bunkers_biomass_total_in_co2_sankey.gql @@ -8,5 +8,5 @@ V(CARRIER(bio_kerosene), potential_co2_conversion_per_mj)) / THOUSANDS, PRODUCT( Q(bunkers_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/energy_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/energy_biomass_total_in_co2_sankey.gql index 6900b06e6a..d3bef793f3 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/energy_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/energy_biomass_total_in_co2_sankey.gql @@ -17,4 +17,4 @@ ) / THOUSANDS + PRODUCT( Q(energy_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/households_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/households_biomass_total_in_co2_sankey.gql index 853cee85a9..469d772074 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/households_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/households_biomass_total_in_co2_sankey.gql @@ -8,5 +8,5 @@ V(CARRIER(wood_pellets), potential_co2_conversion_per_mj)) / THOUSANDS, PRODUCT( Q(households_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/industry_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/industry_biomass_total_in_co2_sankey.gql index c4a74193d3..1e96ac9d68 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/industry_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/industry_biomass_total_in_co2_sankey.gql @@ -12,6 +12,6 @@ ) / THOUSANDS, PRODUCT( Q(industry_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)), + Q(share_of_sustainable_gas_in_gas_network)), Q(industry_fuelmix_oil_in_co2_sankey) * Q(bio_oil_fraction_of_fuelmix) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/other_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/other_biomass_total_in_co2_sankey.gql index 1185643910..bc5a1f79b5 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/other_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/other_biomass_total_in_co2_sankey.gql @@ -8,5 +8,5 @@ V(CARRIER(wood_pellets), potential_co2_conversion_per_mj)) / THOUSANDS, PRODUCT( Q(other_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) ) diff --git a/gqueries/output_elements/output_series/sankey_190_co2/transport_biomass_total_in_co2_sankey.gql b/gqueries/output_elements/output_series/sankey_190_co2/transport_biomass_total_in_co2_sankey.gql index 6a72184263..5c1c1fa7f1 100644 --- a/gqueries/output_elements/output_series/sankey_190_co2/transport_biomass_total_in_co2_sankey.gql +++ b/gqueries/output_elements/output_series/sankey_190_co2/transport_biomass_total_in_co2_sankey.gql @@ -9,4 +9,4 @@ ) / THOUSANDS + PRODUCT( Q(transport_network_gas_total_in_co2_sankey), - Q(share_of_greengas_in_gas_network)) + Q(share_of_sustainable_gas_in_gas_network)) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/greengas_in_use_of_transport_fuels.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/greengas_in_use_of_transport_fuels.gql index 851c5bff85..21285dc47f 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/greengas_in_use_of_transport_fuels.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/greengas_in_use_of_transport_fuels.gql @@ -1,2 +1,2 @@ - unit = PJ -- query = DIVIDE(PRODUCT(V(transport_final_demand_for_road_compressed_network_gas,input_of_compressed_network_gas),Q(share_of_greengas_in_gas_network)),BILLIONS) +- query = DIVIDE(PRODUCT(V(transport_final_demand_for_road_compressed_network_gas,input_of_compressed_network_gas),Q(share_of_sustainable_gas_in_gas_network)),BILLIONS) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/natural_gas_in_use_of_transport_fuels.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/natural_gas_in_use_of_transport_fuels.gql index 46a760a176..bf68309707 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/natural_gas_in_use_of_transport_fuels.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_43_use_of_transport_fuels/natural_gas_in_use_of_transport_fuels.gql @@ -1,2 +1,2 @@ - unit = PJ -- query = DIVIDE(PRODUCT(V(transport_final_demand_for_road_compressed_network_gas,input_of_compressed_network_gas),Q(share_of_natural_gas_in_gas_network)),BILLIONS) +- query = DIVIDE(PRODUCT(V(transport_final_demand_for_road_compressed_network_gas,input_of_compressed_network_gas),Q(share_of_fossil_gas_in_gas_network)),BILLIONS) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_fossil_natural_gas_and_derivatives_in_renewability.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_fossil_natural_gas_and_derivatives_in_renewability.gql index 2feab9238c..826acbf063 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_fossil_natural_gas_and_derivatives_in_renewability.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_fossil_natural_gas_and_derivatives_in_renewability.gql @@ -5,7 +5,8 @@ 100 * SUM( V(INTERSECTION(G(final_demand_group),USE(energetic)), "(1.0 - sustainability_share) * supply_of_network_gas"), V(INTERSECTION(G(final_demand_group),USE(energetic)), "(1.0 - sustainability_share) * supply_of_compressed_network_gas"), - V(INTERSECTION(G(final_demand_group),USE(energetic)), "(1.0 - sustainability_share) * supply_of_lng") + V(INTERSECTION(G(final_demand_group),USE(energetic)), "(1.0 - sustainability_share) * supply_of_lng"), + V(INTERSECTION(G(final_demand_group),USE(energetic)), "(1.0 - sustainability_share) * supply_of_propane") ) / SUM( V(INTERSECTION(G(final_demand_group),USE(energetic)), demand), diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_sustainable_natural_gas_and_derivatives_in_renewability.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_sustainable_natural_gas_and_derivatives_in_renewability.gql index ee01b9243a..01cbe2e0be 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_sustainable_natural_gas_and_derivatives_in_renewability.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_49_renewability/final_demand_of_sustainable_natural_gas_and_derivatives_in_renewability.gql @@ -5,6 +5,8 @@ 100 * SUM( V(INTERSECTION(G(final_demand_group),USE(energetic)), "sustainability_share * supply_of_network_gas"), V(INTERSECTION(G(final_demand_group),USE(energetic)), "sustainability_share * supply_of_compressed_network_gas"), + V(INTERSECTION(G(final_demand_group),USE(energetic)), "sustainability_share * supply_of_lng"), + V(INTERSECTION(G(final_demand_group),USE(energetic)), "sustainability_share * supply_of_propane") ) / SUM( V(INTERSECTION(G(final_demand_group),USE(energetic)), demand), diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_77_gas_network_mix/propane_in_gas_network_mix.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_77_gas_network_mix/propane_in_gas_network_mix.gql new file mode 100644 index 0000000000..004c4506b1 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_77_gas_network_mix/propane_in_gas_network_mix.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(propane_in_gas_network) diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_greengas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_greengas.gql index b54e4ad04b..dc383b5748 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_greengas.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_greengas.gql @@ -1,6 +1,6 @@ - query = PRODUCT_CURVES( - COALESCE_CURVE(nil,Q(share_of_greengas_in_gas_network)), + COALESCE_CURVE(nil,Q(share_of_sustainable_gas_in_gas_network)), SUM_CURVES( SUM_CURVES(V(Q(electricity_producing_network_gas_converters), electricity_output_curve)), PRODUCT_CURVES( diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_natural_gas.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_natural_gas.gql index 6ea8ae963b..ffbe734f49 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_natural_gas.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_electricity_mix_power_to_gas/hourly_supply_electricity_from_natural_gas.gql @@ -1,6 +1,6 @@ - query = PRODUCT_CURVES( - COALESCE_CURVE(nil,Q(share_of_natural_gas_in_gas_network)), + COALESCE_CURVE(nil,Q(share_of_fossil_gas_in_gas_network)), SUM_CURVES( SUM_CURVES(V(Q(electricity_producing_network_gas_converters), electricity_output_curve)), PRODUCT_CURVES( diff --git a/gqueries/output_elements/output_series/waterfall_future_energy_exports/natural_gas_in_future_energy_exports.gql b/gqueries/output_elements/output_series/waterfall_future_energy_exports/natural_gas_in_future_energy_exports.gql index 13f776d6c0..2ea2dd2c5e 100644 --- a/gqueries/output_elements/output_series/waterfall_future_energy_exports/natural_gas_in_future_energy_exports.gql +++ b/gqueries/output_elements/output_series/waterfall_future_energy_exports/natural_gas_in_future_energy_exports.gql @@ -1,3 +1,8 @@ -- query = future:Q(export_of_natural_gas) +- query = + future: + SUM( + Q(export_of_natural_gas), + Q(export_of_propane) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/waterfall_future_energy_imports/natural_gas_in_future_energy_imports.gql b/gqueries/output_elements/output_series/waterfall_future_energy_imports/natural_gas_in_future_energy_imports.gql index bc0a67c07c..2a2b8861d9 100644 --- a/gqueries/output_elements/output_series/waterfall_future_energy_imports/natural_gas_in_future_energy_imports.gql +++ b/gqueries/output_elements/output_series/waterfall_future_energy_imports/natural_gas_in_future_energy_imports.gql @@ -1,3 +1,7 @@ -- query = future:Q(import_of_natural_gas) +- query = + SUM( + Q(import_of_natural_gas), + Q(import_of_propane) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/waterfall_future_energy_net_imports/natural_gas_in_future_energy_net_imports.gql b/gqueries/output_elements/output_series/waterfall_future_energy_net_imports/natural_gas_in_future_energy_net_imports.gql index 5d36c5a994..3a87d63004 100644 --- a/gqueries/output_elements/output_series/waterfall_future_energy_net_imports/natural_gas_in_future_energy_net_imports.gql +++ b/gqueries/output_elements/output_series/waterfall_future_energy_net_imports/natural_gas_in_future_energy_net_imports.gql @@ -1,2 +1,12 @@ - unit = PJ -- query = SUM(Q(import_of_natural_gas)- Q(export_of_natural_gas)) \ No newline at end of file +- query = + SUM( + Q(import_of_natural_gas), + Q(import_of_propane), + NEG( + Q(export_of_natural_gas) + ), + NEG( + Q(export_of_propane) + ) + ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/waterfall_future_energy_transit/natural_gas_in_future_energy_transit.gql b/gqueries/output_elements/output_series/waterfall_future_energy_transit/natural_gas_in_future_energy_transit.gql index 701d616324..b733570b2e 100644 --- a/gqueries/output_elements/output_series/waterfall_future_energy_transit/natural_gas_in_future_energy_transit.gql +++ b/gqueries/output_elements/output_series/waterfall_future_energy_transit/natural_gas_in_future_energy_transit.gql @@ -1,3 +1,13 @@ -- query = MIN(Q(import_of_natural_gas),Q(export_of_natural_gas)) +- query = + MIN( + SUM( + Q(import_of_natural_gas), + Q(import_of_propane) + ), + SUM( + Q(export_of_natural_gas), + Q(export_of_propane) + ) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/waterfall_present_energy_exports/natural_gas_in_present_energy_exports.gql b/gqueries/output_elements/output_series/waterfall_present_energy_exports/natural_gas_in_present_energy_exports.gql index e9e69d17a2..08b3a50cb7 100644 --- a/gqueries/output_elements/output_series/waterfall_present_energy_exports/natural_gas_in_present_energy_exports.gql +++ b/gqueries/output_elements/output_series/waterfall_present_energy_exports/natural_gas_in_present_energy_exports.gql @@ -1,3 +1,9 @@ -- query = present:(export_of_natural_gas) +- query = + present: + SUM( + (export_of_natural_gas), + (export_of_propane) + ) + - unit = PJ diff --git a/gqueries/output_elements/output_series/waterfall_present_energy_imports/natural_gas_in_present_energy_imports.gql b/gqueries/output_elements/output_series/waterfall_present_energy_imports/natural_gas_in_present_energy_imports.gql index cd436a3d1f..485e5113b7 100644 --- a/gqueries/output_elements/output_series/waterfall_present_energy_imports/natural_gas_in_present_energy_imports.gql +++ b/gqueries/output_elements/output_series/waterfall_present_energy_imports/natural_gas_in_present_energy_imports.gql @@ -1,3 +1,8 @@ -- query = present:Q(import_of_natural_gas) +- query = + present: + SUM( + Q(import_of_natural_gas), + Q(import_of_propane) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/waterfall_present_energy_net_imports/natural_gas_in_present_energy_net_imports.gql b/gqueries/output_elements/output_series/waterfall_present_energy_net_imports/natural_gas_in_present_energy_net_imports.gql index 00e5bdcf53..d219f9766f 100644 --- a/gqueries/output_elements/output_series/waterfall_present_energy_net_imports/natural_gas_in_present_energy_net_imports.gql +++ b/gqueries/output_elements/output_series/waterfall_present_energy_net_imports/natural_gas_in_present_energy_net_imports.gql @@ -1,2 +1,13 @@ - unit = PJ -- query = present:SUM(Q(import_of_natural_gas)- Q(export_of_natural_gas)) \ No newline at end of file +- query = + present: + SUM( + Q(import_of_natural_gas), + Q(import_of_propane), + NEG( + Q(export_of_natural_gas) + ), + NEG( + Q(export_of_propane) + ) + ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/waterfall_present_energy_transit/natural_gas_in_present_energy_transit.gql b/gqueries/output_elements/output_series/waterfall_present_energy_transit/natural_gas_in_present_energy_transit.gql index 2f77cabd51..0be4a13cde 100644 --- a/gqueries/output_elements/output_series/waterfall_present_energy_transit/natural_gas_in_present_energy_transit.gql +++ b/gqueries/output_elements/output_series/waterfall_present_energy_transit/natural_gas_in_present_energy_transit.gql @@ -1,3 +1,14 @@ -- query = present:MIN(Q(import_of_natural_gas),Q(export_of_natural_gas)) +- query = + present: + MIN( + SUM( + Q(import_of_natural_gas), + Q(import_of_propane) + ), + SUM( + Q(export_of_natural_gas), + Q(export_of_propane) + ) + ) - unit = PJ diff --git a/graphs/energy/edges/energy/energy_distribution_propane-energy_national_gas_network_natural_gas@propane.ad b/graphs/energy/edges/energy/energy_distribution_propane-energy_national_gas_network_natural_gas@propane.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/energy/energy_distribution_propane-energy_national_gas_network_natural_gas@propane.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/edges/energy/energy_import_propane-energy_distribution_propane@propane.ad b/graphs/energy/edges/energy/energy_import_propane-energy_distribution_propane@propane.ad new file mode 100644 index 0000000000..1716b1465e --- /dev/null +++ b/graphs/energy/edges/energy/energy_import_propane-energy_distribution_propane@propane.ad @@ -0,0 +1,2 @@ +- type = share +- reversed = false diff --git a/graphs/energy/nodes/energy/energy_distribution_propane.ad b/graphs/energy/nodes/energy/energy_distribution_propane.ad new file mode 100644 index 0000000000..b48f58ebb7 --- /dev/null +++ b/graphs/energy/nodes/energy/energy_distribution_propane.ad @@ -0,0 +1,7 @@ +- groups = [sankey_conversion_group] +- use = undefined +- network_gas.demand_carrier = propane +- network_gas.profile = flat +- network_gas.type = producer + +~ demand = 0.0 diff --git a/graphs/energy/nodes/energy/energy_import_propane.ad b/graphs/energy/nodes/energy/energy_import_propane.ad new file mode 100644 index 0000000000..5aceea896e --- /dev/null +++ b/graphs/energy/nodes/energy/energy_import_propane.ad @@ -0,0 +1,4 @@ +- use = undefined +- energy_balance_group = import +- groups = [energy_import, energy_import_export, primary_energy_demand] +- free_co2_factor = 0.0 diff --git a/inputs/supply/fuels_gas/propane_gas_total_share.ad b/inputs/supply/fuels_gas/propane_gas_total_share.ad new file mode 100644 index 0000000000..9be3ace154 --- /dev/null +++ b/inputs/supply/fuels_gas/propane_gas_total_share.ad @@ -0,0 +1,9 @@ +- query = UPDATE( INPUT_SLOTS(V(energy_national_gas_network_natural_gas),propane), conversion, DIVIDE(USER_INPUT(),100)) +- share_group = fuels_gas +- priority = 100 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:V(energy_national_gas_network_natural_gas,propane_input_conversion) * 100 +- step_value = 0.1 +- unit = % +- update_period = future