Changes to errors in Sankey

quintel · Dec 18, 2023 · 654fce8 · 654fce8
1 parent 97f45e5
commit 654fce8
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 23 deletions.
diff --git a/...nversion_from_carrier_to_electricity/conversion_from_solar_electricity_to_electricity.gql b/...nversion_from_carrier_to_electricity/conversion_from_solar_electricity_to_electricity.gql
@@ -2,13 +2,26 @@
 # For renewable energy carriers the output of electricity is taken by convention
 
 - query = 
-    DIVIDE(
-      SUM(
-        V(
-          FILTER(G(electricity_production),"solar_radiation_input_conversion > 0.0"),
-          output_of_electricity
-        )
-      ), 
+    SUM(
+      DIVIDE(
+        SUM(
+          V(
+            FILTER(G(electricity_production),"solar_radiation_input_conversion > 0.0"),
+            output_of_electricity
+          ),
+        ),
       BILLIONS
-    )
+      ),
+        DIVIDE(
+          SUM(
+          V(
+            FILTER(G(costs_production_dedicated_hydrogen_production),"solar_radiation_input_conversion > 0.0"),
+            output_of_electricity
+          )
+        ), 
+        BILLIONS
+        )
+      )
+
+
 - unit = PJ
diff --git a/...onversion_from_carrier_to_electricity/conversion_from_wind_electricity_to_electricity.gql b/...onversion_from_carrier_to_electricity/conversion_from_wind_electricity_to_electricity.gql
@@ -2,13 +2,24 @@
 # For renewable energy carriers the output of electricity is taken by convention
 
 - query = 
-    DIVIDE(
-      SUM(
-        V(
-          FILTER(G(electricity_production),"wind_input_conversion > 0.0"),
-          output_of_electricity
-        )
-      ), 
-      BILLIONS
+    SUM(
+      DIVIDE(
+        SUM(
+          V(
+            FILTER(G(electricity_production),"wind_input_conversion > 0.0"),
+            output_of_electricity
+          )
+        ), 
+        BILLIONS
+      ),
+      DIVIDE(
+        SUM(
+          V(
+            FILTER(G(costs_production_dedicated_hydrogen_production),"wind_input_conversion > 0.0"),
+            output_of_electricity
+          )
+        ), 
+        BILLIONS
+      )
     )
 - unit = PJ
diff --git a/...version_from_carrier_to_hydrogen/conversion_from_imported_liquid_hydrogen_to_hydrogen.gql b/...version_from_carrier_to_hydrogen/conversion_from_imported_liquid_hydrogen_to_hydrogen.gql
@@ -4,8 +4,8 @@
     DIVIDE(
       SUM(
         V(
-          G(liquid_hydrogen_supply),
-          "hydrogen_output_conversion / (1 - loss_output_conversion) * input_of_imported_liquid_hydrogen"
+          G(hydrogen_production),
+          "hydrogen_output_conversion / (1 - loss_output_conversion) * input_of_liquid_hydrogen"
         )
       ), 
       BILLIONS

diff --git a/...ydrogen/conversion_from_carrier_to_hydrogen/conversion_from_imported_lohc_to_hydrogen.gql b/...ydrogen/conversion_from_carrier_to_hydrogen/conversion_from_imported_lohc_to_hydrogen.gql
@@ -4,8 +4,8 @@
     DIVIDE(
       SUM(
         V(
-          G(lohc_supply),
-          "hydrogen_output_conversion / (1 - loss_output_conversion) * input_of_imported_lohc"
+          G(hydrogen_production),
+          "hydrogen_output_conversion / (1 - loss_output_conversion) * input_of_lohc"
         )
       ), 
       BILLIONS

diff --git a/...es/modules/sankey_csv/conversion/hydrogen/conversion_loss_liquid_hydrogen_to_hydrogen.gql b/...es/modules/sankey_csv/conversion/hydrogen/conversion_loss_liquid_hydrogen_to_hydrogen.gql
@@ -0,0 +1,11 @@
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          FILTER(G(sankey_conversion_group),"hydrogen_output_conversion > 0.0 && liquid_hydrogen_input_conversion > 0.0"),
+          "hydrogen_output_conversion * liquid_hydrogen_input_conversion / (1 - loss_output_conversion) * output_of_loss"
+        )
+      ), 
+      BILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/modules/sankey_csv/conversion/hydrogen/conversion_loss_lohc_to_hydrogen.gql b/gqueries/modules/sankey_csv/conversion/hydrogen/conversion_loss_lohc_to_hydrogen.gql
@@ -0,0 +1,11 @@
+- query =
+    DIVIDE(
+      SUM(
+        V(
+          FILTER(G(sankey_conversion_group),"hydrogen_output_conversion > 0.0 && lohc_input_conversion > 0.0"),
+          "hydrogen_output_conversion * lohc_input_conversion / (1 - loss_output_conversion) * output_of_loss"
+        )
+      ), 
+      BILLIONS
+    )
+- unit = PJ
diff --git a/...s/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_hydrogen_to_loss.gql b/...s/output_elements/output_series/sankey_energy_overview/sankey_1_to_2_hydrogen_to_loss.gql
@@ -5,9 +5,9 @@
       Q(conversion_loss_hydrogen_to_hydrogen),
       Q(conversion_loss_natural_gas_and_derivatives_to_hydrogen),
       Q(conversion_loss_biomass_products_to_hydrogen),
-      Q(conversion_loss_ammonia_to_hydrogen)
+      Q(conversion_loss_ammonia_to_hydrogen),
+      Q(conversion_loss_lohc_to_hydrogen),
+      Q(conversion_loss_liquid_hydrogen_to_hydrogen)
     )
 - unit = PJ
 
-      #Q(conversion_loss_lohc_to_hydrogen)
-      #Q(conversion_loss_liqud_hydrogen_to_hydrogen)