Update dispatchable queries (#3241)

* Adding filter for must-run in dispatchable queries

* Fixing white line in query

* Minor change to indent

---------

Co-authored-by: Mathijs Bijkerk <mathijs.bijkerk@quintel.com>

Author: kaskranenburgQ

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
       )

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
+- unit = curve

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

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
+- unit = curve

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
+- unit = curve