Update energy flow overview sankey

kaskranenburgQ · kndehaan · commit 2c736ef55665 · 2025-10-01T14:10:18.000+02:00
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biogas_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biogas_to_biofuels.gql
@@ -0,0 +1,54 @@
+# Direct conversion input of biogenic_waste for biofuels
+# The function is broken down due to limited allowed inputs in V() function
+
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bio_kerosene_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bio_ethanol_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "biodiesel_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bionaphtha_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "biomethanol_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bio_pyrolysis_oil_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "wood_pellets_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "torrefied_biomass_pellets_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bio_lng_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "bio_oil_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "greengas_output_conversion / (1 - loss_output_conversion) * input_of_biogas"
+        )
+      ),
+      BILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biogenic_waste_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biogenic_waste_to_biofuels.gql
@@ -43,6 +43,10 @@
         V(
           Q(biofuels_producers), G(industry_transformation),
           "bio_oil_output_conversion / (1 - loss_output_conversion) * input_of_biogenic_waste"
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "greengas_output_conversion / (1 - loss_output_conversion) * input_of_biogenic_waste"
         )
       ),
       BILLIONS
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biomass_products_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_biomass_products_to_biofuels.gql
@@ -8,7 +8,7 @@
       Q(conversion_from_dry_biomass_to_biofuels),
       Q(conversion_from_wet_biomass_to_biofuels),
       Q(conversion_from_biogenic_waste_to_heat_in_pyrolysis_oil_production),
-      Q(conversion_from_dry_biomass_to_heat_in_pyrolysis_oil_production)
-
+      Q(conversion_from_dry_biomass_to_heat_in_pyrolysis_oil_production),
+      Q(conversion_from_wet_biomass_to_biogas)
     )  
 - unit = PJ
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_dry_biomass_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_dry_biomass_to_biofuels.gql
@@ -43,7 +43,11 @@
         V(
           Q(biofuels_producers), G(industry_transformation),
           "bio_oil_output_conversion / (1 - loss_output_conversion) * input_of_dry_biomass"
-        )
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "greengas_output_conversion / (1 - loss_output_conversion) * input_of_dry_biomass"
+        ) 
       ),
       BILLIONS
     )
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_oily_biomass_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_oily_biomass_to_biofuels.gql
@@ -43,7 +43,11 @@
         V(
           Q(biofuels_producers), G(industry_transformation),
           "bio_oil_output_conversion / (1 - loss_output_conversion) * input_of_oily_biomass"
-        )
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "greengas_output_conversion / (1 - loss_output_conversion) * input_of_oily_biomass"
+        )    
       ),
       BILLIONS
     )
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_wet_biomass_to_biofuels.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_wet_biomass_to_biofuels.gql
@@ -43,7 +43,11 @@
         V(
           Q(biofuels_producers), G(industry_transformation),
           "bio_oil_output_conversion / (1 - loss_output_conversion) * input_of_wet_biomass"
-        )
+        ),
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "greengas_output_conversion / (1 - loss_output_conversion) * input_of_wet_biomass"
+        )    
       ),
       BILLIONS
     )
diff --git a/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_wet_biomass_to_biogas.gql b/gqueries/general/conversion/biofuels/conversion_from_carrier_to_biofuels/conversion_from_wet_biomass_to_biogas.gql
@@ -0,0 +1,14 @@
+# Direct conversion input of wet_biomass for biofuels
+# The function is broken down due to limited allowed inputs in V() function
+
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          Q(biofuels_producers), G(industry_transformation),
+          "biogas_output_conversion / (1 - loss_output_conversion) * input_of_wet_biomass"
+        )    
+      ),
+      BILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql b/gqueries/general/conversion/hydrogen/conversion_from_carrier_to_hydrogen/conversion_from_biomass_products_to_hydrogen.gql
@@ -5,5 +5,6 @@
       Q(conversion_from_green_gas_to_hydrogen),
       PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)),
       PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)),
