From e822e0fc51273ad4f65cca17f249549a22e98b58 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 19 Dec 2025 16:05:50 +0100 Subject: [PATCH] Minor Sankey queries fixes --- ..._from_biomass_products_for_electricity.gql | 26 +++++-------------- .../conversion_from_biogas_to_electricity.gql | 13 ++++++++++ .../sankey_1_to_2_heat_to_loss.gql | 2 +- 3 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biogas_to_electricity.gql diff --git a/gqueries/general/conversion/biomass_products/conversion_from_biomass_products_to_carrier/conversion_from_biomass_products_for_electricity.gql b/gqueries/general/conversion/biomass_products/conversion_from_biomass_products_to_carrier/conversion_from_biomass_products_for_electricity.gql index a4ed7b4b47..86293349c9 100644 --- a/gqueries/general/conversion/biomass_products/conversion_from_biomass_products_to_carrier/conversion_from_biomass_products_for_electricity.gql +++ b/gqueries/general/conversion/biomass_products/conversion_from_biomass_products_to_carrier/conversion_from_biomass_products_for_electricity.gql @@ -5,25 +5,11 @@ - query = SUM( - DIVIDE( - SUM( - V( - Q(electricity_producing_converters_sankey), - input_of( - greengas, - biodiesel, - bio_ethanol, - bio_lng, - bio_oil, - biogas, - bio_kerosene, - torrefied_biomass_pellets, - wood_pellets - ) - ) - ), - BILLIONS - ), - Q(gas_power_fuelmix_for_electricity_conversion) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion) + Q(conversion_from_wood_pellets_to_electricity), + Q(conversion_from_biogas_to_electricity), + PRODUCT( + Q(conversion_from_gas_power_fuelmix_to_electricity), + V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion) + ) ) - unit = PJ diff --git a/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biogas_to_electricity.gql b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biogas_to_electricity.gql new file mode 100644 index 0000000000..932170dff2 --- /dev/null +++ b/gqueries/general/conversion/electricity/conversion_from_carrier_to_electricity/conversion_from_biogas_to_electricity.gql @@ -0,0 +1,13 @@ +# Direct conversion input of biogas for central electricity production + +- query = + DIVIDE( + SUM( + V( + G(electricity_production), + "electricity_output_conversion / (1 - loss_output_conversion) * input_of_biogas" + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_heat_to_loss.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_heat_to_loss.gql index 2173fcb988..86f2761bc1 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_heat_to_loss.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_heat_to_loss.gql @@ -4,7 +4,7 @@ Q(conversion_loss_coal_and_derivatives_to_steam_hot_water), Q(conversion_loss_electricity_to_steam_hot_water), Q(conversion_loss_hydrogen_to_steam_hot_water), - Q(conversion_loss_natural_gas_and_derivatives_to_steam_hot_water), + Q(conversion_loss_network_gas_to_steam_hot_water), Q(conversion_loss_oil_and_derivatives_to_steam_hot_water), Q(conversion_loss_waste_mix_to_steam_hot_water), Q(conversion_loss_solar_thermal_to_steam_hot_water),