Splitting energetic and non energetic demand in final demand other sector chart (#3237)

kaskranenburgQ · kndehaan · web-flow · commit 1b39f34d484e · 2025-03-26T15:47:21.000+01:00
* Splitting energetic and non energetic demand in final demand other sector chart

* Minor query correction

---------

Co-authored-by: Kyra de Haan &lt;kyra.dehaan@quintel.com&gt;
diff --git a/gqueries/general/final_demand/mece_energetic/final_demand_of_oil_and_derivatives_in_other_energetic.gql b/gqueries/general/final_demand/mece_energetic/final_demand_of_oil_and_derivatives_in_other_energetic.gql
@@ -1,4 +1,4 @@
-# Final demand of the 'oil_and_derivatives' carrier group
+# Energetic final demand of the 'oil_and_derivatives' carrier group 
 
 - unit = PJ
 - query =
diff --git a/gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_other_non_energetic.gql b/gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_other_non_energetic.gql
@@ -0,0 +1,21 @@
+# Non-nergetic final demand of the 'oil_and_derivatives' carrier group
+
+- unit = PJ
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          FILTER(
+            FILTER(
+              FILTER(
+                EG(final_demand),"sector == :other"
+              ),
+              "!energetic?"
+            ),
+            "crude_oil? ||  gasoline? ||  diesel? ||  lpg? || kerosene? || heavy_fuel_oil? || bio_oil? || bio_kerosene?"
+          ),
+          value
+        )
+      ),
+      BILLIONS
+    )
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/biomass_products_energetic_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/biomass_products_energetic_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_biomass_products_in_other_energetic)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/coal_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/coal_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_coal_and_derivatives_in_other_energetic)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/electricity_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/electricity_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_electricity_in_other)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/heat_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/heat_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_heat_in_other)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/natural_gas_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/natural_gas_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_natural_gas_and_derivatives_in_other_energetic)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/oil_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/oil_and_derivatives_energetic_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_oil_and_derivatives_in_other_energetic)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/oil_and_derivatives_non_energetic_use_of_final_demand_in_other_sector.gql b/gqueries/output_elements/output_series/use_of_final_demand_in_other_sector/oil_and_derivatives_non_energetic_use_of_final_demand_in_other_sector.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(final_demand_of_oil_and_derivatives_in_other_non_energetic)
+- unit = PJ

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Final demand of the 'oil_and_derivatives' carrier group`
	`1`	`+# Energetic final demand of the 'oil_and_derivatives' carrier group`
`2`	`2`
`3`	`3`	`- unit = PJ`
`4`	`4`	`- query =`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_biomass_products_in_other_energetic)`
	`3`	`+- unit = PJ`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_coal_and_derivatives_in_other_energetic)`
	`3`	`+- unit = PJ`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_electricity_in_other)`
	`3`	`+- unit = PJ`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_heat_in_other)`
	`3`	`+- unit = PJ`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_natural_gas_and_derivatives_in_other_energetic)`
	`3`	`+- unit = PJ`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(final_demand_of_oil_and_derivatives_in_other_energetic)`
	`3`	`+- unit = PJ`