From fa22ac2efd9e1237e1e050ed3fc3e1d4366e3000 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Thu, 27 Mar 2025 17:34:20 +0100 Subject: [PATCH 1/3] Adding filter for must-run in dispatchable queries --- ...ity_electricity_biomass_production_curve.gql | 17 ++++++++++------- ...bility_electricity_coal_production_curve.gql | 13 +++++++++---- ...ty_electricity_hydrogen_production_curve.gql | 5 ++++- ...ibility_electricity_oil_production_curve.gql | 7 +++++-- ...ility_electricity_waste_production_curve.gql | 7 +++++-- 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql index c179561c3d..279d39e4da 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql @@ -1,13 +1,16 @@ - query = SUM_CURVES( V( - EXCLUDE( - Q(electricity_producing_wood_pellets_converters), - V( - Q(electricity_producing_torrefied_biomass_pellets_converters), - Q(electricity_producing_coal_incl_coal_gas_converters), - Q(electricity_producing_lignite_converters) - ) + FILTER( + EXCLUDE( + Q(electricity_producing_wood_pellets_converters), + V( + Q(electricity_producing_torrefied_biomass_pellets_converters), + Q(electricity_producing_coal_incl_coal_gas_converters), + Q(electricity_producing_lignite_converters) + ) + ), + "merit_order && (merit_order.subtype == :dispatchable)" ), electricity_output_curve ) diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql index 47344d17be..db26bf1ac1 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql @@ -1,10 +1,15 @@ - query = SUM_CURVES( V( - Q(electricity_producing_coal_incl_coal_gas_converters), - Q(electricity_producing_torrefied_biomass_pellets_converters), - Q(electricity_producing_lignite_converters), + FILTER( + V( + Q(electricity_producing_coal_incl_coal_gas_converters), + Q(electricity_producing_torrefied_biomass_pellets_converters), + Q(electricity_producing_lignite_converters) + ), + "merit_order && (merit_order.subtype == :dispatchable)" + ), electricity_output_curve + ) ) - ) - unit = curve \ No newline at end of file diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql index 8f14a5d8de..cd2afc34bf 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql @@ -1,7 +1,10 @@ - query = SUM_CURVES( V( - Q(electricity_producing_hydrogen_converters), + FILTER( + Q(electricity_producing_hydrogen_converters), + "merit_order && (merit_order.subtype == :dispatchable)" + ), electricity_output_curve ) ) diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql index 4a7641bf74..176ed5d47f 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql @@ -1,8 +1,11 @@ - query = SUM_CURVES( V( - Q(electricity_producing_oil_converters), + FILTER( + Q(electricity_producing_oil_converters), + "merit_order && (merit_order.subtype == :dispatchable)" + ), electricity_output_curve ) ) -- unit = curve \ No newline at end of file +- unit = curve diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql index 2e4a9420ba..f0d7260a48 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql @@ -1,8 +1,11 @@ - query = SUM_CURVES( V( - Q(electricity_producing_waste_converters), + FILTER( + Q(electricity_producing_waste_converters), + "merit_order && (merit_order.subtype == :dispatchable)" + ), electricity_output_curve ) ) -- unit = curve \ No newline at end of file +- unit = curve From c429b09569f075003fc42000f540c0987939c409 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Fri, 28 Mar 2025 10:00:31 +0100 Subject: [PATCH 2/3] Fixing white line in query --- .../hourly_flexibility_electricity_coal_production_curve.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql index db26bf1ac1..10325e0346 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql @@ -12,4 +12,4 @@ electricity_output_curve ) ) -- unit = curve \ No newline at end of file +- unit = curve From 6148aa1d1d1319f4f35eb660e9d34d9c407388ae Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Fri, 28 Mar 2025 11:54:06 +0100 Subject: [PATCH 3/3] Minor change to indent --- .../hourly_flexibility_electricity_coal_production_curve.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql index 10325e0346..394e316961 100644 --- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql +++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql @@ -10,6 +10,6 @@ "merit_order && (merit_order.subtype == :dispatchable)" ), electricity_output_curve - ) ) + ) - unit = curve