+      Q(conversion_from_biofuels_to_hydrogen)
     )
 - unit = PJ
diff --git a/gqueries/general/converter_groups/biofuels_producers /biofuels_producers.gql b/gqueries/general/converter_groups/biofuels_producers /biofuels_producers.gql
@@ -4,6 +4,10 @@
     V(
       Q(liquid_biofuels_producers),
       energy_production_wood_pellets,
-      energy_torrefaction_wood
+      energy_torrefaction_wood,
+      energy_biogas_fermentation_wet_biomass,
+      energy_greengas_gasification_wet_biomass,
+      energy_greengas_gasification_dry_biomass,
+      energy_greengas_upgrade_biogas
     )
 - unit = nodes
diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_biomass_products_to_biomass_products.gql
@@ -27,6 +27,7 @@
       Q(conversion_loss_dry_biomass_to_biodiesel),
       Q(conversion_loss_dry_biomass_to_biomethanol),
       Q(conversion_loss_dry_biomass_to_bionaphtha),
+      Q(conversion_loss_dry_biomass_to_greengas),
       Q(conversion_loss_oily_biomass_to_bio_kerosene),
       Q(conversion_loss_oily_biomass_to_bio_pyrolysis_oil),
       Q(conversion_loss_oily_biomass_to_biodiesel),
diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_dry_biomass_to_greengas.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_dry_biomass_to_greengas.gql
@@ -0,0 +1,11 @@
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          FILTER(G(sankey_conversion_group),"greengas_output_conversion > 0.0 && dry_biomass_input_conversion > 0.0"),
+          "greengas_output_conversion * dry_biomass_input_conversion / (1 - loss_output_conversion) * output_of_loss"
+        )
+      ), 
+      BILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_wet_biomass_to_biogas.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_wet_biomass_to_biogas.gql
@@ -3,7 +3,7 @@
       SUM(
         V(
           FILTER(G(sankey_conversion_group),"biogas_output_conversion > 0.0 && wet_biomass_input_conversion > 0.0"),
-          "greengas_output_conversion * wet_biomass_input_conversion / (1 - loss_output_conversion) * output_of_loss"
+          "biogas_output_conversion * wet_biomass_input_conversion / (1 - loss_output_conversion) * output_of_loss"
         )
       ), 
       BILLIONS
diff --git a/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_wet_biomass_to_greengas.gql b/gqueries/modules/sankey_csv/conversion/biomass_products/conversion_loss_wet_biomass_to_greengas.gql
@@ -2,7 +2,7 @@
     DIVIDE(
       SUM(
         V(
-          FILTER(G(sankey_conversion_group),"bionaphtha_output_conversion > 0.0 && wet_biomass_input_conversion > 0.0"),
+          FILTER(G(sankey_conversion_group),"greengas_output_conversion > 0.0 && wet_biomass_input_conversion > 0.0"),
           "greengas_output_conversion * wet_biomass_input_conversion / (1 - loss_output_conversion) * output_of_loss"
         )
       ), 
diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_1_not_defined_to_biofuels.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_1_not_defined_to_biofuels.gql
@@ -1,4 +1,4 @@
 # GQuery for sankey_0_to_1_not_defined_to_biofuels
 
-- query = Q(conversion_from_not_defined_to_biofuels)
+- query = Q(not_defined_to_biomass_products_industry_transformation_in_sankey)
 - unit = PJ

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@`
`5`	`5`	`Q(conversion_from_green_gas_to_hydrogen),`
`6`	`6`	`PRODUCT(Q(conversion_from_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)),`
`7`	`7`	`PRODUCT(Q(conversion_from_compressed_network_gas_to_hydrogen),Q(share_of_sustainable_gas_in_gas_network)),`
	`8`	`+ Q(conversion_from_biofuels_to_hydrogen)`
`8`	`9`	`)`
`9`	`10`	`- unit = PJ`