From e996e57088a191ad6f9adf67c8e86519485e20fa Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Wed, 15 May 2024 16:30:40 +0200 Subject: [PATCH 1/7] testing queries for steam hot water, hydrogen and electricity --- .../sankey/tests/turk_sankey_electricity.gql | 10 ++++++ .../sankey/tests/turk_sankey_hydrogen.gql | 10 ++++++ .../tests/turk_sankey_steam_hot_water.gql | 8 +++++ .../turk_sankey_conversion_ammonia_input.gql | 5 +++ .../turk_sankey_conversion_biomass_input.gql | 8 +++++ .../turk_sankey_conversion_biomass_output.gql | 5 +++ .../turk_sankey_conversion_coal_input.gql | 6 ++++ ...rk_sankey_conversion_electricity_input.gql | 14 ++++++++ ...k_sankey_conversion_electricity_output.gql | 10 ++++++ ...urk_sankey_conversion_geothermal_input.gql | 5 +++ .../turk_sankey_conversion_hydrogen_input.gql | 7 ++++ ...turk_sankey_conversion_hydrogen_output.gql | 17 ++++++++++ ...ankey_conversion_liquid_hydrogen_input.gql | 5 +++ .../turk_sankey_conversion_lohc_input.gql | 5 +++ .../turk_sankey_conversion_loss_input.gql | 5 +++ .../turk_sankey_conversion_loss_output.gql | 34 +++++++++++++++++++ ...rk_sankey_conversion_natural_gas_input.gql | 12 +++++++ ...k_sankey_conversion_natural_gas_output.gql | 5 +++ .../turk_sankey_conversion_oil_input.gql | 6 ++++ .../turk_sankey_conversion_oil_output.gql | 5 +++ ..._sankey_conversion_solar_thermal_input.gql | 5 +++ ...nkey_conversion_steam_hot_water_output.gql | 16 +++++++++ .../turk_sankey_conversion_uranium_input.gql | 5 +++ ...turk_sankey_final_demand_ammonia_input.gql | 17 ++++++++++ ...turk_sankey_final_demand_biomass_input.gql | 17 ++++++++++ .../turk_sankey_final_demand_coal_input.gql | 17 ++++++++++ ..._sankey_final_demand_electricity_input.gql | 18 ++++++++++ ...k_sankey_final_demand_geothermal_input.gql | 16 +++++++++ ...urk_sankey_final_demand_hydrogen_input.gql | 17 ++++++++++ ...key_final_demand_liquid_hydrogen_input.gql | 5 +++ .../turk_sankey_final_demand_lohc_input.gql | 5 +++ ..._sankey_final_demand_natural_gas_input.gql | 17 ++++++++++ .../turk_sankey_final_demand_oil_input.gql | 17 ++++++++++ ...ankey_final_demand_solar_thermal_input.gql | 16 +++++++++ ...key_final_demand_steam_hot_water_input.gql | 16 +++++++++ ...team_hot_water_to_steam_hot_water copy.gql | 3 ++ ...oss_steam_hot_water_to_steam_hot_water.gql | 3 ++ ...k_sankey_primary_demand_ammonia_output.gql | 5 +++ ...k_sankey_primary_demand_biomass_output.gql | 15 ++++++++ ...turk_sankey_primary_demand_coal_output.gql | 6 ++++ ...nkey_primary_demand_electricity_output.gql | 11 ++++++ ...ankey_primary_demand_geothermal_output.gql | 5 +++ ..._sankey_primary_demand_hydrogen_output.gql | 5 +++ ..._primary_demand_liquid_hydrogen_output.gql | 5 +++ ...turk_sankey_primary_demand_lohc_output.gql | 5 +++ ...nkey_primary_demand_natural_gas_output.gql | 6 ++++ .../turk_sankey_primary_demand_oil_output.gql | 6 ++++ ...ey_primary_demand_solar_thermal_output.gql | 5 +++ ..._primary_demand_steam_hot_water_output.gql | 5 +++ ...k_sankey_primary_demand_uranium_output.gql | 6 ++++ 50 files changed, 477 insertions(+) create mode 100644 gqueries/config/sankey/tests/turk_sankey_electricity.gql create mode 100644 gqueries/config/sankey/tests/turk_sankey_hydrogen.gql create mode 100644 gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_coal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_loss_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_loss_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_oil_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_oil_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql create mode 100644 gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql create mode 100644 gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql create mode 100644 gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql diff --git a/gqueries/config/sankey/tests/turk_sankey_electricity.gql b/gqueries/config/sankey/tests/turk_sankey_electricity.gql new file mode 100644 index 0000000000..1b2e2f0cc3 --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_electricity.gql @@ -0,0 +1,10 @@ +- query = + SUM( + NEG(Q(turk_sankey_conversion_electricity_input)), + Q(turk_sankey_conversion_electricity_output), + NEG(Q(turk_sankey_final_demand_electricity_input)), + Q(turk_sankey_primary_demand_electricity_output), + NEG(Q(conversion_loss_electricity_to_electricity)) + ) +- unit = PJ + diff --git a/gqueries/config/sankey/tests/turk_sankey_hydrogen.gql b/gqueries/config/sankey/tests/turk_sankey_hydrogen.gql new file mode 100644 index 0000000000..98bb07c56f --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_hydrogen.gql @@ -0,0 +1,10 @@ +- query = + SUM( + NEG(Q(turk_sankey_conversion_hydrogen_input)), + Q(turk_sankey_conversion_hydrogen_output), + NEG(Q(turk_sankey_final_demand_hydrogen_input)), + Q(turk_sankey_primary_demand_hydrogen_output), + NEG(Q(conversion_loss_hydrogen_to_hydrogen)) + ) +- unit = PJ + diff --git a/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql b/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql new file mode 100644 index 0000000000..a6c3a38a10 --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql @@ -0,0 +1,8 @@ +- query = + SUM( + Q(turk_sankey_conversion_steam_hot_water_output), + NEG(Q(turk_sankey_final_demand_steam_hot_water_input)), + Q(turk_sankey_primary_demand_steam_hot_water_output), + NEG(Q(turk_sankey_loss_steam_hot_water_to_steam_hot_water)) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql b/gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql new file mode 100644 index 0000000000..4e1fe11802 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(imported_ammonia_to_hydrogen_prod_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql b/gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql new file mode 100644 index 0000000000..261bd3452c --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql @@ -0,0 +1,8 @@ +- query = + SUM( + Q(biomass_products_for_biomass_gasification_conversion), + Q(biomass_products_for_biomass_gasification_ccs_conversion), + Q(biomass_products_for_electricity_conversion), + Q(biomass_products_to_central_heat_prod_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql b/gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql new file mode 100644 index 0000000000..421e63c918 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(conversion_industry_residual_greengas) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_coal_input.gql b/gqueries/config/sankey/turk_sankey_conversion_coal_input.gql new file mode 100644 index 0000000000..e65d331382 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_coal_input.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(coal_for_electricity_conversion), + Q(coal_and_derivatives_to_central_heat_prod_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql b/gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql new file mode 100644 index 0000000000..9268f3bc6d --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql @@ -0,0 +1,14 @@ +- query = + SUM( + Q(electricity_for_steam_methane_reformer_hydrogen_conversion), + Q(electricity_for_steam_methane_reformer_ccs_hydrogen_conversion), + Q(electricity_for_autothermal_reformer_hydrogen_conversion), + Q(electricity_for_autothermal_reformer_ccs_hydrogen_conversion), + Q(electricity_prod_to_p2g_in_sankey), + Q(wind_to_hydrogen_prod_in_sankey), + Q(solar_to_hydrogen_prod_in_sankey), + Q(electricity_prod_to_p2h_central_heat_in_sankey), + Q(electricity_prod_to_central_heat_prod_excl_p2h_in_sankey), + Q(electricity_for_synthetic_kerosene_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql b/gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql new file mode 100644 index 0000000000..f8e1f52c49 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql @@ -0,0 +1,10 @@ +- query = + SUM( + Q(coal_products_in_source_of_electricity_production), + Q(oil_in_source_of_electricity_production), + Q(nuclear_in_source_of_electricity_production), + Q(biomass_products_in_source_of_electricity_production), + Q(gas_in_source_of_electricity_production), + Q(hydrogen_in_source_of_electricity_production) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql b/gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql new file mode 100644 index 0000000000..e6b6c943a6 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(geothermal_for_central_heat_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql b/gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql new file mode 100644 index 0000000000..fdf7afa45b --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(hydrogen_for_electricity_conversion), + Q(hydrogen_for_central_heat_conversion), + Q(hydrogen_for_synthetic_kerosene_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql b/gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql new file mode 100644 index 0000000000..d2ac0daead --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(p2g_to_hydrogen_prod_in_sankey), + Q(direct_electrolysis_wind_in_source_of_hydrogen_production), + Q(direct_electrolysis_solar_in_source_of_hydrogen_production), + Q(steam_methane_reformer_in_source_of_hydrogen_production), + Q(steam_methane_reformer_ccs_in_source_of_hydrogen_production), + Q(autothermal_reformer_in_source_of_hydrogen_production), + Q(autothermal_reformer_ccs_in_source_of_hydrogen_production), + Q(ammonia_reformer_in_source_of_hydrogen_production), + Q(lohc_reformer_in_source_of_hydrogen_production), + Q(liquid_hydrogen_regasifier_in_source_of_hydrogen_production), + Q(biomass_gasification_in_source_of_hydrogen_production), + Q(biomass_gasification_ccs_in_source_of_hydrogen_production), + Q(conversion_industry_residual_hydrogen) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql b/gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql new file mode 100644 index 0000000000..d997fcaa04 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(conversion_from_imported_liquid_hydrogen_to_hydrogen) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql b/gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql new file mode 100644 index 0000000000..0e3d776ca0 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(conversion_from_imported_lohc_to_hydrogen) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_loss_input.gql b/gqueries/config/sankey/turk_sankey_conversion_loss_input.gql new file mode 100644 index 0000000000..894ccf5983 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_loss_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(conversion_loss_steam_hot_water_to_steam_hot_water) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_loss_output.gql b/gqueries/config/sankey/turk_sankey_conversion_loss_output.gql new file mode 100644 index 0000000000..94354a5155 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_loss_output.gql @@ -0,0 +1,34 @@ +- query = + SUM( + Q(conversion_loss_electricity_to_hydrogen), + Q(conversion_loss_electricity_to_steam_hot_water), + Q(conversion_loss_electricity_to_oil_and_derivatives), + Q(conversion_loss_electricity_to_natural_gas_and_derivatives), + Q(conversion_loss_electricity_to_biomass_products), + Q(conversion_loss_electricity_to_electricity), + Q(conversion_loss_hydrogen_to_electricity), + Q(conversion_loss_hydrogen_to_steam_hot_water), + Q(conversion_loss_hydrogen_to_oil_and_derivatives), + Q(conversion_loss_hydrogen_to_hydrogen), + Q(conversion_loss_uranium_to_electricity), + Q(conversion_loss_coal_and_derivatives_to_electricity), + Q(conversion_loss_coal_and_derivatives_to_steam_hot_water), + Q(conversion_loss_coal_and_derivatives_to_coal_and_derivatives), + Q(conversion_loss_oil_and_derivatives_to_electricity), + Q(conversion_loss_oil_and_derivatives_to_steam_hot_water), + Q(conversion_loss_oil_and_derivatives_to_oil_and_derivatives), + Q(conversion_loss_natural_gas_and_derivatives_to_electricity), + Q(conversion_loss_natural_gas_and_derivatives_to_steam_hot_water), + Q(conversion_loss_natural_gas_and_derivatives_to_hydrogen), + Q(conversion_loss_natural_gas_and_derivatives_to_biomass_products), + Q(conversion_loss_natural_gas_and_derivatives_to_natural_gas_and_derivatives), + Q(conversion_loss_biomass_products_to_electricity), + Q(conversion_loss_biomass_products_to_steam_hot_water), + Q(conversion_loss_biomass_products_to_hydrogen), + Q(conversion_loss_biomass_products_to_natural_gas_and_derivatives), + Q(conversion_loss_biomass_products_to_biomass_products), + Q(conversion_loss_ammonia_to_hydrogen), + Q(conversion_loss_lohc_to_hydrogen), + Q(conversion_loss_liquid_hydrogen_to_hydrogen) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql b/gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql new file mode 100644 index 0000000000..fe106d3a84 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql @@ -0,0 +1,12 @@ +- query = + SUM( + Q(gas_for_electricity_conversion), + Q(natural_gas_to_central_heat_prod_in_sankey), + Q(natural_gas_for_steam_methane_reformer_conversion), + Q(natural_gas_for_steam_methane_reformer_ccs_conversion), + Q(natural_gas_for_autothermal_reformer_conversion), + Q(natural_gas_for_autothermal_reformer_ccs_conversion), + Q(natural_gas_for_biomass_gasification_conversion), + Q(natural_gas_for_biomass_gasification_ccs_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql b/gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql new file mode 100644 index 0000000000..75ea82e967 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(conversion_industry_residual_natural_gas) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_oil_input.gql b/gqueries/config/sankey/turk_sankey_conversion_oil_input.gql new file mode 100644 index 0000000000..a65d42edf1 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_oil_input.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(oil_for_electricity_conversion), + Q(oil_and_derivatives_to_central_heat_prod_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_oil_output.gql b/gqueries/config/sankey/turk_sankey_conversion_oil_output.gql new file mode 100644 index 0000000000..a00bdf83de --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_oil_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(kerosene_synthetic_to_distribution_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql b/gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql new file mode 100644 index 0000000000..dc0cddfb1e --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(solar_for_central_heat_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql b/gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql new file mode 100644 index 0000000000..8613d3a9b5 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql @@ -0,0 +1,16 @@ +- query = + SUM( + Q(p2h_central_heat_to_central_heat_in_sankey), + Q(chp_in_source_of_central_heat_production), + Q(electricity_excl_p2h_in_source_of_central_heat_production), + Q(hydrogen_in_source_of_central_heat_production), + Q(coal_and_derivatives_in_source_of_central_heat_production), + Q(oil_and_derivatives_in_source_of_central_heat_production), + Q(natural_gas_in_source_of_central_heat_production), + Q(biomass_products_in_source_of_central_heat_production), + Q(solar_thermal_in_source_of_central_heat_production), + Q(geothermal_in_source_of_central_heat_production), + Q(ambient_heat_excl_p2h_in_source_of_central_heat_production), + Q(residual_heat_for_central_heat_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql b/gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql new file mode 100644 index 0000000000..7463e9406e --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(uranium_for_electricity_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql new file mode 100644 index 0000000000..e81bb4862a --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_ammonia_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_ammonia_in_households_other_energetic), + Q(sankey_final_demand_of_ammonia_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_ammonia_in_buildings_other_energetic), + Q(imported_ammonia_to_agriculture_in_sankey), + Q(sankey_final_demand_of_ammonia_in_industry_other_energetic), + Q(sankey_final_demand_of_ammonia_in_industry_ict_energetic), + Q(imported_ammonia_to_transport_in_sankey), + Q(imported_ammonia_to_bunkers_in_sankey), + Q(imported_ammonia_to_export_in_sankey), + Q(imported_ammonia_to_other_in_sankey), + Q(imported_ammonia_to_energy_in_sankey), + Q(imported_ammonia_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql new file mode 100644 index 0000000000..236b3ba747 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_biomass_products_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_biomass_products_in_households_other_energetic), + Q(sankey_final_demand_of_biomass_products_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_biomass_products_in_buildings_other_energetic), + Q(biomass_products_to_agriculture_in_sankey), + Q(sankey_final_demand_of_biomass_products_in_industry_other_energetic), + Q(sankey_final_demand_of_biomass_products_in_industry_ict_energetic), + Q(biomass_products_to_transport_in_sankey), + Q(biomass_products_to_bunkers_in_sankey), + Q(biomass_products_to_export_in_sankey), + Q(biomass_products_to_other_in_sankey), + Q(biomass_products_to_energy_in_sankey), + Q(biomass_products_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql new file mode 100644 index 0000000000..cd73de113b --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_coal_and_derivatives_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_coal_and_derivatives_in_households_other_energetic), + Q(sankey_final_demand_of_coal_and_derivatives_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_coal_and_derivatives_in_buildings_other_energetic), + Q(coal_and_derivatives_to_agriculture_in_sankey), + Q(sankey_final_demand_of_coal_and_derivatives_in_industry_other_energetic), + Q(sankey_final_demand_of_coal_and_derivatives_in_industry_ict_energetic), + Q(coal_and_derivatives_to_transport_in_sankey), + Q(coal_and_derivatives_to_bunkers_in_sankey), + Q(coal_and_derivatives_to_export_in_sankey), + Q(coal_and_derivatives_to_other_in_sankey), + Q(coal_and_derivatives_to_energy_in_sankey), + Q(coal_and_derivatives_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql new file mode 100644 index 0000000000..8c3cce1a05 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql @@ -0,0 +1,18 @@ +- query = + SUM( + Q(sankey_final_demand_of_electricity_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_electricity_in_households_other_energetic), + Q(sankey_final_demand_of_electricity_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_electricity_in_buildings_other_energetic), + Q(electricity_prod_to_agriculture_in_sankey), + Q(sankey_final_demand_of_electricity_in_industry_other_excl_p2h_energetic), + Q(sankey_final_demand_of_electricity_in_industry_ict_energetic), + Q(sankey_final_demand_of_electricity_in_industry_p2h_energetic), + Q(electricity_prod_to_transport_in_sankey), + Q(electricity_prod_to_bunkers_in_sankey), + Q(electricity_prod_to_export_in_sankey), + Q(electricity_prod_to_other_in_sankey), + Q(electricity_prod_to_energy_in_sankey), + Q(electricity_prod_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql new file mode 100644 index 0000000000..a23952c2db --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql @@ -0,0 +1,16 @@ +- query = + SUM( + Q(sankey_final_demand_of_geothermal_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_geothermal_in_households_other_energetic), + Q(sankey_final_demand_of_geothermal_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_geothermal_in_buildings_other_energetic), + Q(final_demand_of_geothermal_in_agriculture_energetic), + Q(sankey_final_demand_of_geothermal_in_industry_other_energetic), + Q(sankey_final_demand_of_geothermal_in_industry_ict_energetic), + Q(final_demand_of_geothermal_in_transport_energetic), + Q(final_demand_of_geothermal_in_bunkers_energetic), + Q(final_demand_of_geothermal_in_other_energetic), + Q(final_demand_of_geothermal_in_energy_energetic), + Q(final_demand_of_geothermal_non_energetic) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql new file mode 100644 index 0000000000..b40d4c4439 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_hydrogen_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_hydrogen_in_households_other_energetic), + Q(sankey_final_demand_of_hydrogen_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_hydrogen_in_buildings_other_energetic), + Q(hydrogen_prod_to_agriculture_in_sankey), + Q(sankey_final_demand_of_hydrogen_in_industry_other_energetic), + Q(sankey_final_demand_of_hydrogen_in_industry_ict_energetic), + Q(hydrogen_prod_to_transport_in_sankey), + Q(hydrogen_prod_to_bunkers_in_sankey), + Q(hydrogen_prod_to_export_in_sankey), + Q(hydrogen_prod_to_other_in_sankey), + Q(hydrogen_prod_to_energy_in_sankey), + Q(hydrogen_prod_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql new file mode 100644 index 0000000000..07e5db686e --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(imported_liquid_hydrogen_to_export_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql new file mode 100644 index 0000000000..60eda74190 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(imported_lohc_to_export_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql new file mode 100644 index 0000000000..1787d0937a --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_natural_gas_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_natural_gas_in_households_other_energetic), + Q(sankey_final_demand_of_natural_gas_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_natural_gas_in_buildings_other_energetic), + Q(natural_gas_to_agriculture_in_sankey), + Q(sankey_final_demand_of_natural_gas_in_industry_other_energetic), + Q(sankey_final_demand_of_natural_gas_in_industry_ict_energetic), + Q(natural_gas_to_transport_in_sankey), + Q(natural_gas_to_bunkers_in_sankey), + Q(natural_gas_to_export_in_sankey), + Q(natural_gas_to_other_in_sankey), + Q(natural_gas_to_energy_in_sankey), + Q(natural_gas_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql new file mode 100644 index 0000000000..93465d513a --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql @@ -0,0 +1,17 @@ +- query = + SUM( + Q(sankey_final_demand_of_oil_and_derivatives_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_oil_and_derivatives_in_households_other_energetic), + Q(sankey_final_demand_of_oil_and_derivatives_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_oil_and_derivatives_in_buildings_other_energetic), + Q(oil_and_derivatives_to_agriculture_in_sankey), + Q(sankey_final_demand_of_oil_and_derivatives_in_industry_other_energetic), + Q(sankey_final_demand_of_oil_and_derivatives_in_industry_ict_energetic), + Q(oil_and_derivatives_to_transport_in_sankey), + Q(oil_and_derivatives_to_bunkers_in_sankey), + Q(oil_and_derivatives_to_export_in_sankey), + Q(oil_and_derivatives_to_other_in_sankey), + Q(oil_and_derivatives_to_energy_in_sankey), + Q(oil_and_derivatives_to_feedstock_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql new file mode 100644 index 0000000000..dc4cc8777e --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql @@ -0,0 +1,16 @@ +- query = + SUM( + Q(sankey_final_demand_of_solar_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_solar_in_households_other_energetic), + Q(sankey_final_demand_of_solar_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_solar_in_buildings_other_energetic), + Q(final_demand_of_solar_in_agriculture_energetic), + Q(sankey_final_demand_of_solar_in_industry_other_energetic), + Q(sankey_final_demand_of_solar_in_industry_ict_energetic), + Q(final_demand_of_solar_in_transport_energetic), + Q(final_demand_of_solar_in_bunkers_energetic), + Q(final_demand_of_solar_in_other_energetic), + Q(final_demand_of_solar_in_energy_energetic), + Q(final_demand_of_solar_non_energetic) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql b/gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql new file mode 100644 index 0000000000..d1a5af0eaa --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql @@ -0,0 +1,16 @@ +- query = + SUM( + Q(sankey_final_demand_of_heat_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_heat_in_households_other_energetic), + Q(sankey_final_demand_of_heat_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_heat_in_buildings_other_energetic), + Q(final_demand_of_heat_in_agriculture_energetic), + Q(sankey_final_demand_of_heat_in_industry_other_energetic), + Q(sankey_final_demand_of_heat_in_industry_ict_energetic), + Q(final_demand_of_heat_in_transport_energetic), + Q(final_demand_of_heat_in_bunkers_energetic), + Q(final_demand_of_heat_in_other_energetic), + Q(final_demand_of_heat_in_energy_energetic), + Q(final_demand_of_heat_non_energetic) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql new file mode 100644 index 0000000000..809c04739a --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql @@ -0,0 +1,3 @@ +- query = + Q(conversion_loss_steam_hot_water_to_steam_hot_water) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql new file mode 100644 index 0000000000..809c04739a --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql @@ -0,0 +1,3 @@ +- query = + Q(conversion_loss_steam_hot_water_to_steam_hot_water) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql new file mode 100644 index 0000000000..a289097d81 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(import_of_ammonia) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql new file mode 100644 index 0000000000..5a0b95b8f2 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql @@ -0,0 +1,15 @@ +- query = + SUM( + Q(total_primary_demand_of_wood_pellets), + Q(total_primary_demand_of_torrefied_biomass_pellets), + Q(total_primary_demand_of_biogas), + Q(total_primary_demand_of_biodiesel), + Q(total_primary_demand_of_bio_ethanol), + Q(total_primary_demand_of_bio_kerosene), + Q(total_primary_demand_of_bio_lng), + Q(total_primary_demand_of_bio_oil), + Q(total_primary_demand_of_greengas), + Q(total_primary_demand_of_biogenic_waste), + Q(total_primary_demand_of_non_biogenic_waste) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql new file mode 100644 index 0000000000..e21630ce14 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(import_of_coal_and_derivatives), + Q(extraction_of_coal_and_derivatives) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql new file mode 100644 index 0000000000..a0461d3e24 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql @@ -0,0 +1,11 @@ +- query = + SUM( + Q(total_primary_demand_of_solar_electricity), + Q(total_primary_demand_of_wind_offshore_electricity), + Q(total_primary_demand_of_wind_inland_electricity), + Q(total_primary_demand_of_wind_coastal_electricity), + Q(imported_electricity_to_electricity_prod_in_sankey), + Q(water_to_electricity_prod_in_sankey), + Q(geothermal_in_source_of_electricity_production) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql new file mode 100644 index 0000000000..3e6587f6ed --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(sankey_total_primary_demand_of_geothermal) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql new file mode 100644 index 0000000000..d4e86ef394 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(hydrogen_import_to_hydrogen_prod_in_sankey) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql new file mode 100644 index 0000000000..a9f3b379c7 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(import_of_liquid_hydrogen) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql new file mode 100644 index 0000000000..b9a834c835 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(import_of_lohc) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql new file mode 100644 index 0000000000..4d6811252e --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(import_of_natural_gas_and_derivatives), + Q(extraction_of_natural_gas) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql new file mode 100644 index 0000000000..4b89eddbb4 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(import_of_oil_and_derivatives), + Q(extraction_of_oil_and_derivatives) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql new file mode 100644 index 0000000000..e6d0e637b1 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(total_primary_demand_of_renewable_heat) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql new file mode 100644 index 0000000000..81080ad726 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql @@ -0,0 +1,5 @@ +- query = + SUM( + Q(import_for_central_heat_conversion) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql b/gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql new file mode 100644 index 0000000000..c35e7c0da2 --- /dev/null +++ b/gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(import_of_uranium), + Q(extraction_of_uranium) + ) +- unit = PJ \ No newline at end of file From 9394438593f27ca65794447ef7ed703f34e96d3d Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Wed, 15 May 2024 17:31:35 +0200 Subject: [PATCH 2/7] Improving green and natural gas flows in energy flow overview sankey --- .../sankey_0_to_2_biomass_products_to_agriculture.gql | 3 ++- .../sankey_0_to_2_biomass_products_to_buildings.gql | 6 +++++- .../sankey_0_to_2_biomass_products_to_bunkers.gql | 6 ++++-- .../sankey_0_to_2_biomass_products_to_energy.gql | 3 ++- .../sankey_0_to_2_biomass_products_to_feedstock.gql | 2 +- .../sankey_0_to_2_biomass_products_to_households.gql | 7 ++++++- .../sankey_0_to_2_biomass_products_to_industry.gql | 6 +++++- .../sankey_0_to_2_biomass_products_to_other.gql | 2 +- .../sankey_0_to_2_biomass_products_to_transport.gql | 2 +- .../sankey_0_to_2_natural_gas_to_agriculture.gql | 2 +- .../sankey_0_to_2_natural_gas_to_buildings.gql | 8 +++++++- .../sankey_0_to_2_natural_gas_to_bunkers.gql | 2 +- .../sankey_0_to_2_natural_gas_to_energy.gql | 2 +- .../sankey_0_to_2_natural_gas_to_feedstock.gql | 2 +- .../sankey_0_to_2_natural_gas_to_households.gql | 6 +++++- .../sankey_0_to_2_natural_gas_to_industry.gql | 6 +++++- .../sankey_0_to_2_natural_gas_to_other.gql | 2 +- 17 files changed, 49 insertions(+), 18 deletions(-) diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql index 56878dcf0f..cba637d88e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql @@ -1,2 +1,3 @@ -- query = Q(final_demand_of_biomass_products_in_agriculture_energetic) + - unit = PJ +- query = Q(biomass_products_to_agriculture_in_sankey) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql index 4dbd186930..81598747ef 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql @@ -1,2 +1,6 @@ -- query = Q(final_demand_of_biomass_products_in_buildings_energetic) +- query = + SUM( + Q(sankey_final_demand_of_biomass_products_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_biomass_products_in_buildings_other_energetic) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql index e2018c758c..9aaceaca5e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql @@ -1,2 +1,4 @@ -- query = Q(final_demand_of_biomass_products_in_bunkers_energetic) -- unit = PJ + +- query = + Q(biomass_products_to_bunkers_in_sankey) +- unit = PJ \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql index c9c41de394..0c92abad44 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql @@ -1,2 +1,3 @@ -- query = Q(final_demand_of_biomass_products_in_energy_energetic) - unit = PJ +- query = Q(biomass_products_to_energy_in_sankey) + diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql index d3d12801cd..6df7e42e9e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_biomass_products_non_energetic) +- query = Q(biomass_products_to_feedstock_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql index bed415e19c..1c73c75030 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql @@ -1,2 +1,7 @@ -- query = Q(final_demand_of_biomass_products_in_households_energetic) + - unit = PJ +- query = + SUM( + Q(sankey_final_demand_of_biomass_products_in_households_space_heating_and_hot_water_energetic), + Q(sankey_final_demand_of_biomass_products_in_households_other_energetic) + ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql index 658a3f88af..617ae297de 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql @@ -1,2 +1,6 @@ -- query = Q(final_demand_of_biomass_products_in_industry_energetic) - unit = PJ +- query = + SUM( + Q(sankey_final_demand_of_biomass_products_in_industry_ict_energetic), + Q(sankey_final_demand_of_biomass_products_in_industry_other_energetic) + ) diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql index aa7fad40f7..a6e3ee118c 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_biomass_products_in_other_energetic) +- query = Q(biomass_products_to_other_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql index 6b8a01037e..f35399cb94 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_biomass_products_in_transport_energetic) - unit = PJ +- query = Q(biomass_products_to_transport_in_sankey) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql index 98666143a0..d149bdf476 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic) +- query = Q(natural_gas_to_agriculture_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql index b2deb46403..a6daef04ac 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql @@ -1,2 +1,8 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_buildings_energetic) + +- query = + SUM( + Q(sankey_final_demand_of_natural_gas_in_buildings_space_heating_energetic), + Q(sankey_final_demand_of_natural_gas_in_buildings_other_energetic) + ) - unit = PJ + diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql index 3955e097ca..bee8331904 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic) +- query = Q(natural_gas_to_bunkers_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql index 276bb4ae29..77f5d9615e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_energy_energetic) +- query = Q(natural_gas_to_energy_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql index cdfb2d07f1..b504b3de23 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_non_energetic) +- query = Q(natural_gas_to_feedstock_in_sankey) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql index 7fd727492a..621cbef46e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql @@ -1,2 +1,6 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_households_energetic) +- query = + SUM( + Q(sankey_final_demand_of_natural_gas_in_households_other_energetic), + Q(sankey_final_demand_of_natural_gas_in_households_space_heating_and_hot_water_energetic) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql index 63e2776e97..352df6cb91 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql @@ -1,2 +1,6 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_industry_energetic) +- query = + SUM( + Q(sankey_final_demand_of_natural_gas_in_industry_other_energetic), + Q(sankey_final_demand_of_natural_gas_in_industry_ict_energetic) + ) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql index 501eeb0087..a1d6a42ddb 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql @@ -1,2 +1,2 @@ -- query = Q(final_demand_of_natural_gas_and_derivatives_in_other_energetic) +- query = Q(natural_gas_to_other_in_sankey) - unit = PJ From 0b2bd0b804ba96c99f68b95c6799830cf9804dd4 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Wed, 15 May 2024 17:35:25 +0200 Subject: [PATCH 3/7] Revert " Improving green and natural gas flows in energy flow overview sankey" This reverts commit 9394438593f27ca65794447ef7ed703f34e96d3d. --- .../sankey_0_to_2_biomass_products_to_agriculture.gql | 3 +-- .../sankey_0_to_2_biomass_products_to_buildings.gql | 6 +----- .../sankey_0_to_2_biomass_products_to_bunkers.gql | 6 ++---- .../sankey_0_to_2_biomass_products_to_energy.gql | 3 +-- .../sankey_0_to_2_biomass_products_to_feedstock.gql | 2 +- .../sankey_0_to_2_biomass_products_to_households.gql | 7 +------ .../sankey_0_to_2_biomass_products_to_industry.gql | 6 +----- .../sankey_0_to_2_biomass_products_to_other.gql | 2 +- .../sankey_0_to_2_biomass_products_to_transport.gql | 2 +- .../sankey_0_to_2_natural_gas_to_agriculture.gql | 2 +- .../sankey_0_to_2_natural_gas_to_buildings.gql | 8 +------- .../sankey_0_to_2_natural_gas_to_bunkers.gql | 2 +- .../sankey_0_to_2_natural_gas_to_energy.gql | 2 +- .../sankey_0_to_2_natural_gas_to_feedstock.gql | 2 +- .../sankey_0_to_2_natural_gas_to_households.gql | 6 +----- .../sankey_0_to_2_natural_gas_to_industry.gql | 6 +----- .../sankey_0_to_2_natural_gas_to_other.gql | 2 +- 17 files changed, 18 insertions(+), 49 deletions(-) diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql index cba637d88e..56878dcf0f 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_agriculture.gql @@ -1,3 +1,2 @@ - +- query = Q(final_demand_of_biomass_products_in_agriculture_energetic) - unit = PJ -- query = Q(biomass_products_to_agriculture_in_sankey) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql index 81598747ef..4dbd186930 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_buildings.gql @@ -1,6 +1,2 @@ -- query = - SUM( - Q(sankey_final_demand_of_biomass_products_in_buildings_space_heating_energetic), - Q(sankey_final_demand_of_biomass_products_in_buildings_other_energetic) - ) +- query = Q(final_demand_of_biomass_products_in_buildings_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql index 9aaceaca5e..e2018c758c 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_bunkers.gql @@ -1,4 +1,2 @@ - -- query = - Q(biomass_products_to_bunkers_in_sankey) -- unit = PJ \ No newline at end of file +- query = Q(final_demand_of_biomass_products_in_bunkers_energetic) +- unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql index 0c92abad44..c9c41de394 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_energy.gql @@ -1,3 +1,2 @@ +- query = Q(final_demand_of_biomass_products_in_energy_energetic) - unit = PJ -- query = Q(biomass_products_to_energy_in_sankey) - diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql index 6df7e42e9e..d3d12801cd 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_feedstock.gql @@ -1,2 +1,2 @@ -- query = Q(biomass_products_to_feedstock_in_sankey) +- query = Q(final_demand_of_biomass_products_non_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql index 1c73c75030..bed415e19c 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_households.gql @@ -1,7 +1,2 @@ - +- query = Q(final_demand_of_biomass_products_in_households_energetic) - unit = PJ -- query = - SUM( - Q(sankey_final_demand_of_biomass_products_in_households_space_heating_and_hot_water_energetic), - Q(sankey_final_demand_of_biomass_products_in_households_other_energetic) - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql index 617ae297de..658a3f88af 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_industry.gql @@ -1,6 +1,2 @@ +- query = Q(final_demand_of_biomass_products_in_industry_energetic) - unit = PJ -- query = - SUM( - Q(sankey_final_demand_of_biomass_products_in_industry_ict_energetic), - Q(sankey_final_demand_of_biomass_products_in_industry_other_energetic) - ) diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql index a6e3ee118c..aa7fad40f7 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_other.gql @@ -1,2 +1,2 @@ -- query = Q(biomass_products_to_other_in_sankey) +- query = Q(final_demand_of_biomass_products_in_other_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql index f35399cb94..6b8a01037e 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_biomass_products_to_transport.gql @@ -1,2 +1,2 @@ +- query = Q(final_demand_of_biomass_products_in_transport_energetic) - unit = PJ -- query = Q(biomass_products_to_transport_in_sankey) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql index d149bdf476..98666143a0 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_agriculture.gql @@ -1,2 +1,2 @@ -- query = Q(natural_gas_to_agriculture_in_sankey) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_agriculture_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql index a6daef04ac..b2deb46403 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_buildings.gql @@ -1,8 +1,2 @@ - -- query = - SUM( - Q(sankey_final_demand_of_natural_gas_in_buildings_space_heating_energetic), - Q(sankey_final_demand_of_natural_gas_in_buildings_other_energetic) - ) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_buildings_energetic) - unit = PJ - diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql index bee8331904..3955e097ca 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_bunkers.gql @@ -1,2 +1,2 @@ -- query = Q(natural_gas_to_bunkers_in_sankey) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_bunkers_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql index 77f5d9615e..276bb4ae29 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_energy.gql @@ -1,2 +1,2 @@ -- query = Q(natural_gas_to_energy_in_sankey) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_energy_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql index b504b3de23..cdfb2d07f1 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_feedstock.gql @@ -1,2 +1,2 @@ -- query = Q(natural_gas_to_feedstock_in_sankey) +- query = Q(final_demand_of_natural_gas_and_derivatives_non_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql index 621cbef46e..7fd727492a 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_households.gql @@ -1,6 +1,2 @@ -- query = - SUM( - Q(sankey_final_demand_of_natural_gas_in_households_other_energetic), - Q(sankey_final_demand_of_natural_gas_in_households_space_heating_and_hot_water_energetic) - ) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_households_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql index 352df6cb91..63e2776e97 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_industry.gql @@ -1,6 +1,2 @@ -- query = - SUM( - Q(sankey_final_demand_of_natural_gas_in_industry_other_energetic), - Q(sankey_final_demand_of_natural_gas_in_industry_ict_energetic) - ) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_industry_energetic) - unit = PJ diff --git a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql index a1d6a42ddb..501eeb0087 100644 --- a/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql +++ b/gqueries/output_elements/output_series/sankey_energy_overview/sankey_0_to_2_natural_gas_to_other.gql @@ -1,2 +1,2 @@ -- query = Q(natural_gas_to_other_in_sankey) +- query = Q(final_demand_of_natural_gas_and_derivatives_in_other_energetic) - unit = PJ From 8fb5d48cbb728fd2d66ee8ea0a5c9098e19bdf9f Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Wed, 22 May 2024 14:20:53 +0200 Subject: [PATCH 4/7] Adding balancing queries voor oil en biomass + changing efficiency of backup burner --- gqueries/config/sankey/tests/turk_sankey_biomass.gql | 10 ++++++++++ gqueries/config/sankey/tests/turk_sankey_oil.gql | 10 ++++++++++ .../energy/energy_heat_backup_burner_mt_network_gas.ad | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gqueries/config/sankey/tests/turk_sankey_biomass.gql create mode 100644 gqueries/config/sankey/tests/turk_sankey_oil.gql diff --git a/gqueries/config/sankey/tests/turk_sankey_biomass.gql b/gqueries/config/sankey/tests/turk_sankey_biomass.gql new file mode 100644 index 0000000000..0e2ac5d52f --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_biomass.gql @@ -0,0 +1,10 @@ +- query = + SUM( + NEG(Q(turk_sankey_conversion_biomass_input)), + Q(turk_sankey_conversion_biomass_output), + NEG(Q(turk_sankey_final_demand_biomass_input)), + Q(turk_sankey_primary_demand_biomass_output), + NEG(Q(conversion_loss_biomass_products_to_biomass_products)) + ) +- unit = PJ + diff --git a/gqueries/config/sankey/tests/turk_sankey_oil.gql b/gqueries/config/sankey/tests/turk_sankey_oil.gql new file mode 100644 index 0000000000..955a2516e0 --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_oil.gql @@ -0,0 +1,10 @@ +- query = + SUM( + NEG(Q(turk_sankey_conversion_oil_input)), + Q(turk_sankey_conversion_oil_output), + NEG(Q(turk_sankey_final_demand_oil_input)), + Q(turk_sankey_primary_demand_oil_output), + NEG(Q(conversion_loss_oil_and_derivatives_to_oil_and_derivatives)) + ) +- unit = PJ + diff --git a/graphs/energy/nodes/energy/energy_heat_backup_burner_mt_network_gas.ad b/graphs/energy/nodes/energy/energy_heat_backup_burner_mt_network_gas.ad index cb9f415a3d..d3712b0a54 100644 --- a/graphs/energy/nodes/energy/energy_heat_backup_burner_mt_network_gas.ad +++ b/graphs/energy/nodes/energy/energy_heat_backup_burner_mt_network_gas.ad @@ -1,5 +1,5 @@ - output.loss = elastic -- output.steam_hot_water = 1.03 +- output.steam_hot_water = 1.0 - groups = [heat_production, central_production, wacc_proven_tech, costs_production_heat_plants, sankey_conversion_group] - use = energetic - presentation_group = traditional_heat From a024efae6aae312e728301c8cd81da2bf5156c04 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Tue, 28 May 2024 14:59:35 +0200 Subject: [PATCH 5/7] Adding query voor natural gas --- gqueries/config/sankey/tests/turk_sankey_natural_gas.gql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 gqueries/config/sankey/tests/turk_sankey_natural_gas.gql diff --git a/gqueries/config/sankey/tests/turk_sankey_natural_gas.gql b/gqueries/config/sankey/tests/turk_sankey_natural_gas.gql new file mode 100644 index 0000000000..24cc7bce27 --- /dev/null +++ b/gqueries/config/sankey/tests/turk_sankey_natural_gas.gql @@ -0,0 +1,9 @@ +- query = + SUM( + NEG(Q(turk_sankey_conversion_natural_gas_input)), + Q(turk_sankey_conversion_natural_gas_output), + NEG(Q(turk_sankey_final_demand_natural_gas_input)), + Q(turk_sankey_primary_demand_natural_gas_output), + NEG(Q(conversion_loss_natural_gas_to_natural_gas)) + ) +- unit = PJ \ No newline at end of file From 951932a5ca0847ead92c153fcace4d3c8a19386b Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Tue, 28 May 2024 16:35:34 +0200 Subject: [PATCH 6/7] Putting mt-queries in better place --- .../tests/turk_sankey_steam_hot_water.gql | 8 --- ...team_hot_water_to_steam_hot_water copy.gql | 3 -- ...oss_steam_hot_water_to_steam_hot_water.gql | 3 -- .../download}/tests/turk_sankey_biomass.gql | 4 +- .../tests/turk_sankey_electricity.gql | 4 +- .../download}/tests/turk_sankey_hydrogen.gql | 2 + .../tests/turk_sankey_natural_gas.gql | 2 + .../download}/tests/turk_sankey_oil.gql | 2 + .../tests/turk_sankey_steam_hot_water.gql | 10 ++++ .../turk_sankey_conversion_ammonia_input.gql | 2 +- .../turk_sankey_conversion_biomass_input.gql | 2 +- .../turk_sankey_conversion_biomass_output.gql | 2 +- .../turk_sankey_conversion_coal_input.gql | 2 +- ...rk_sankey_conversion_electricity_input.gql | 2 +- ...k_sankey_conversion_electricity_output.gql | 2 +- ...urk_sankey_conversion_geothermal_input.gql | 2 +- .../turk_sankey_conversion_hydrogen_input.gql | 2 +- ...turk_sankey_conversion_hydrogen_output.gql | 2 +- ...ankey_conversion_liquid_hydrogen_input.gql | 2 +- .../turk_sankey_conversion_lohc_input.gql | 2 +- .../turk_sankey_conversion_loss_input.gql | 2 +- .../turk_sankey_conversion_loss_output.gql | 2 +- ...rk_sankey_conversion_natural_gas_input.gql | 2 +- ...k_sankey_conversion_natural_gas_output.gql | 2 +- .../turk_sankey_conversion_oil_input.gql | 2 +- .../turk_sankey_conversion_oil_output.gql | 2 +- ..._sankey_conversion_solar_thermal_input.gql | 2 +- ...nkey_conversion_steam_hot_water_output.gql | 2 +- .../turk_sankey_conversion_uranium_input.gql | 2 +- ...turk_sankey_final_demand_ammonia_input.gql | 2 +- ...turk_sankey_final_demand_biomass_input.gql | 2 +- .../turk_sankey_final_demand_coal_input.gql | 2 +- ..._sankey_final_demand_electricity_input.gql | 2 +- ...k_sankey_final_demand_geothermal_input.gql | 2 +- ...urk_sankey_final_demand_hydrogen_input.gql | 2 +- ...key_final_demand_liquid_hydrogen_input.gql | 2 +- .../turk_sankey_final_demand_lohc_input.gql | 2 +- ..._sankey_final_demand_natural_gas_input.gql | 2 +- .../turk_sankey_final_demand_oil_input.gql | 2 +- ...ankey_final_demand_solar_thermal_input.gql | 2 +- ...key_final_demand_steam_hot_water_input.gql | 2 +- ...k_sankey_primary_demand_ammonia_output.gql | 2 +- ...k_sankey_primary_demand_biomass_output.gql | 2 +- ...turk_sankey_primary_demand_coal_output.gql | 2 +- ...nkey_primary_demand_electricity_output.gql | 2 +- ...ankey_primary_demand_geothermal_output.gql | 2 +- ..._sankey_primary_demand_hydrogen_output.gql | 2 +- ..._primary_demand_liquid_hydrogen_output.gql | 2 +- ...turk_sankey_primary_demand_lohc_output.gql | 2 +- ...nkey_primary_demand_natural_gas_output.gql | 2 +- .../turk_sankey_primary_demand_oil_output.gql | 2 +- ...ey_primary_demand_solar_thermal_output.gql | 2 +- ..._primary_demand_steam_hot_water_output.gql | 2 +- ...k_sankey_primary_demand_uranium_output.gql | 2 +- tasks/mt_sankey_csv_query_writer.rb | 51 +++++++++++++++++++ 55 files changed, 118 insertions(+), 61 deletions(-) delete mode 100644 gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql delete mode 100644 gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql delete mode 100644 gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql rename gqueries/{config/sankey => mechnical_turk/sankey/download}/tests/turk_sankey_biomass.gql (65%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/tests/turk_sankey_electricity.gql (54%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/tests/turk_sankey_hydrogen.gql (65%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/tests/turk_sankey_natural_gas.gql (66%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/tests/turk_sankey_oil.gql (65%) create mode 100644 gqueries/mechnical_turk/sankey/download/tests/turk_sankey_steam_hot_water.gql rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_ammonia_input.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_biomass_input.gql (95%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_biomass_output.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_coal_input.gql (91%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_electricity_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_electricity_output.gql (96%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_geothermal_input.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_hydrogen_input.gql (93%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_hydrogen_output.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_liquid_hydrogen_input.gql (87%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_lohc_input.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_loss_input.gql (87%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_loss_output.gql (99%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_natural_gas_input.gql (97%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_natural_gas_output.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_oil_input.gql (91%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_oil_output.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_solar_thermal_input.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_steam_hot_water_output.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_conversion_uranium_input.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_ammonia_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_biomass_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_coal_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_electricity_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_geothermal_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_hydrogen_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_liquid_hydrogen_input.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_lohc_input.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_natural_gas_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_oil_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_solar_thermal_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_final_demand_steam_hot_water_input.gql (98%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_ammonia_output.gql (81%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_biomass_output.gql (97%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_coal_output.gql (90%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_electricity_output.gql (97%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_geothermal_output.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_hydrogen_output.gql (86%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_liquid_hydrogen_output.gql (83%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_lohc_output.gql (80%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_natural_gas_output.gql (90%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_oil_output.gql (90%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_solar_thermal_output.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_steam_hot_water_output.gql (85%) rename gqueries/{config/sankey => mechnical_turk/sankey/download}/turk_sankey_primary_demand_uranium_output.gql (87%) create mode 100644 tasks/mt_sankey_csv_query_writer.rb diff --git a/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql b/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql deleted file mode 100644 index a6c3a38a10..0000000000 --- a/gqueries/config/sankey/tests/turk_sankey_steam_hot_water.gql +++ /dev/null @@ -1,8 +0,0 @@ -- query = - SUM( - Q(turk_sankey_conversion_steam_hot_water_output), - NEG(Q(turk_sankey_final_demand_steam_hot_water_input)), - Q(turk_sankey_primary_demand_steam_hot_water_output), - NEG(Q(turk_sankey_loss_steam_hot_water_to_steam_hot_water)) - ) -- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql deleted file mode 100644 index 809c04739a..0000000000 --- a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water copy.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = - Q(conversion_loss_steam_hot_water_to_steam_hot_water) -- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql b/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql deleted file mode 100644 index 809c04739a..0000000000 --- a/gqueries/config/sankey/turk_sankey_loss_steam_hot_water_to_steam_hot_water.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = - Q(conversion_loss_steam_hot_water_to_steam_hot_water) -- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/tests/turk_sankey_biomass.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_biomass.gql similarity index 65% rename from gqueries/config/sankey/tests/turk_sankey_biomass.gql rename to gqueries/mechnical_turk/sankey/download/tests/turk_sankey_biomass.gql index 0e2ac5d52f..fb565ca4d5 100644 --- a/gqueries/config/sankey/tests/turk_sankey_biomass.gql +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_biomass.gql @@ -1,10 +1,12 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + - query = SUM( NEG(Q(turk_sankey_conversion_biomass_input)), Q(turk_sankey_conversion_biomass_output), NEG(Q(turk_sankey_final_demand_biomass_input)), Q(turk_sankey_primary_demand_biomass_output), - NEG(Q(conversion_loss_biomass_products_to_biomass_products)) + NEG(Q(conversion_loss_biomass_products_to_biomass_products)) ) - unit = PJ diff --git a/gqueries/config/sankey/tests/turk_sankey_electricity.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_electricity.gql similarity index 54% rename from gqueries/config/sankey/tests/turk_sankey_electricity.gql rename to gqueries/mechnical_turk/sankey/download/tests/turk_sankey_electricity.gql index 1b2e2f0cc3..a068bfd42c 100644 --- a/gqueries/config/sankey/tests/turk_sankey_electricity.gql +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_electricity.gql @@ -1,10 +1,12 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + - query = SUM( NEG(Q(turk_sankey_conversion_electricity_input)), Q(turk_sankey_conversion_electricity_output), NEG(Q(turk_sankey_final_demand_electricity_input)), Q(turk_sankey_primary_demand_electricity_output), - NEG(Q(conversion_loss_electricity_to_electricity)) + NEG(Q(conversion_loss_electricity_to_electricity)) ) - unit = PJ diff --git a/gqueries/config/sankey/tests/turk_sankey_hydrogen.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_hydrogen.gql similarity index 65% rename from gqueries/config/sankey/tests/turk_sankey_hydrogen.gql rename to gqueries/mechnical_turk/sankey/download/tests/turk_sankey_hydrogen.gql index 98bb07c56f..ba38e5f479 100644 --- a/gqueries/config/sankey/tests/turk_sankey_hydrogen.gql +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_hydrogen.gql @@ -1,3 +1,5 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + - query = SUM( NEG(Q(turk_sankey_conversion_hydrogen_input)), diff --git a/gqueries/config/sankey/tests/turk_sankey_natural_gas.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_natural_gas.gql similarity index 66% rename from gqueries/config/sankey/tests/turk_sankey_natural_gas.gql rename to gqueries/mechnical_turk/sankey/download/tests/turk_sankey_natural_gas.gql index 24cc7bce27..802b6d8a26 100644 --- a/gqueries/config/sankey/tests/turk_sankey_natural_gas.gql +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_natural_gas.gql @@ -1,3 +1,5 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + - query = SUM( NEG(Q(turk_sankey_conversion_natural_gas_input)), diff --git a/gqueries/config/sankey/tests/turk_sankey_oil.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_oil.gql similarity index 65% rename from gqueries/config/sankey/tests/turk_sankey_oil.gql rename to gqueries/mechnical_turk/sankey/download/tests/turk_sankey_oil.gql index 955a2516e0..8caa53d417 100644 --- a/gqueries/config/sankey/tests/turk_sankey_oil.gql +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_oil.gql @@ -1,3 +1,5 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + - query = SUM( NEG(Q(turk_sankey_conversion_oil_input)), diff --git a/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_steam_hot_water.gql b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_steam_hot_water.gql new file mode 100644 index 0000000000..6a9ae870b8 --- /dev/null +++ b/gqueries/mechnical_turk/sankey/download/tests/turk_sankey_steam_hot_water.gql @@ -0,0 +1,10 @@ +# This query must be balanced and return 0. The loss query is not created by the script, the rest of the queries rely on queries that the rake task creates. + +- query = + SUM( + Q(turk_sankey_conversion_steam_hot_water_output), + NEG(Q(turk_sankey_final_demand_steam_hot_water_input)), + Q(turk_sankey_primary_demand_steam_hot_water_output), + NEG(Q(conversion_loss_steam_hot_water_to_steam_hot_water)) + ) +- unit = PJ \ No newline at end of file diff --git a/gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_ammonia_input.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_ammonia_input.gql index 4e1fe11802..69520e5809 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_ammonia_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_ammonia_input.gql @@ -2,4 +2,4 @@ SUM( Q(imported_ammonia_to_hydrogen_prod_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_input.gql similarity index 95% rename from gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_input.gql index 261bd3452c..eda7ab1de9 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_biomass_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_input.gql @@ -5,4 +5,4 @@ Q(biomass_products_for_electricity_conversion), Q(biomass_products_to_central_heat_prod_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_output.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_output.gql index 421e63c918..e38602d9d8 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_biomass_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_biomass_output.gql @@ -2,4 +2,4 @@ SUM( Q(conversion_industry_residual_greengas) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_coal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_coal_input.gql similarity index 91% rename from gqueries/config/sankey/turk_sankey_conversion_coal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_coal_input.gql index e65d331382..9329aa9c1f 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_coal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_coal_input.gql @@ -3,4 +3,4 @@ Q(coal_for_electricity_conversion), Q(coal_and_derivatives_to_central_heat_prod_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_input.gql index 9268f3bc6d..0f8f3e01fe 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_electricity_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_input.gql @@ -11,4 +11,4 @@ Q(electricity_prod_to_central_heat_prod_excl_p2h_in_sankey), Q(electricity_for_synthetic_kerosene_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_output.gql similarity index 96% rename from gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_output.gql index f8e1f52c49..fd72f95369 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_electricity_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_electricity_output.gql @@ -7,4 +7,4 @@ Q(gas_in_source_of_electricity_production), Q(hydrogen_in_source_of_electricity_production) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_geothermal_input.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_geothermal_input.gql index e6b6c943a6..ee818b4f31 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_geothermal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_geothermal_input.gql @@ -2,4 +2,4 @@ SUM( Q(geothermal_for_central_heat_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_input.gql similarity index 93% rename from gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_input.gql index fdf7afa45b..f0be8d0f17 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_input.gql @@ -4,4 +4,4 @@ Q(hydrogen_for_central_heat_conversion), Q(hydrogen_for_synthetic_kerosene_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_output.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_output.gql index d2ac0daead..b56d5fdeb1 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_hydrogen_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_hydrogen_output.gql @@ -14,4 +14,4 @@ Q(biomass_gasification_ccs_in_source_of_hydrogen_production), Q(conversion_industry_residual_hydrogen) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_liquid_hydrogen_input.gql similarity index 87% rename from gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_liquid_hydrogen_input.gql index d997fcaa04..06a65c5e9c 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_liquid_hydrogen_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_liquid_hydrogen_input.gql @@ -2,4 +2,4 @@ SUM( Q(conversion_from_imported_liquid_hydrogen_to_hydrogen) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_lohc_input.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_lohc_input.gql index 0e3d776ca0..320c761562 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_lohc_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_lohc_input.gql @@ -2,4 +2,4 @@ SUM( Q(conversion_from_imported_lohc_to_hydrogen) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_loss_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_input.gql similarity index 87% rename from gqueries/config/sankey/turk_sankey_conversion_loss_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_input.gql index 894ccf5983..eda9d3ebb2 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_loss_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_input.gql @@ -2,4 +2,4 @@ SUM( Q(conversion_loss_steam_hot_water_to_steam_hot_water) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_loss_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_output.gql similarity index 99% rename from gqueries/config/sankey/turk_sankey_conversion_loss_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_output.gql index 94354a5155..72936e63de 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_loss_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_loss_output.gql @@ -31,4 +31,4 @@ Q(conversion_loss_lohc_to_hydrogen), Q(conversion_loss_liquid_hydrogen_to_hydrogen) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_input.gql similarity index 97% rename from gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_input.gql index fe106d3a84..33fdf2ec37 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_input.gql @@ -9,4 +9,4 @@ Q(natural_gas_for_biomass_gasification_conversion), Q(natural_gas_for_biomass_gasification_ccs_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_output.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_output.gql index 75ea82e967..429c375248 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_natural_gas_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_natural_gas_output.gql @@ -2,4 +2,4 @@ SUM( Q(conversion_industry_residual_natural_gas) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_oil_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_input.gql similarity index 91% rename from gqueries/config/sankey/turk_sankey_conversion_oil_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_input.gql index a65d42edf1..f4ce2e0f45 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_oil_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_input.gql @@ -3,4 +3,4 @@ Q(oil_for_electricity_conversion), Q(oil_and_derivatives_to_central_heat_prod_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_oil_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_output.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_conversion_oil_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_output.gql index a00bdf83de..c5a0dfd24b 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_oil_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_oil_output.gql @@ -2,4 +2,4 @@ SUM( Q(kerosene_synthetic_to_distribution_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_solar_thermal_input.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_solar_thermal_input.gql index dc0cddfb1e..86bd665945 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_solar_thermal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_solar_thermal_input.gql @@ -2,4 +2,4 @@ SUM( Q(solar_for_central_heat_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_steam_hot_water_output.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_steam_hot_water_output.gql index 8613d3a9b5..81521a5d67 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_steam_hot_water_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_steam_hot_water_output.gql @@ -13,4 +13,4 @@ Q(ambient_heat_excl_p2h_in_source_of_central_heat_production), Q(residual_heat_for_central_heat_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_uranium_input.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_uranium_input.gql index 7463e9406e..54f6c0eeb8 100644 --- a/gqueries/config/sankey/turk_sankey_conversion_uranium_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_conversion_uranium_input.gql @@ -2,4 +2,4 @@ SUM( Q(uranium_for_electricity_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_ammonia_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_ammonia_input.gql index e81bb4862a..f9042a4ef4 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_ammonia_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_ammonia_input.gql @@ -14,4 +14,4 @@ Q(imported_ammonia_to_energy_in_sankey), Q(imported_ammonia_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_biomass_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_biomass_input.gql index 236b3ba747..7ac5552e9a 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_biomass_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_biomass_input.gql @@ -14,4 +14,4 @@ Q(biomass_products_to_energy_in_sankey), Q(biomass_products_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_coal_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_coal_input.gql index cd73de113b..5aa1fa25df 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_coal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_coal_input.gql @@ -14,4 +14,4 @@ Q(coal_and_derivatives_to_energy_in_sankey), Q(coal_and_derivatives_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_electricity_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_electricity_input.gql index 8c3cce1a05..0335f983aa 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_electricity_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_electricity_input.gql @@ -15,4 +15,4 @@ Q(electricity_prod_to_energy_in_sankey), Q(electricity_prod_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_geothermal_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_geothermal_input.gql index a23952c2db..189d4ac5d6 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_geothermal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_geothermal_input.gql @@ -13,4 +13,4 @@ Q(final_demand_of_geothermal_in_energy_energetic), Q(final_demand_of_geothermal_non_energetic) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_hydrogen_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_hydrogen_input.gql index b40d4c4439..489b683c3a 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_hydrogen_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_hydrogen_input.gql @@ -14,4 +14,4 @@ Q(hydrogen_prod_to_energy_in_sankey), Q(hydrogen_prod_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_liquid_hydrogen_input.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_liquid_hydrogen_input.gql index 07e5db686e..a6599615bc 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_liquid_hydrogen_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_liquid_hydrogen_input.gql @@ -2,4 +2,4 @@ SUM( Q(imported_liquid_hydrogen_to_export_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_lohc_input.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_lohc_input.gql index 60eda74190..1af5b97a7b 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_lohc_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_lohc_input.gql @@ -2,4 +2,4 @@ SUM( Q(imported_lohc_to_export_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_natural_gas_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_natural_gas_input.gql index 1787d0937a..d8a85dfefe 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_natural_gas_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_natural_gas_input.gql @@ -14,4 +14,4 @@ Q(natural_gas_to_energy_in_sankey), Q(natural_gas_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_oil_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_oil_input.gql index 93465d513a..aba9705eee 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_oil_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_oil_input.gql @@ -14,4 +14,4 @@ Q(oil_and_derivatives_to_energy_in_sankey), Q(oil_and_derivatives_to_feedstock_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_solar_thermal_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_solar_thermal_input.gql index dc4cc8777e..4d5aee5fc2 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_solar_thermal_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_solar_thermal_input.gql @@ -13,4 +13,4 @@ Q(final_demand_of_solar_in_energy_energetic), Q(final_demand_of_solar_non_energetic) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_steam_hot_water_input.gql similarity index 98% rename from gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_steam_hot_water_input.gql index d1a5af0eaa..ad87b93e61 100644 --- a/gqueries/config/sankey/turk_sankey_final_demand_steam_hot_water_input.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_final_demand_steam_hot_water_input.gql @@ -13,4 +13,4 @@ Q(final_demand_of_heat_in_energy_energetic), Q(final_demand_of_heat_non_energetic) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_ammonia_output.gql similarity index 81% rename from gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_ammonia_output.gql index a289097d81..386e41b467 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_ammonia_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_ammonia_output.gql @@ -2,4 +2,4 @@ SUM( Q(import_of_ammonia) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_biomass_output.gql similarity index 97% rename from gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_biomass_output.gql index 5a0b95b8f2..aabacc4fc1 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_biomass_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_biomass_output.gql @@ -12,4 +12,4 @@ Q(total_primary_demand_of_biogenic_waste), Q(total_primary_demand_of_non_biogenic_waste) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_coal_output.gql similarity index 90% rename from gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_coal_output.gql index e21630ce14..94fdc32960 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_coal_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_coal_output.gql @@ -3,4 +3,4 @@ Q(import_of_coal_and_derivatives), Q(extraction_of_coal_and_derivatives) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_electricity_output.gql similarity index 97% rename from gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_electricity_output.gql index a0461d3e24..c094003695 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_electricity_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_electricity_output.gql @@ -8,4 +8,4 @@ Q(water_to_electricity_prod_in_sankey), Q(geothermal_in_source_of_electricity_production) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_geothermal_output.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_geothermal_output.gql index 3e6587f6ed..e7c93d1573 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_geothermal_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_geothermal_output.gql @@ -2,4 +2,4 @@ SUM( Q(sankey_total_primary_demand_of_geothermal) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_hydrogen_output.gql similarity index 86% rename from gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_hydrogen_output.gql index d4e86ef394..e6fef6578c 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_hydrogen_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_hydrogen_output.gql @@ -2,4 +2,4 @@ SUM( Q(hydrogen_import_to_hydrogen_prod_in_sankey) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_liquid_hydrogen_output.gql similarity index 83% rename from gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_liquid_hydrogen_output.gql index a9f3b379c7..36baa83f25 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_liquid_hydrogen_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_liquid_hydrogen_output.gql @@ -2,4 +2,4 @@ SUM( Q(import_of_liquid_hydrogen) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_lohc_output.gql similarity index 80% rename from gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_lohc_output.gql index b9a834c835..9ea1804c99 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_lohc_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_lohc_output.gql @@ -2,4 +2,4 @@ SUM( Q(import_of_lohc) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_natural_gas_output.gql similarity index 90% rename from gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_natural_gas_output.gql index 4d6811252e..f90b751758 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_natural_gas_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_natural_gas_output.gql @@ -3,4 +3,4 @@ Q(import_of_natural_gas_and_derivatives), Q(extraction_of_natural_gas) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_oil_output.gql similarity index 90% rename from gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_oil_output.gql index 4b89eddbb4..5e98f251d2 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_oil_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_oil_output.gql @@ -3,4 +3,4 @@ Q(import_of_oil_and_derivatives), Q(extraction_of_oil_and_derivatives) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_solar_thermal_output.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_solar_thermal_output.gql index e6d0e637b1..4ceabdd564 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_solar_thermal_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_solar_thermal_output.gql @@ -2,4 +2,4 @@ SUM( Q(total_primary_demand_of_renewable_heat) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_steam_hot_water_output.gql similarity index 85% rename from gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_steam_hot_water_output.gql index 81080ad726..4557825ed0 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_steam_hot_water_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_steam_hot_water_output.gql @@ -2,4 +2,4 @@ SUM( Q(import_for_central_heat_conversion) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_uranium_output.gql similarity index 87% rename from gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql rename to gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_uranium_output.gql index c35e7c0da2..8c4e7ca602 100644 --- a/gqueries/config/sankey/turk_sankey_primary_demand_uranium_output.gql +++ b/gqueries/mechnical_turk/sankey/download/turk_sankey_primary_demand_uranium_output.gql @@ -3,4 +3,4 @@ Q(import_of_uranium), Q(extraction_of_uranium) ) -- unit = PJ \ No newline at end of file +- unit = PJ diff --git a/tasks/mt_sankey_csv_query_writer.rb b/tasks/mt_sankey_csv_query_writer.rb new file mode 100644 index 0000000000..1cf5780558 --- /dev/null +++ b/tasks/mt_sankey_csv_query_writer.rb @@ -0,0 +1,51 @@ +require 'yaml' +require 'fileutils' + +def format_filename_part(text) + text.downcase.gsub(' ', '_') +end + +desc "Create Sankey files from a YAML configuration" +task :create_sankey_files, [:yaml_file, :base_path] do |t, args| + yaml_file = args[:yaml_file] || 'config/sankey_csv.yml' + base_path = args[:base_path] || 'gqueries/mechnical_turk/sankey/download' + + # Load YAML content from the file + data = YAML.load_file(yaml_file) + + # Check if the base directory exists, create if not + FileUtils.mkdir_p(base_path) + + grouped_data = Hash.new { |hash, key| hash[key] = [] } + + # Process each row in the YAML file + data['rows'].each do |row| + # Create a key based on Group, Carrier, and Type + key = [row['Group'], row['Carrier'], row['Type']] + grouped_data[key] << row['Value'] + end + + # Create files for each grouped key + grouped_data.each do |key, values| + formatted_group = format_filename_part(key[0]) + formatted_carrier = format_filename_part(key[1]) + formatted_type = format_filename_part(key[2]) + + file_name = "turk_sankey_#{formatted_group}_#{formatted_carrier}_#{formatted_type}.gql" + file_path = File.join(base_path, file_name) + + # Construct the query content with each value on a new line + query_values = values.map { |value| "Q(#{value})" }.join(",\n ") + file_content = <<-FILE_CONTENT +- query = + SUM( + #{query_values} + ) +- unit = PJ + FILE_CONTENT + + # Write the content to the file + File.open(file_path, 'w') { |file| file.write(file_content) } + puts "File created: #{file_path}" + end +end \ No newline at end of file From 085b683a4f84fbe747833f1363dd3eaaa69a9941 Mon Sep 17 00:00:00 2001 From: Kas Kranenburg Date: Wed, 29 May 2024 09:09:04 +0200 Subject: [PATCH 7/7] Removing unnecessary file paths --- tasks/mt_sankey_csv_query_writer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/mt_sankey_csv_query_writer.rb b/tasks/mt_sankey_csv_query_writer.rb index 1cf5780558..31448643a7 100644 --- a/tasks/mt_sankey_csv_query_writer.rb +++ b/tasks/mt_sankey_csv_query_writer.rb @@ -6,9 +6,9 @@ def format_filename_part(text) end desc "Create Sankey files from a YAML configuration" -task :create_sankey_files, [:yaml_file, :base_path] do |t, args| - yaml_file = args[:yaml_file] || 'config/sankey_csv.yml' - base_path = args[:base_path] || 'gqueries/mechnical_turk/sankey/download' +task :create_sankey_files do |t, args| + yaml_file = 'config/sankey_csv.yml' + base_path = 'gqueries/mechnical_turk/sankey/download' # Load YAML content from the file data = YAML.load_file(yaml_file)