From 6342d0243f61aa95bb36fecbd2926ea9a1a5a865 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Mon, 15 Dec 2025 11:27:03 +0100 Subject: [PATCH 1/8] add draft version of final demand queries for bio oil and non biogenic oil --- ..._biogenic_oil_in_agriculture_energetic.gql | 8 +++++++ ...of_biogenic_oil_in_buildings_energetic.gql | 8 +++++++ ...f_biogenic_oil_in_households_energetic.gql | 8 +++++++ ..._of_biogenic_oil_in_industry_energetic.gql | 8 +++++++ ...biogenic_oil_in_industry_non_energetic.gql | 8 +++++++ ..._biogenic_oil_in_agriculture_energetic.gql | 8 +++++++ ...on_biogenic_oil_in_buildings_energetic.gql | 8 +++++++ ...n_biogenic_oil_in_households_energetic.gql | 8 +++++++ ...non_biogenic_oil_in_industry_energetic.gql | 8 +++++++ ...biogenic_oil_in_industry_non_energetic.gql | 8 +++++++ ..._derivatives_in_industry_non_energetic.gql | 21 +++++++++++++++++++ ...lture_final_demand_crude_oil_energetic.gql | 6 ++++++ ...dings_final_demand_crude_oil_energetic.gql | 6 ++++++ ...holds_final_demand_crude_oil_energetic.gql | 6 ++++++ ...ustry_final_demand_crude_oil_energetic.gql | 6 ++++++ ...y_final_demand_crude_oil_non_energetic.gql | 6 ++++++ ...lture_final_demand_crude_oil_energetic.gql | 3 +++ ...dings_final_demand_crude_oil_energetic.gql | 3 +++ ...holds_final_demand_crude_oil_energetic.gql | 3 +++ ...ustry_final_demand_crude_oil_energetic.gql | 3 +++ ...y_final_demand_crude_oil_non_energetic.gql | 3 +++ 21 files changed, 146 insertions(+) create mode 100644 gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql create mode 100644 gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql create mode 100644 gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_industry_non_energetic.gql create mode 100644 gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql create mode 100644 gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql create mode 100644 gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql new file mode 100644 index 0000000000..37a2f4c8fa --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of biogenic oil and derivatives in agriculture (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_agriculture_energetic), + Q(share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql new file mode 100644 index 0000000000..f3c1a81b1e --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of biogenic oil and derivatives in buildings (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_buildings_energetic), + Q(share_of_biogenic_in_buildings_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql new file mode 100644 index 0000000000..2603702fff --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of biogenic oil and derivatives in households (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_households_energetic), + Q(share_of_biogenic_in_households_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql new file mode 100644 index 0000000000..528f03780b --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of biogenic oil and derivatives in industry (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_industry_energetic), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql new file mode 100644 index 0000000000..178670e6d9 --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of biogenic oil and derivatives in industry (non-energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_industry_non_energetic), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql new file mode 100644 index 0000000000..7bc9d73600 --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of non-biogenic oil and derivatives in agriculture (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_agriculture_energetic), + Q(share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql new file mode 100644 index 0000000000..47ebb9ba27 --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of non-biogenic oil and derivatives in buildings (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_buildings_energetic), + Q(share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql new file mode 100644 index 0000000000..34113ed128 --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of non-biogenic oil and derivatives in households (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_households_energetic), + Q(share_of_non_biogenic_in_households_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql new file mode 100644 index 0000000000..5086f2ef5e --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of non-biogenic oil and derivatives in industry (energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_industry_energetic), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql new file mode 100644 index 0000000000..ad2019b339 --- /dev/null +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql @@ -0,0 +1,8 @@ +# Final demand of non-biogenic oil and derivatives in industry (non-energetic use) + +- unit = PJ +- query = + PRODUCT( + Q(final_demand_of_oil_and_derivatives_in_industry_non_energetic), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ) diff --git a/gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_industry_non_energetic.gql b/gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_industry_non_energetic.gql new file mode 100644 index 0000000000..93b397e019 --- /dev/null +++ b/gqueries/general/final_demand/mece_non_energetic/final_demand_of_oil_and_derivatives_in_industry_non_energetic.gql @@ -0,0 +1,21 @@ +# Non-energetic final demand of the 'oil_and_derivatives' carrier group + +- unit = PJ +- query = + DIVIDE( + SUM( + V( + FILTER( + FILTER( + FILTER( + EG(final_demand),"sector == :industry" + ), + "!energetic?" + ), + "crude_oil? || gasoline? || diesel? || lpg? || kerosene? || heavy_fuel_oil? || naphtha? || pyrolysis_oil?" + ), + value + ) + ), + BILLIONS + ) diff --git a/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..98cbc6bbea --- /dev/null +++ b/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql @@ -0,0 +1,6 @@ +- query = + SUM( + V(agriculture_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + ) +- unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..11ea411d71 --- /dev/null +++ b/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql @@ -0,0 +1,6 @@ +- query = + SUM( + V(buildings_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + ) +- unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..6566671d13 --- /dev/null +++ b/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql @@ -0,0 +1,6 @@ +- query = + SUM( + V(households_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + ) +- unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..bf233c5a45 --- /dev/null +++ b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql @@ -0,0 +1,6 @@ +- query = + SUM( + V(industry_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + ) +- unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql new file mode 100644 index 0000000000..e171325222 --- /dev/null +++ b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql @@ -0,0 +1,6 @@ +- query = + SUM( + V(industry_final_demand_crude_oil_non_energetic, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + ) +- unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..0ed019159a --- /dev/null +++ b/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql @@ -0,0 +1,3 @@ +- query = + 1 - Q(share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic) +- unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..0c1fe14436 --- /dev/null +++ b/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql @@ -0,0 +1,3 @@ +- query = + 1 - Q(share_of_biogenic_in_buildings_final_demand_crude_oil_energetic) +- unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..77a3540feb --- /dev/null +++ b/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql @@ -0,0 +1,3 @@ +- query = + 1 - Q(share_of_biogenic_in_households_final_demand_crude_oil_energetic) +- unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql new file mode 100644 index 0000000000..e4921229bd --- /dev/null +++ b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql @@ -0,0 +1,3 @@ +- query = + 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) +- unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql new file mode 100644 index 0000000000..a9854540b6 --- /dev/null +++ b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql @@ -0,0 +1,3 @@ +- query = + 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) +- unit = factor From b37d5aaef102ca63a3e3027c037b95df716e93bb Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Mon, 15 Dec 2025 12:10:46 +0100 Subject: [PATCH 2/8] Update biogenic and non-biogenic oil share queries in industry --- ...nd_of_biogenic_oil_in_industry_energetic.gql | 16 +++++++++++++--- ...f_biogenic_oil_in_industry_non_energetic.gql | 17 ++++++++++++++--- ...f_non_biogenic_oil_in_industry_energetic.gql | 16 +++++++++++++--- ...n_biogenic_oil_in_industry_non_energetic.gql | 17 ++++++++++++++--- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql index 528f03780b..c61ad29e67 100644 --- a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql @@ -1,8 +1,18 @@ # Final demand of biogenic oil and derivatives in industry (energetic use) +# +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil and multiplies it +# by the biogenic share (which covers biodiesel, bio_kerosene, and bio_oil) +# 2. Adds the full demand from industry_final_demand_bionaphtha (which is +# already fully biogenic) - unit = PJ - query = - PRODUCT( - Q(final_demand_of_oil_and_derivatives_in_industry_energetic), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + SUM( + PRODUCT( + DIVIDE(V(industry_final_demand_crude_oil, demand), BILLIONS), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + DIVIDE(V(industry_final_demand_bionaphtha, demand), BILLIONS) ) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql index 178670e6d9..3876c36487 100644 --- a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql +++ b/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql @@ -1,8 +1,19 @@ # Final demand of biogenic oil and derivatives in industry (non-energetic use) +# +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil_non_energetic and +# multiplies it by the biogenic share (which covers biodiesel, bio_kerosene, +# and bio_oil) +# 2. Adds the full demand from industry_final_demand_bionaphtha_non_energetic +# (which is already fully biogenic) - unit = PJ - query = - PRODUCT( - Q(final_demand_of_oil_and_derivatives_in_industry_non_energetic), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + SUM( + PRODUCT( + DIVIDE(V(industry_final_demand_crude_oil_non_energetic, demand), BILLIONS), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + DIVIDE(V(industry_final_demand_bionaphtha_non_energetic, demand), BILLIONS) ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql index 5086f2ef5e..fc34c638c1 100644 --- a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql @@ -1,8 +1,18 @@ # Final demand of non-biogenic oil and derivatives in industry (energetic use) +# +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil and multiplies it +# by the non-biogenic share (which covers diesel, kerosene, lpg, and crude_oil) +# 2. Adds the full demand from industry_final_demand_naphtha (which is already +# fully non-biogenic) - unit = PJ - query = - PRODUCT( - Q(final_demand_of_oil_and_derivatives_in_industry_energetic), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + SUM( + PRODUCT( + DIVIDE(V(industry_final_demand_crude_oil, demand), BILLIONS), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + DIVIDE(V(industry_final_demand_naphtha, demand), BILLIONS) ) diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql index ad2019b339..de1753f419 100644 --- a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql +++ b/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql @@ -1,8 +1,19 @@ # Final demand of non-biogenic oil and derivatives in industry (non-energetic use) +# +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil_non_energetic and +# multiplies it by the non-biogenic share (which covers diesel, kerosene, +# lpg, and crude_oil) +# 2. Adds the full demand from industry_final_demand_naphtha_non_energetic +# (which is already fully non-biogenic) - unit = PJ - query = - PRODUCT( - Q(final_demand_of_oil_and_derivatives_in_industry_non_energetic), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + SUM( + PRODUCT( + DIVIDE(V(industry_final_demand_crude_oil_non_energetic, demand), BILLIONS), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + DIVIDE(V(industry_final_demand_naphtha_non_energetic, demand), BILLIONS) ) From fdb0037fca3c86ed87bf7e51e3b09cdc146c322d Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Thu, 18 Dec 2025 11:39:57 +0100 Subject: [PATCH 3/8] Move queries to custom folder --- .../final_demand_of_biogenic_oil_in_agriculture_energetic.gql | 0 .../final_demand_of_biogenic_oil_in_buildings_energetic.gql | 0 .../final_demand_of_biogenic_oil_in_households_energetic.gql | 0 .../final_demand_of_biogenic_oil_in_industry_energetic.gql | 0 .../final_demand_of_biogenic_oil_in_industry_non_energetic.gql | 0 .../final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql | 0 .../final_demand_of_non_biogenic_oil_in_buildings_energetic.gql | 0 .../final_demand_of_non_biogenic_oil_in_households_energetic.gql | 0 .../final_demand_of_non_biogenic_oil_in_industry_energetic.gql | 0 ...final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename gqueries/{general/final_demand/client => custom}/final_demand_of_biogenic_oil_in_agriculture_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_biogenic_oil_in_buildings_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_biogenic_oil_in_households_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_biogenic_oil_in_industry_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_biogenic_oil_in_industry_non_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_non_biogenic_oil_in_households_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_non_biogenic_oil_in_industry_energetic.gql (100%) rename gqueries/{general/final_demand/client => custom}/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql (100%) diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_agriculture_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_oil_in_agriculture_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_buildings_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_buildings_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_oil_in_buildings_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_households_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_households_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_oil_in_households_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_biogenic_oil_in_industry_non_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_households_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_households_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_oil_in_households_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql diff --git a/gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql similarity index 100% rename from gqueries/general/final_demand/client/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql From 926bc401e82e00923dfb41974939ea2eb35f7550 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 19 Dec 2025 11:01:57 +0100 Subject: [PATCH 4/8] Minor syntax improvements --- ...demand_of_biogenic_oil_in_industry_energetic.gql | 13 ++++++++----- ...nd_of_biogenic_oil_in_industry_non_energetic.gql | 13 ++++++++----- ...nd_of_non_biogenic_oil_in_industry_energetic.gql | 13 ++++++++----- ...f_non_biogenic_oil_in_industry_non_energetic.gql | 13 ++++++++----- ...agriculture_final_demand_crude_oil_energetic.gql | 6 +++--- ...n_buildings_final_demand_crude_oil_energetic.gql | 6 +++--- ..._households_final_demand_crude_oil_energetic.gql | 6 +++--- ...in_industry_final_demand_crude_oil_energetic.gql | 6 +++--- ...ndustry_final_demand_crude_oil_non_energetic.gql | 6 +++--- ...agriculture_final_demand_crude_oil_energetic.gql | 3 +-- ...n_buildings_final_demand_crude_oil_energetic.gql | 3 +-- ..._households_final_demand_crude_oil_energetic.gql | 3 +-- ...in_industry_final_demand_crude_oil_energetic.gql | 3 +-- ...ndustry_final_demand_crude_oil_non_energetic.gql | 3 +-- 14 files changed, 52 insertions(+), 45 deletions(-) diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql index c61ad29e67..59fb75f6b0 100644 --- a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql +++ b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql @@ -9,10 +9,13 @@ - unit = PJ - query = - SUM( - PRODUCT( - DIVIDE(V(industry_final_demand_crude_oil, demand), BILLIONS), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + DIVIDE( + SUM( + PRODUCT( + V(industry_final_demand_crude_oil, demand), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + V(industry_final_demand_bionaphtha, demand) ), - DIVIDE(V(industry_final_demand_bionaphtha, demand), BILLIONS) + BILLIONS ) diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql index 3876c36487..6dc0d24579 100644 --- a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql +++ b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql @@ -10,10 +10,13 @@ - unit = PJ - query = - SUM( - PRODUCT( - DIVIDE(V(industry_final_demand_crude_oil_non_energetic, demand), BILLIONS), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + DIVIDE( + SUM( + PRODUCT( + V(industry_final_demand_crude_oil_non_energetic, demand), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + V(industry_final_demand_bionaphtha_non_energetic, demand) ), - DIVIDE(V(industry_final_demand_bionaphtha_non_energetic, demand), BILLIONS) + BILLIONS ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql index fc34c638c1..a4f98570e5 100644 --- a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql +++ b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql @@ -9,10 +9,13 @@ - unit = PJ - query = - SUM( - PRODUCT( - DIVIDE(V(industry_final_demand_crude_oil, demand), BILLIONS), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + DIVIDE( + SUM( + PRODUCT( + V(industry_final_demand_crude_oil, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + V(industry_final_demand_naphtha, demand) ), - DIVIDE(V(industry_final_demand_naphtha, demand), BILLIONS) + BILLIONS ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql index de1753f419..116a786cfb 100644 --- a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql +++ b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql @@ -10,10 +10,13 @@ - unit = PJ - query = - SUM( - PRODUCT( - DIVIDE(V(industry_final_demand_crude_oil_non_energetic, demand), BILLIONS), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + DIVIDE( + SUM( + PRODUCT( + V(industry_final_demand_crude_oil_non_energetic, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + V(industry_final_demand_naphtha_non_energetic, demand) ), - DIVIDE(V(industry_final_demand_naphtha_non_energetic, demand), BILLIONS) + BILLIONS ) diff --git a/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql index 98cbc6bbea..370d763601 100644 --- a/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql @@ -1,6 +1,6 @@ - query = - SUM( - V(agriculture_final_demand_crude_oil, - "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + V( + agriculture_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion" ) - unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql index 11ea411d71..286a3d1dbe 100644 --- a/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_biogenic_in_buildings_final_demand_crude_oil_energetic.gql @@ -1,6 +1,6 @@ - query = - SUM( - V(buildings_final_demand_crude_oil, - "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + V( + buildings_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion" ) - unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql index 6566671d13..a0f8ec07af 100644 --- a/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_biogenic_in_households_final_demand_crude_oil_energetic.gql @@ -1,6 +1,6 @@ - query = - SUM( - V(households_final_demand_crude_oil, - "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + V( + households_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion" ) - unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql index bf233c5a45..70ff0e909f 100644 --- a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_energetic.gql @@ -1,6 +1,6 @@ - query = - SUM( - V(industry_final_demand_crude_oil, - "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + V( + industry_final_demand_crude_oil, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion" ) - unit = factor diff --git a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql index e171325222..1f229030ff 100644 --- a/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql +++ b/gqueries/general/shares/share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql @@ -1,6 +1,6 @@ - query = - SUM( - V(industry_final_demand_crude_oil_non_energetic, - "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion") + V( + industry_final_demand_crude_oil_non_energetic, + "biodiesel_input_conversion + bio_kerosene_input_conversion + bio_oil_input_conversion" ) - unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql index 0ed019159a..47302c48a1 100644 --- a/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_non_biogenic_in_agriculture_final_demand_crude_oil_energetic.gql @@ -1,3 +1,2 @@ -- query = - 1 - Q(share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic) +- query = 1 - Q(share_of_biogenic_in_agriculture_final_demand_crude_oil_energetic) - unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql index 0c1fe14436..074147d9ee 100644 --- a/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_non_biogenic_in_buildings_final_demand_crude_oil_energetic.gql @@ -1,3 +1,2 @@ -- query = - 1 - Q(share_of_biogenic_in_buildings_final_demand_crude_oil_energetic) +- query = 1 - Q(share_of_biogenic_in_buildings_final_demand_crude_oil_energetic) - unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql index 77a3540feb..d48682dd2f 100644 --- a/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_non_biogenic_in_households_final_demand_crude_oil_energetic.gql @@ -1,3 +1,2 @@ -- query = - 1 - Q(share_of_biogenic_in_households_final_demand_crude_oil_energetic) +- query = 1 - Q(share_of_biogenic_in_households_final_demand_crude_oil_energetic) - unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql index e4921229bd..f250755cbd 100644 --- a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql +++ b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic.gql @@ -1,3 +1,2 @@ -- query = - 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) +- query = 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) - unit = factor diff --git a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql index a9854540b6..cd94a6fab3 100644 --- a/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql +++ b/gqueries/general/shares/share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic.gql @@ -1,3 +1,2 @@ -- query = - 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) +- query = 1 - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) - unit = factor From a059ed7ed165e0bad92ebe27bfab7d0ee598cb38 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Mon, 22 Dec 2025 11:53:19 +0100 Subject: [PATCH 5/8] Altering query structure of final demand of biogenic/non-biogenic in oil in industry queries --- ..._and_derivatives_in_industry_energetic.gql | 18 +++++++++++++++ ..._derivatives_in_industry_non_energetic.gql | 18 +++++++++++++++ ..._of_biogenic_oil_in_industry_energetic.gql | 21 ------------------ ...biogenic_oil_in_industry_non_energetic.gql | 22 ------------------- ..._and_derivatives_in_industry_energetic.gql | 18 +++++++++++++++ ..._derivatives_in_industry_non_energetic.gql | 18 +++++++++++++++ ...non_biogenic_oil_in_industry_energetic.gql | 21 ------------------ ...biogenic_oil_in_industry_non_energetic.gql | 22 ------------------- 8 files changed, 72 insertions(+), 86 deletions(-) create mode 100644 gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_energetic.gql create mode 100644 gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql delete mode 100644 gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql delete mode 100644 gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql create mode 100644 gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql create mode 100644 gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql delete mode 100644 gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql delete mode 100644 gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql diff --git a/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_energetic.gql new file mode 100644 index 0000000000..d1f3a06f17 --- /dev/null +++ b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_energetic.gql @@ -0,0 +1,18 @@ +# Final demand of biogenic portion of oil and derivatives in industry (energetic use) +# +# This calculates the biogenic share of the crude oil final demand node only. +# It does not include bionaphtha, which is tracked separately in +# final_demand_of_biomass_products_in_industry_energetic. +# +# The biogenic share covers only: biodiesel, bio_kerosene, and bio_oil inputs +# to the industry_final_demand_crude_oil node. + +- unit = PJ +- query = + DIVIDE( + PRODUCT( + V(industry_final_demand_crude_oil, demand), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + BILLIONS + ) diff --git a/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql new file mode 100644 index 0000000000..715a0e0e6e --- /dev/null +++ b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql @@ -0,0 +1,18 @@ +# Final demand of biogenic portion of oil and derivatives in industry (non-energetic use) +# +# This calculates the biogenic share of the crude oil final demand node only. +# It does not include bionaphtha, which is tracked separately in +# final_demand_of_biomass_products_in_industry_non_energetic. +# +# The biogenic share covers only: biodiesel, bio_kerosene, and bio_oil inputs +# to the industry_final_demand_crude_oil_non_energetic node. + +- unit = PJ +- query = + DIVIDE( + PRODUCT( + V(industry_final_demand_crude_oil_non_energetic, demand), + Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + BILLIONS + ) diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql deleted file mode 100644 index 59fb75f6b0..0000000000 --- a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_energetic.gql +++ /dev/null @@ -1,21 +0,0 @@ -# Final demand of biogenic oil and derivatives in industry (energetic use) -# -# This query uses a different approach than other sectors because naphtha is -# modeled separately in the industry sector: -# 1. Takes the demand from industry_final_demand_crude_oil and multiplies it -# by the biogenic share (which covers biodiesel, bio_kerosene, and bio_oil) -# 2. Adds the full demand from industry_final_demand_bionaphtha (which is -# already fully biogenic) - -- unit = PJ -- query = - DIVIDE( - SUM( - PRODUCT( - V(industry_final_demand_crude_oil, demand), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_energetic) - ), - V(industry_final_demand_bionaphtha, demand) - ), - BILLIONS - ) diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql deleted file mode 100644 index 6dc0d24579..0000000000 --- a/gqueries/custom/final_demand_of_biogenic_oil_in_industry_non_energetic.gql +++ /dev/null @@ -1,22 +0,0 @@ -# Final demand of biogenic oil and derivatives in industry (non-energetic use) -# -# This query uses a different approach than other sectors because naphtha is -# modeled separately in the industry sector: -# 1. Takes the demand from industry_final_demand_crude_oil_non_energetic and -# multiplies it by the biogenic share (which covers biodiesel, bio_kerosene, -# and bio_oil) -# 2. Adds the full demand from industry_final_demand_bionaphtha_non_energetic -# (which is already fully biogenic) - -- unit = PJ -- query = - DIVIDE( - SUM( - PRODUCT( - V(industry_final_demand_crude_oil_non_energetic, demand), - Q(share_of_biogenic_in_industry_final_demand_crude_oil_non_energetic) - ), - V(industry_final_demand_bionaphtha_non_energetic, demand) - ), - BILLIONS - ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql new file mode 100644 index 0000000000..b3922e40ca --- /dev/null +++ b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql @@ -0,0 +1,18 @@ +# Final demand of non-biogenic portion of oil and derivatives in industry (energetic use) +# +# This calculates the non-biogenic share of the crude oil final demand node only. +# It does not include naphtha, which is tracked separately in +# final_demand_of_oil_and_derivatives_in_industry_energetic. +# +# The non-biogenic share covers: diesel, kerosene, lpg, heavy_fuel_oil, and +# crude_oil inputs to the industry_final_demand_crude_oil node. + +- unit = PJ +- query = + DIVIDE( + PRODUCT( + V(industry_final_demand_crude_oil, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + BILLIONS + ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql new file mode 100644 index 0000000000..d96f89670f --- /dev/null +++ b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql @@ -0,0 +1,18 @@ +# Final demand of non-biogenic portion of oil and derivatives in industry (non-energetic use) +# +# This calculates the non-biogenic share of the crude oil final demand node only. +# It does not include naphtha, which is tracked separately in +# final_demand_of_oil_and_derivatives_in_industry_non_energetic. +# +# The non-biogenic share covers: diesel, kerosene, lpg, heavy_fuel_oil, and +# crude_oil inputs to the industry_final_demand_crude_oil_non_energetic node. + +- unit = PJ +- query = + DIVIDE( + PRODUCT( + V(industry_final_demand_crude_oil_non_energetic, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + BILLIONS + ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql deleted file mode 100644 index a4f98570e5..0000000000 --- a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_energetic.gql +++ /dev/null @@ -1,21 +0,0 @@ -# Final demand of non-biogenic oil and derivatives in industry (energetic use) -# -# This query uses a different approach than other sectors because naphtha is -# modeled separately in the industry sector: -# 1. Takes the demand from industry_final_demand_crude_oil and multiplies it -# by the non-biogenic share (which covers diesel, kerosene, lpg, and crude_oil) -# 2. Adds the full demand from industry_final_demand_naphtha (which is already -# fully non-biogenic) - -- unit = PJ -- query = - DIVIDE( - SUM( - PRODUCT( - V(industry_final_demand_crude_oil, demand), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) - ), - V(industry_final_demand_naphtha, demand) - ), - BILLIONS - ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql deleted file mode 100644 index 116a786cfb..0000000000 --- a/gqueries/custom/final_demand_of_non_biogenic_oil_in_industry_non_energetic.gql +++ /dev/null @@ -1,22 +0,0 @@ -# Final demand of non-biogenic oil and derivatives in industry (non-energetic use) -# -# This query uses a different approach than other sectors because naphtha is -# modeled separately in the industry sector: -# 1. Takes the demand from industry_final_demand_crude_oil_non_energetic and -# multiplies it by the non-biogenic share (which covers diesel, kerosene, -# lpg, and crude_oil) -# 2. Adds the full demand from industry_final_demand_naphtha_non_energetic -# (which is already fully non-biogenic) - -- unit = PJ -- query = - DIVIDE( - SUM( - PRODUCT( - V(industry_final_demand_crude_oil_non_energetic, demand), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) - ), - V(industry_final_demand_naphtha_non_energetic, demand) - ), - BILLIONS - ) From ce34cca624cc59f16a90f4e7d253ca427fd5263a Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Tue, 23 Dec 2025 10:46:13 +0100 Subject: [PATCH 6/8] Rename queries and add naphtha to oil queries --- ...biogenic_in_oil_agriculture_energetic.gql} | 0 ...f_biogenic_in_oil_buildings_energetic.gql} | 0 ..._biogenic_in_oil_households_energetic.gql} | 0 ...biogenic_in_oil_agriculture_energetic.gql} | 0 ..._and_derivatives_in_industry_energetic.gql | 24 +++++++++++-------- ..._derivatives_in_industry_non_energetic.gql | 24 +++++++++++-------- ...n_biogenic_in_oil_buildings_energetic.gql} | 0 ..._biogenic_in_oil_households_energetic.gql} | 0 8 files changed, 28 insertions(+), 20 deletions(-) rename gqueries/custom/{final_demand_of_biogenic_oil_in_agriculture_energetic.gql => final_demand_of_biogenic_in_oil_agriculture_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_biogenic_oil_in_buildings_energetic.gql => final_demand_of_biogenic_in_oil_buildings_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_biogenic_oil_in_households_energetic.gql => final_demand_of_biogenic_in_oil_households_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql => final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_oil_in_buildings_energetic.gql => final_demand_of_non_biogenic_in_oil_buildings_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_oil_in_households_energetic.gql => final_demand_of_non_biogenic_in_oil_households_energetic.gql} (100%) diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_agriculture_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_agriculture_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_oil_in_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_agriculture_energetic.gql diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_buildings_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_buildings_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_oil_in_buildings_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_buildings_energetic.gql diff --git a/gqueries/custom/final_demand_of_biogenic_oil_in_households_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_households_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_oil_in_households_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_households_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_oil_in_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql index b3922e40ca..26b4ed78f7 100644 --- a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql +++ b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql @@ -1,18 +1,22 @@ -# Final demand of non-biogenic portion of oil and derivatives in industry (energetic use) +# Final demand of non-biogenic oil and derivatives in industry (non-energetic use) # -# This calculates the non-biogenic share of the crude oil final demand node only. -# It does not include naphtha, which is tracked separately in -# final_demand_of_oil_and_derivatives_in_industry_energetic. -# -# The non-biogenic share covers: diesel, kerosene, lpg, heavy_fuel_oil, and -# crude_oil inputs to the industry_final_demand_crude_oil node. +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil_ and +# multiplies it by the non-biogenic share (which covers diesel, kerosene, +# lpg, and crude_oil) +# 2. Adds the full demand from industry_final_demand_naphtha_ +# (which is already fully non-biogenic) - unit = PJ - query = DIVIDE( - PRODUCT( - V(industry_final_demand_crude_oil, demand), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + SUM( + PRODUCT( + V(industry_final_demand_crude_oil, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) + ), + V(industry_final_demand_naphtha demand) ), BILLIONS ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql index d96f89670f..116a786cfb 100644 --- a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql +++ b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_non_energetic.gql @@ -1,18 +1,22 @@ -# Final demand of non-biogenic portion of oil and derivatives in industry (non-energetic use) +# Final demand of non-biogenic oil and derivatives in industry (non-energetic use) # -# This calculates the non-biogenic share of the crude oil final demand node only. -# It does not include naphtha, which is tracked separately in -# final_demand_of_oil_and_derivatives_in_industry_non_energetic. -# -# The non-biogenic share covers: diesel, kerosene, lpg, heavy_fuel_oil, and -# crude_oil inputs to the industry_final_demand_crude_oil_non_energetic node. +# This query uses a different approach than other sectors because naphtha is +# modeled separately in the industry sector: +# 1. Takes the demand from industry_final_demand_crude_oil_non_energetic and +# multiplies it by the non-biogenic share (which covers diesel, kerosene, +# lpg, and crude_oil) +# 2. Adds the full demand from industry_final_demand_naphtha_non_energetic +# (which is already fully non-biogenic) - unit = PJ - query = DIVIDE( - PRODUCT( - V(industry_final_demand_crude_oil_non_energetic, demand), - Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + SUM( + PRODUCT( + V(industry_final_demand_crude_oil_non_energetic, demand), + Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_non_energetic) + ), + V(industry_final_demand_naphtha_non_energetic, demand) ), BILLIONS ) diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_buildings_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_oil_in_buildings_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_buildings_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_oil_in_households_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_households_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_oil_in_households_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_households_energetic.gql From 00825fa390f92fb85d41e5a073fdb974c848b2c4 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 23 Dec 2025 13:50:30 +0100 Subject: [PATCH 7/8] Fix in query --- ..._biogenic_in_oil_and_derivatives_in_industry_energetic.gql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql index 26b4ed78f7..d410328e0a 100644 --- a/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql +++ b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_in_industry_energetic.gql @@ -5,7 +5,7 @@ # 1. Takes the demand from industry_final_demand_crude_oil_ and # multiplies it by the non-biogenic share (which covers diesel, kerosene, # lpg, and crude_oil) -# 2. Adds the full demand from industry_final_demand_naphtha_ +# 2. Adds the full demand from industry_final_demand_naphtha # (which is already fully non-biogenic) - unit = PJ @@ -16,7 +16,7 @@ V(industry_final_demand_crude_oil, demand), Q(share_of_non_biogenic_in_industry_final_demand_crude_oil_energetic) ), - V(industry_final_demand_naphtha demand) + V(industry_final_demand_naphtha, demand) ), BILLIONS ) From 536fa9644ee43b7be372de6121f6ec1908dd6656 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 23 Dec 2025 13:50:39 +0100 Subject: [PATCH 8/8] Apply consistent naming --- ..._of_biogenic_in_oil_and_derivatives_agriculture_energetic.gql} | 0 ...nd_of_biogenic_in_oil_and_derivatives_buildings_energetic.gql} | 0 ...d_of_biogenic_in_oil_and_derivatives_households_energetic.gql} | 0 ...non_biogenic_in_oil_and_derivatives_agriculture_energetic.gql} | 0 ...f_non_biogenic_in_oil_and_derivatives_buildings_energetic.gql} | 0 ..._non_biogenic_in_oil_and_derivatives_households_energetic.gql} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename gqueries/custom/{final_demand_of_biogenic_in_oil_agriculture_energetic.gql => final_demand_of_biogenic_in_oil_and_derivatives_agriculture_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_biogenic_in_oil_buildings_energetic.gql => final_demand_of_biogenic_in_oil_and_derivatives_buildings_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_biogenic_in_oil_households_energetic.gql => final_demand_of_biogenic_in_oil_and_derivatives_households_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql => final_demand_of_non_biogenic_in_oil_and_derivatives_agriculture_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_in_oil_buildings_energetic.gql => final_demand_of_non_biogenic_in_oil_and_derivatives_buildings_energetic.gql} (100%) rename gqueries/custom/{final_demand_of_non_biogenic_in_oil_households_energetic.gql => final_demand_of_non_biogenic_in_oil_and_derivatives_households_energetic.gql} (100%) diff --git a/gqueries/custom/final_demand_of_biogenic_in_oil_agriculture_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_agriculture_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_in_oil_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_agriculture_energetic.gql diff --git a/gqueries/custom/final_demand_of_biogenic_in_oil_buildings_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_buildings_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_in_oil_buildings_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_buildings_energetic.gql diff --git a/gqueries/custom/final_demand_of_biogenic_in_oil_households_energetic.gql b/gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_households_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_biogenic_in_oil_households_energetic.gql rename to gqueries/custom/final_demand_of_biogenic_in_oil_and_derivatives_households_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_agriculture_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_in_oil_agriculture_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_agriculture_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_buildings_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_buildings_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_in_oil_buildings_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_buildings_energetic.gql diff --git a/gqueries/custom/final_demand_of_non_biogenic_in_oil_households_energetic.gql b/gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_households_energetic.gql similarity index 100% rename from gqueries/custom/final_demand_of_non_biogenic_in_oil_households_energetic.gql rename to gqueries/custom/final_demand_of_non_biogenic_in_oil_and_derivatives_households_energetic.gql