diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_bio_oil_to_industry_transformation.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_bio_oil_to_industry_transformation.gql new file mode 100644 index 0000000000..e45ed7d319 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_bio_oil_to_industry_transformation.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + input_of_bio_oil + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_industry_in_biomass_sankey.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_biogenic_waste_to_industry_transformation.gql similarity index 51% rename from gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_industry_in_biomass_sankey.gql rename to gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_biogenic_waste_to_industry_transformation.gql index e26d849539..f64895a06d 100644 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_industry_in_biomass_sankey.gql +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_biogenic_waste_to_industry_transformation.gql @@ -1,17 +1,15 @@ -# Query for Biomass Sankey diagram: connection between biogenic waste and industry - query = DIVIDE( PRODUCT( SUM( - V(industry_final_demand_waste_mix_non_energetic,primary_demand_of_sustainable), V( G(industry_transformation), input_of_waste_mix - ) - ), - Q(share_of_biogenic_waste_in_waste_mix) + ) ), + Q(share_of_biogenic_waste_in_waste_mix) + ), BILLIONS - ) + ) - unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_greengas_to_industry_transformation.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_greengas_to_industry_transformation.gql new file mode 100644 index 0000000000..25d7815977 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_greengas_to_industry_transformation.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + input_of_greengas + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bio_kerosene.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bio_kerosene.gql new file mode 100644 index 0000000000..0ad6c72fe3 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bio_kerosene.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + output_of_bio_kerosene + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_biodiesel.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_biodiesel.gql new file mode 100644 index 0000000000..f77b74ba76 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_biodiesel.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + output_of_biodiesel + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bionaphtha.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bionaphtha.gql new file mode 100644 index 0000000000..5d3e215a71 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_bionaphtha.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + output_of_bionaphtha + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_greengas.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_greengas.gql new file mode 100644 index 0000000000..701156e40c --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_industry_transformation_to_greengas.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + output_of_greengas + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_wood_pellets_to_industry_transformation.gql b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_wood_pellets_to_industry_transformation.gql new file mode 100644 index 0000000000..ae25f2ef45 --- /dev/null +++ b/gqueries/general/conversion/biomass_products/conversion_industry_transformation/conversion_from_wood_pellets_to_industry_transformation.gql @@ -0,0 +1,12 @@ + +- query = + DIVIDE( + SUM( + V( + G(industry_transformation), + input_of_wood_pellets + ) + ), + BILLIONS + ) +- unit = PJ diff --git a/gqueries/mechanical_turk/demand/biomass/turk_demand_biogenic_waste.gql b/gqueries/mechanical_turk/demand/biomass/turk_demand_biogenic_waste.gql deleted file mode 100644 index 9f8e233044..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_demand_biogenic_waste.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Total demand of biogenic waste input in all nodes in which either: -# - a bio carrier is converted into a non-bio carrier; i.e. all nodes that -# produce electricity, heat or hydrogen using a bio carrier (including -# network gas as this can consist of greengas) -# - a bio carrier is used as final demand - -- unit = PJ -- query = - SUM( - Q(chp_heat_and_electricity_from_biogenic_waste), - Q(electricity_from_biogenic_waste), - Q(heat_from_biogenic_waste) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_demand_dry_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_demand_dry_biomass.gql deleted file mode 100644 index 7f9b8ee758..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_demand_dry_biomass.gql +++ /dev/null @@ -1,17 +0,0 @@ -# Total demand of dry biomass input in all nodes in which either: -# - a bio carrier is converted into a non-bio carrier; i.e. all nodes that -# produce electricity, heat or hydrogen using a bio carrier (including -# network gas as this can consist of greengas) -# - a bio carrier is used as final demand - -- unit = PJ -- query = - SUM( - Q(chp_heat_and_electricity_from_dry_biomass), - Q(electricity_from_dry_biomass), - Q(export_of_dry_biomass), - Q(greengas_from_dry_biomass), - Q(heat_from_dry_biomass), - Q(hydrogen_from_dry_biomass), - Q(wood_from_dry_biomass) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_demand_oily_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_demand_oily_biomass.gql deleted file mode 100644 index 41652e582a..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_demand_oily_biomass.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Total demand of oily biomass input in all nodes in which either: -# - a bio carrier is converted into a non-bio carrier; i.e. all nodes that -# produce electricity, heat, hydrogen or gas power fuelmix using a bio carrier (including -# network gas as this can consist of greengas) -# - a bio carrier is used as final demand - -- unit = PJ -- query = - SUM( - Q(bio_fuels_from_oily_biomass), - Q(export_of_oily_biomass), - Q(conversion_from_oily_biomass_to_gas_power_fuelmix) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_demand_wet_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_demand_wet_biomass.gql deleted file mode 100644 index f4f92c15e3..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_demand_wet_biomass.gql +++ /dev/null @@ -1,17 +0,0 @@ -# Total demand of wet biomass input in all nodes in which either: -# - a bio carrier is converted into a non-bio carrier; i.e. all nodes that -# produce electricity, heat or hydrogen using a bio carrier (including -# network gas as this can consist of greengas) -# - a bio carrier is used as final demand - -- unit = PJ -- query = - SUM( - Q(bio_fuels_from_wet_biomass), - Q(chp_heat_and_electricity_from_wet_biomass), - Q(electricity_from_wet_biomass), - Q(export_of_wet_biomass), - Q(greengas_from_wet_biomass), - Q(heat_from_wet_biomass), - Q(hydrogen_from_wet_biomass) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_distribution_biogenic_waste.gql b/gqueries/mechanical_turk/demand/biomass/turk_distribution_biogenic_waste.gql deleted file mode 100644 index a7b8a774d2..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_distribution_biogenic_waste.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total distribution demand (= import + local production) of biogenic waste - -- unit = PJ -- query = DIVIDE(V(energy_distribution_biogenic_waste, demand), BILLIONS) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_distribution_dry_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_distribution_dry_biomass.gql deleted file mode 100644 index 413c53d470..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_distribution_dry_biomass.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total distribution demand (= import + local production) of dry biomass - -- unit = PJ -- query = DIVIDE(V(energy_distribution_dry_biomass, demand), BILLIONS) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_distribution_greengas.gql b/gqueries/mechanical_turk/demand/biomass/turk_distribution_greengas.gql deleted file mode 100644 index 1add536381..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_distribution_greengas.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total distribution demand of greengas - -- unit = PJ -- query = DIVIDE(V(energy_distribution_greengas, demand), BILLIONS) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_distribution_oily_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_distribution_oily_biomass.gql deleted file mode 100644 index 269a390e27..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_distribution_oily_biomass.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total distribution demand (= import + local production) of oily biomass - -- unit = PJ -- query = DIVIDE(V(energy_distribution_oily_biomass, demand), BILLIONS) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_distribution_wet_biomass.gql b/gqueries/mechanical_turk/demand/biomass/turk_distribution_wet_biomass.gql deleted file mode 100644 index 3267351fb4..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_distribution_wet_biomass.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total distribution demand (= import + local production) of wet biomass - -- unit = PJ -- query = DIVIDE(V(energy_distribution_wet_biomass, demand), BILLIONS) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_agriculture_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_agriculture_in_biomass_sankey.gql deleted file mode 100644 index d7f3b64380..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_agriculture_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the agriculture node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_agriculture_in_biomass_sankey), - Q(greengas_to_agriculture_in_biomass_sankey), - Q(biofuels_to_agriculture_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biofuels_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_biofuels_in_biomass_sankey.gql deleted file mode 100644 index f09253b79b..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Sum of all energy input flows of the biofuels node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(wet_biomass_to_biofuels_in_biomass_sankey), - Q(oily_biomass_to_biofuels_in_biomass_sankey), - Q(dry_biomass_to_biofuels_in_biomass_sankey), - Q(biogenic_waste_to_biofuels_in_biomass_sankey), - Q(import_biofuels_in_biomass_sankey), - Q(non_biogenic_carriers_to_biofuels_in_biomass_sankey), - Q(greengas_to_biofuels_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogas_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogas_in_biomass_sankey.gql deleted file mode 100644 index 5f1ccca9a0..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogas_in_biomass_sankey.gql +++ /dev/null @@ -1,7 +0,0 @@ -# Sum of all energy input flows of the biogas node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(wet_biomass_to_biogas_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogenic_waste_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogenic_waste_in_biomass_sankey.gql deleted file mode 100644 index 6bc7344ed9..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_biogenic_waste_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the biogenic_waste node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(import_biogenic_waste_in_biomass_sankey), - Q(local_biogenic_waste_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_buildings_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_buildings_in_biomass_sankey.gql deleted file mode 100644 index f1e185d5b4..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_buildings_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the buildings node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_buildings_in_biomass_sankey), - Q(greengas_to_buildings_in_biomass_sankey), - Q(biofuels_to_buildings_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_bunkers_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_bunkers_in_biomass_sankey.gql deleted file mode 100644 index b00a40680f..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_bunkers_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the bunkers node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_bunkers_in_biomass_sankey), - Q(greengas_to_bunkers_in_biomass_sankey), - Q(biofuels_to_bunkers_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_dry_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_dry_in_biomass_sankey.gql deleted file mode 100644 index ef9cc06004..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_dry_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the dry node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(import_dry_biomass_in_biomass_sankey), - Q(local_dry_biomass_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_export_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_export_in_biomass_sankey.gql deleted file mode 100644 index 01a5f4c03e..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_export_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the export node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(greengas_to_export_in_biomass_sankey), - Q(biofuels_to_export_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_greengas_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_greengas_in_biomass_sankey.gql deleted file mode 100644 index 67b8bda762..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Sum of all energy input flows of the greengas node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(wet_biomass_to_greengas_in_biomass_sankey), - Q(dry_biomass_to_greengas_in_biomass_sankey), - Q(non_biogenic_carriers_to_greengas_in_biomass_sankey), - Q(biofuels_to_greengas_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_households_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_households_in_biomass_sankey.gql deleted file mode 100644 index 9f62b4cd81..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_households_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the households node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_households_in_biomass_sankey), - Q(greengas_to_households_in_biomass_sankey), - Q(biofuels_to_households_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_industry_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_industry_in_biomass_sankey.gql deleted file mode 100644 index aa5d653474..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_industry_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the industry node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_industry_in_biomass_sankey), - Q(greengas_to_industry_in_biomass_sankey), - Q(biofuels_to_industry_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_losses_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_losses_in_biomass_sankey.gql deleted file mode 100644 index 6b45371c78..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Sum of all energy input flows of the losses node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_losses_in_biomass_sankey), - Q(biogas_to_losses_in_biomass_sankey), - Q(greengas_to_losses_in_biomass_sankey), - Q(biofuels_to_losses_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index 682df6e0f1..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Sum of all energy input flows of the export node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_non_biogenic_carriers_in_biomass_sankey), - Q(biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey), - Q(biogas_to_non_biogenic_carriers_in_biomass_sankey), - Q(greengas_to_non_biogenic_carriers_in_biomass_sankey), - Q(biofuels_to_non_biogenic_carriers_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_oily_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_oily_in_biomass_sankey.gql deleted file mode 100644 index ad8aced881..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_oily_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the oily node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(import_oily_biomass_in_biomass_sankey), - Q(local_oily_biomass_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_other_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_other_in_biomass_sankey.gql deleted file mode 100644 index de0dfe01b3..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_other_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the other node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_other_in_biomass_sankey), - Q(greengas_to_other_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_transport_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_transport_in_biomass_sankey.gql deleted file mode 100644 index df1dc3abad..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_transport_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows of the transport node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_transport_in_biomass_sankey), - Q(greengas_to_transport_in_biomass_sankey), - Q(biofuels_to_transport_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_input_of_wet_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_input_of_wet_in_biomass_sankey.gql deleted file mode 100644 index 2558b7f010..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_input_of_wet_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the wet node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(import_wet_biomass_in_biomass_sankey), - Q(local_wet_biomass_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biofuels_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_biofuels_in_biomass_sankey.gql deleted file mode 100644 index cef0969829..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,16 +0,0 @@ -# Sum of all energy output flows of the biofuels node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(biofuels_to_greengas_in_biomass_sankey), - Q(biofuels_to_households_in_biomass_sankey), - Q(biofuels_to_buildings_in_biomass_sankey), - Q(biofuels_to_transport_in_biomass_sankey), - Q(biofuels_to_industry_in_biomass_sankey), - Q(biofuels_to_agriculture_in_biomass_sankey), - Q(biofuels_to_bunkers_in_biomass_sankey), - Q(biofuels_to_export_in_biomass_sankey), - Q(biofuels_to_non_biogenic_carriers_in_biomass_sankey), - Q(biofuels_to_losses_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogas_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogas_in_biomass_sankey.gql deleted file mode 100644 index 1679f50af4..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogas_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy output flows of the biogas node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(biogas_to_non_biogenic_carriers_in_biomass_sankey), - Q(biogas_to_losses_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogenic_waste_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogenic_waste_in_biomass_sankey.gql deleted file mode 100644 index b83d7e5325..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_biogenic_waste_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy output flows of the biogenic_waste node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(biogenic_waste_to_biofuels_in_biomass_sankey), - Q(biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_dry_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_dry_in_biomass_sankey.gql deleted file mode 100644 index 1228c04e76..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_dry_in_biomass_sankey.gql +++ /dev/null @@ -1,17 +0,0 @@ -# Sum of all energy output flows of the dry node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_greengas_in_biomass_sankey), - Q(dry_biomass_to_households_in_biomass_sankey), - Q(dry_biomass_to_buildings_in_biomass_sankey), - Q(dry_biomass_to_transport_in_biomass_sankey), - Q(dry_biomass_to_industry_in_biomass_sankey), - Q(dry_biomass_to_agriculture_in_biomass_sankey), - Q(dry_biomass_to_other_in_biomass_sankey), - Q(dry_biomass_to_bunkers_in_biomass_sankey), - Q(dry_biomass_to_biofuels_in_biomass_sankey), - Q(dry_biomass_to_non_biogenic_carriers_in_biomass_sankey), - Q(dry_biomass_to_losses_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_greengas_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_greengas_in_biomass_sankey.gql deleted file mode 100644 index f20756572a..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,17 +0,0 @@ -# Sum of all energy output flows of the greengas node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(greengas_to_households_in_biomass_sankey), - Q(greengas_to_buildings_in_biomass_sankey), - Q(greengas_to_transport_in_biomass_sankey), - Q(greengas_to_industry_in_biomass_sankey), - Q(greengas_to_agriculture_in_biomass_sankey), - Q(greengas_to_other_in_biomass_sankey), - Q(greengas_to_bunkers_in_biomass_sankey), - Q(greengas_to_export_in_biomass_sankey), - Q(greengas_to_biofuels_in_biomass_sankey), - Q(greengas_to_non_biogenic_carriers_in_biomass_sankey), - Q(greengas_to_losses_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_import_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_import_in_biomass_sankey.gql deleted file mode 100644 index da9075f65c..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_import_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Sum of all energy output flows of the import node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(import_biogenic_waste_in_biomass_sankey), - Q(import_wet_biomass_in_biomass_sankey), - Q(import_oily_biomass_in_biomass_sankey), - Q(import_dry_biomass_in_biomass_sankey), - Q(import_biofuels_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_local_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_local_in_biomass_sankey.gql deleted file mode 100644 index 517ed493d7..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_local_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Sum of all energy output flows of the local node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(local_biogenic_waste_in_biomass_sankey), - Q(local_wet_biomass_in_biomass_sankey), - Q(local_oily_biomass_in_biomass_sankey), - Q(local_dry_biomass_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index 78e1f7cff5..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Sum of all energy input flows of the export node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(non_biogenic_carriers_to_greengas_in_biomass_sankey), - Q(non_biogenic_carriers_to_biofuels_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_oily_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_oily_in_biomass_sankey.gql deleted file mode 100644 index 2f131d44f5..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_oily_in_biomass_sankey.gql +++ /dev/null @@ -1,7 +0,0 @@ -# Sum of all energy output flows of the oily node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(oily_biomass_to_biofuels_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_output_of_wet_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_output_of_wet_in_biomass_sankey.gql deleted file mode 100644 index d442e9e035..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_output_of_wet_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy output flows of the wet node in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(wet_biomass_to_biogas_in_biomass_sankey), - Q(wet_biomass_to_biofuels_in_biomass_sankey), - Q(wet_biomass_to_greengas_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_total_input_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_total_input_in_biomass_sankey.gql deleted file mode 100644 index c6bb6624d7..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_total_input_in_biomass_sankey.gql +++ /dev/null @@ -1,9 +0,0 @@ -# Sum of all energy input flows (column: 0) in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(turk_output_of_local_in_biomass_sankey), - Q(turk_output_of_import_in_biomass_sankey), - Q(turk_output_of_non_biogenic_carriers_in_biomass_sankey) - ) diff --git a/gqueries/mechanical_turk/demand/biomass/turk_total_output_in_biomass_sankey.gql b/gqueries/mechanical_turk/demand/biomass/turk_total_output_in_biomass_sankey.gql deleted file mode 100644 index c7383337e4..0000000000 --- a/gqueries/mechanical_turk/demand/biomass/turk_total_output_in_biomass_sankey.gql +++ /dev/null @@ -1,16 +0,0 @@ -# Sum of all energy output flows (column: 4) in the biomass sankey - -- unit = PJ -- query = - SUM( - Q(turk_input_of_buildings_in_biomass_sankey), - Q(turk_input_of_agriculture_in_biomass_sankey), - Q(turk_input_of_industry_in_biomass_sankey), - Q(turk_input_of_transport_in_biomass_sankey), - Q(turk_input_of_households_in_biomass_sankey), - Q(turk_input_of_bunkers_in_biomass_sankey), - Q(turk_input_of_other_in_biomass_sankey), - Q(turk_input_of_export_in_biomass_sankey), - Q(turk_input_of_losses_in_biomass_sankey), - Q(turk_input_of_non_biogenic_carriers_in_biomass_sankey) - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/bio_oil_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/bio_oil_to_industry_transformation_in_biomass_sankey.gql new file mode 100644 index 0000000000..d66319c252 --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/bio_oil_to_industry_transformation_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_bio_oil_to_industry_transformation) diff --git a/gqueries/output_elements/output_series/biomass_sankey/biogenic_waste_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/biogenic_waste_to_industry_transformation_in_biomass_sankey.gql new file mode 100644 index 0000000000..704d063375 --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/biogenic_waste_to_industry_transformation_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_biogenic_waste_to_industry_transformation) diff --git a/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_transformation_in_biomass_sankey.gql new file mode 100644 index 0000000000..50c710798e --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/greengas_to_industry_transformation_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_greengas_to_industry_transformation) diff --git a/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bio_kerosene_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bio_kerosene_in_biomass_sankey.gql new file mode 100644 index 0000000000..73a937747f --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bio_kerosene_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_industry_transformation_to_bio_kerosene) diff --git a/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_biodiesel_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_biodiesel_in_biomass_sankey.gql new file mode 100644 index 0000000000..8e291806d9 --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_biodiesel_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_industry_transformation_to_biodiesel) diff --git a/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bionaphtha_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bionaphtha_in_biomass_sankey.gql new file mode 100644 index 0000000000..c8eeadf80b --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_bionaphtha_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_industry_transformation_to_bionaphtha) diff --git a/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_greengas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_greengas_in_biomass_sankey.gql new file mode 100644 index 0000000000..ae20b47880 --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/industry_transformation_to_greengas_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_industry_transformation_to_greengas) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_agriculture_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_agriculture_in_biomass_sankey.gql deleted file mode 100644 index 76d686245e..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_agriculture_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and agriculture - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(agriculture)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_buildings_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_buildings_in_biomass_sankey.gql deleted file mode 100644 index 43ff25f559..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_buildings_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and buildings - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(buildings)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_bunkers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_bunkers_in_biomass_sankey.gql deleted file mode 100644 index bd1dde32a3..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_bunkers_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and bunkers - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(bunkers)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_export_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_export_in_biomass_sankey.gql deleted file mode 100644 index 09b210d40c..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_export_in_biomass_sankey.gql +++ /dev/null @@ -1,16 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and export - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM( - V( - G(energy_export), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha, bio_pyrolysis_oil) - ) - ), - BILLIONS - ) - ) - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_greengas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_greengas_in_biomass_sankey.gql deleted file mode 100644 index bd91ae2daa..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,7 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and greengas - -- unit = PJ -- query = - SUM( - Q(bio_oil_to_greengas_industry_transformation_in_sankey) - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_households_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_households_in_biomass_sankey.gql deleted file mode 100644 index d8b2a7ec17..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_households_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and households - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(households)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_in_biomass_sankey.gql deleted file mode 100644 index 2deb9fb8d1..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and industry -# Only query biofuels used for heating - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(industry)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_transformation_in_biomass_sankey.gql deleted file mode 100644 index 82b86de10d..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_industry_transformation_in_biomass_sankey.gql +++ /dev/null @@ -1,18 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and industry transformation. Used as an intermediate query; not used in the sankey file. - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM(V(G(industry_transformation), input_of(bio_oil))), - BILLIONS - ), - NEG( - SUM( - Q(bio_oil_to_greengas_industry_transformation_in_sankey), - Q(bio_oil_to_bio_kerosene_industry_transformation_in_sankey), - Q(bio_oil_to_bionaphtha_industry_transformation_in_sankey), - Q(bio_oil_to_biodiesel_industry_transformation_in_sankey) - ) - ) - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_losses_in_biomass_sankey.gql deleted file mode 100644 index 5a736f047a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,25 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and losses - -- unit = PJ -- query = - DIVIDE( - SUM( - V( - Q(liquid_biofuels_producers), - output_of_loss - ), - V( - G(industry_transformation), - "output_of_bio_oil / (1 - loss_output_conversion) * loss_output_conversion" - ), - V( - G(industry_transformation), - "output_of_bio_kerosene / (1 - loss_output_conversion) * loss_output_conversion" - ), - V( - G(industry_transformation), - "output_of_biodiesel / (1 - loss_output_conversion) * loss_output_conversion" - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index 4b8a38d8a7..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,20 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and non biogenic carriers (electricity or industry transformation) production - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM( - SUM( - V( - G(electricity_production), - input_of_gas_power_fuelmix - ) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion) - ), - V(energy_production_pyrolysis_biogenic_waste, output_of_steam_hot_water), - V(energy_production_pyrolysis_dry_biomass, output_of_steam_hot_water) - ), - BILLIONS - ), - Q(biofuels_to_industry_transformation_in_biomass_sankey), - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_transport_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_transport_in_biomass_sankey.gql deleted file mode 100644 index 3cb442bf0c..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biofuels_to_transport_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biofuels and transport - -- unit = PJ -- query = - DIVIDE( - SUM( - V(INTERSECTION(G(final_demand_group), SECTOR(transport)), - input_of(bio_oil, bio_kerosene, bio_ethanol, biodiesel, bio_lng, biomethanol, bionaphtha))), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_electricity_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_electricity_prod_in_biomass_sankey.gql deleted file mode 100644 index de31009fcc..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_electricity_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogas and electricity (incl. chp) - -- unit = PJ -- query = - DIVIDE( - SUM(V(G(electricity_production), input_of_biogas)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_losses_in_biomass_sankey.gql deleted file mode 100644 index 4fffc14bb6..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogas and losses - -- unit = PJ -- query = - DIVIDE( - PRODUCT( - V(energy_biogas_fermentation_wet_biomass, output_of_loss), - (1.0 - V(EDGE(energy_greengas_upgrade_biogas, energy_distribution_biogas), parent_share)) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index cc9420d3bb..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogas_to_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,5 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogas and electricity (incl. chp) - -- unit = PJ -- query = - Q(biogas_to_electricity_prod_in_biomass_sankey) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index ace2f0cc48..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogenic waste and biofuels - -- unit = PJ -- query = - DIVIDE( - SUM( - V( - Q(liquid_biofuels_producers), - input_of_biogenic_waste - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_central_heat_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_central_heat_prod_in_biomass_sankey.gql deleted file mode 100644 index b85e4450b3..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_central_heat_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogenic waste and central heat - -- unit = PJ -- query = - DIVIDE( - SUM(V(Q(central_heat_producing_converters_sankey), input_of_waste_mix)) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_electricity_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_electricity_prod_in_biomass_sankey.gql deleted file mode 100644 index da24ceb589..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_electricity_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogenic waste and electricity (incl. chp) - -- unit = PJ -- query = - DIVIDE( - SUM(V(G(electricity_production), input_of_waste_mix)) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index 06d95500b3..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/biogenic_waste_to_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between biogenic waste and waste mix - -- unit = PJ -- query = - DIVIDE( - V(energy_distribution_waste_mix, input_of_biogenic_waste), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_heat_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_heat_dem_in_biomass_sankey.gql deleted file mode 100644 index 84e9a47ee3..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_heat_dem_in_biomass_sankey.gql +++ /dev/null @@ -1,14 +0,0 @@ -# Query for Biomass Sankey diagram: connection between central heat production and heat demand - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_biogas * steam_hot_water_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_gas_power_fuelmix * steam_hot_water_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_waste_mix * steam_hot_water_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_wood_pellets * steam_hot_water_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_torrefied_biomass_pellets * steam_hot_water_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_losses_in_biomass_sankey.gql deleted file mode 100644 index 2a0c329ac1..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/central_heat_prod_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,14 +0,0 @@ -# Query for Biomass Sankey diagram: connection between central heat production and losses - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_biogas * loss_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_wood_pellets * loss_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(Q(central_heat_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_agriculture_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_agriculture_in_biomass_sankey.gql deleted file mode 100644 index bbbbcaacec..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_agriculture_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and agriculture - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(agriculture)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index f4fb8fded9..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,18 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and biofuels - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM( - V( - Q(liquid_biofuels_producers), - input_of_dry_biomass - ) - ), - BILLIONS - ), - Q(wood_pellets_to_bio_oil_industry_transformation_in_sankey), - Q(wood_pellets_to_biodiesel_industry_transformation_in_sankey), - Q(wood_pellets_to_bio_kerosene_industry_transformation_in_sankey) - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_buildings_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_buildings_in_biomass_sankey.gql deleted file mode 100644 index 2b3fdd91f6..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_buildings_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and buildings - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(buildings)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_bunkers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_bunkers_in_biomass_sankey.gql deleted file mode 100644 index 0c0a071aed..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_bunkers_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and bunkers - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(bunkers)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_central_heat_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_central_heat_prod_in_biomass_sankey.gql deleted file mode 100644 index 07d892d878..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_central_heat_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and central heat - -- unit = PJ -- query = - DIVIDE( - SUM(V(Q(central_heat_producing_converters_sankey), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_electricity_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_electricity_prod_in_biomass_sankey.gql deleted file mode 100644 index 88a77dcb7d..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_electricity_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and electricity (incl. chp) - -- unit = PJ -- query = - DIVIDE( - SUM(V(G(electricity_production), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_greengas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_greengas_in_biomass_sankey.gql deleted file mode 100644 index bc1113825c..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,12 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and greengas - -- unit = PJ -- query = - SUM( - DIVIDE( - V(energy_greengas_gasification_dry_biomass, input_of_dry_biomass), - BILLIONS - ), - Q(wood_pellets_to_greengas_industry_transformation_in_sankey) - ) - \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_households_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_households_in_biomass_sankey.gql deleted file mode 100644 index 2ef1dc87a8..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_households_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and households - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(households)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_hydrogen_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_hydrogen_prod_in_biomass_sankey.gql deleted file mode 100644 index ab947783c7..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_hydrogen_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and hydrogen - -- unit = PJ -- query = - DIVIDE( - SUM(V(Q(hydrogen_producing_converters_sankey), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_in_biomass_sankey.gql deleted file mode 100644 index 6ff3738672..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_in_biomass_sankey.gql +++ /dev/null @@ -1,15 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and industry - -- unit = PJ -- query = - DIVIDE( - SUM( - V( - INTERSECTION( - G(final_demand_group), - SECTOR(industry)), - input_of(wood_pellets, torrefied_biomass_pellets) - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_transformation_in_biomass_sankey.gql deleted file mode 100644 index 2873593a11..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_industry_transformation_in_biomass_sankey.gql +++ /dev/null @@ -1,28 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and the industry transformation processes - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM(V(G(industry_transformation), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ), - NEG( - SUM( - DIVIDE( - SUM( - V( - G(industry_transformation), - "input_of_wood_pellets * loss_output_conversion" - ) - ), - BILLIONS - ), - Q(wood_pellets_to_bio_oil_industry_transformation_in_sankey), - Q(wood_pellets_to_biodiesel_industry_transformation_in_sankey), - Q(wood_pellets_to_bio_kerosene_industry_transformation_in_sankey), - Q(wood_pellets_to_greengas_industry_transformation_in_sankey) - ) - ) - ) - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_losses_in_biomass_sankey.gql deleted file mode 100644 index adedc5f575..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,24 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and losses. The torrefaction nodes has both dry biomass and network gas (which includes greengas) as inputs. It is assumed that 100% of network_gas input is lost and that the remaining loss is dry biomass. The dry biomass losses are taken into account here, the network_gas loss is taken into account in the greengas_to_loss_in_biomass_sankey query - -- unit = PJ -- query = - MAX( - DIVIDE( - SUM( - V( - energy_production_wood_pellets, - output_of_loss - ), - V( - energy_torrefaction_wood, - "input_of_dry_biomass - output_of_torrefied_biomass_pellets" - ), - V( - G(industry_transformation), - "input_of_wood_pellets * loss_output_conversion" - ) - ), - BILLIONS - ), - 0 - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index f91c3b94f4..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and non biogenic carriers - -- unit = PJ -- query = - SUM( - Q(dry_biomass_to_central_heat_prod_in_biomass_sankey), - Q(dry_biomass_to_electricity_prod_in_biomass_sankey), - Q(dry_biomass_to_hydrogen_prod_in_biomass_sankey), - Q(dry_biomass_to_industry_transformation_in_biomass_sankey) - ) - \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_other_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_other_in_biomass_sankey.gql deleted file mode 100644 index 6589e9c7d0..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_other_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and other - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(other)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_transport_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_transport_in_biomass_sankey.gql deleted file mode 100644 index 2deed86334..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/dry_biomass_to_transport_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between dry biomass and transport - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(transport)), input_of(wood_pellets, torrefied_biomass_pellets))), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_electricity_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_electricity_dem_in_biomass_sankey.gql deleted file mode 100644 index 5457752a59..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_electricity_dem_in_biomass_sankey.gql +++ /dev/null @@ -1,15 +0,0 @@ -# Query for Biomass Sankey diagram: connection between electricity production (incl. chp) and electricity demand - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(G(electricity_production), "input_of_biogas * electricity_output_conversion")), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * electricity_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(G(electricity_production), "input_of_waste_mix * electricity_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(G(electricity_production), "input_of_wood_pellets * electricity_output_conversion")), - SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * electricity_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * electricity_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * electricity_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_heat_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_heat_dem_in_biomass_sankey.gql deleted file mode 100644 index eff9e36bce..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_heat_dem_in_biomass_sankey.gql +++ /dev/null @@ -1,15 +0,0 @@ -# Query for Biomass Sankey diagram: connection between electricity production (incl. chp) and heat demand - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(G(electricity_production), "input_of_biogas * steam_hot_water_output_conversion")), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * steam_hot_water_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(G(electricity_production), "input_of_waste_mix * steam_hot_water_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(G(electricity_production), "input_of_wood_pellets * steam_hot_water_output_conversion")), - SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * steam_hot_water_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * steam_hot_water_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * steam_hot_water_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_losses_in_biomass_sankey.gql deleted file mode 100644 index 92e0ebd6fc..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/electricity_prod_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,15 +0,0 @@ -# Query for Biomass Sankey diagram: connection between electricity production (incl. chp) and losses - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(G(electricity_production), "input_of_biogas * loss_output_conversion")), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(G(electricity_production), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(G(electricity_production), "input_of_wood_pellets * loss_output_conversion")), - SUM(V(G(electricity_production), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(G(electricity_production), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network), - SUM(V(G(electricity_production), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_agriculture_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_agriculture_in_biomass_sankey.gql deleted file mode 100644 index df2043d457..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_agriculture_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and agriculture - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(agriculture)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index 3b3e5a36db..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,21 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and biofuels - -- unit = PJ -- query = - SUM( - Q(greengas_to_biomass_products_industry_transformation_in_sankey), - DIVIDE( - PRODUCT( - SUM( - V( - energy_production_hvo_bio_kerosene, - energy_production_bio_ethanol, - input_of_network_gas - ) - ), - Q(share_of_sustainable_gas_in_gas_network) - ), - BILLIONS - ) - ) - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_buildings_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_buildings_in_biomass_sankey.gql deleted file mode 100644 index 2f3aa764bb..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_buildings_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and buildings - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(buildings)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_bunkers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_bunkers_in_biomass_sankey.gql deleted file mode 100644 index 0d9e6c8f75..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_bunkers_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and bunkers - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(bunkers)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_central_heat_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_central_heat_prod_in_biomass_sankey.gql deleted file mode 100644 index e0a461983a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_central_heat_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and heat production - -- unit = PJ -- query = - DIVIDE( - SUM(V(Q(central_heat_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_electricity_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_electricity_prod_in_biomass_sankey.gql deleted file mode 100644 index c28130adf6..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_electricity_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and electricity (incl. chp) - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(G(electricity_production), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - SUM(V(G(electricity_production), input_of_gas_power_fuelmix)) * V(energy_mixer_for_gas_power_fuel, network_gas_input_conversion) * Q(share_of_sustainable_gas_in_gas_network) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_households_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_households_in_biomass_sankey.gql deleted file mode 100644 index bb08b01a6a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_households_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and households - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(households)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_hydrogen_prod_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_hydrogen_prod_in_biomass_sankey.gql deleted file mode 100644 index 1691cacdcf..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_hydrogen_prod_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and hydrogen production - -- unit = PJ -- query = - DIVIDE( - SUM(V(Q(hydrogen_producing_converters_sankey), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_in_biomass_sankey.gql deleted file mode 100644 index e317daa0fb..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_in_biomass_sankey.gql +++ /dev/null @@ -1,20 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and industry - -- unit = PJ -- query = - DIVIDE( - PRODUCT( - SUM( - V( - INTERSECTION( - G(final_demand_group), - SECTOR(industry) - ), - input_of(network_gas, compressed_network_gas) - ) - ), - Q(share_of_sustainable_gas_in_gas_network) - ), - BILLIONS - ) - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_transformation_in_biomass_sankey.gql deleted file mode 100644 index 325fe3cd34..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_industry_transformation_in_biomass_sankey.gql +++ /dev/null @@ -1,18 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and industry transformation. This query is not directly used in the sankey, but used in the flows from non biogenic carriers to - -- unit = PJ -- query = - SUM( - DIVIDE( - SUM(V(G(industry_transformation), input_of(greengas))), - BILLIONS - ) - , - NEG( - SUM( - Q(greengas_to_biomass_products_industry_transformation_in_sankey), - Q(greengas_to_greengas_industry_transformation_in_sankey) - ) - ) - ) - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_losses_in_biomass_sankey.gql deleted file mode 100644 index e3c22ab967..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,29 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and losses. Includes greengas used for torrefaction of wood pellets - -- unit = PJ -- query = - DIVIDE( - SUM( - V(energy_greengas_upgrade_biogas, - energy_greengas_gasification_dry_biomass, - energy_greengas_gasification_wet_biomass, - output_of_loss), - PRODUCT( - V(energy_biogas_fermentation_wet_biomass, output_of_loss), - V(EDGE(energy_greengas_upgrade_biogas, energy_distribution_biogas), parent_share) - ), - V(energy_national_gas_network_natural_gas, - output_of_loss) * Q(share_of_sustainable_gas_in_gas_network), - V(energy_torrefaction_wood, - input_of_network_gas) * Q(share_of_sustainable_gas_in_gas_network), - V( - G(industry_transformation), - "output_of_greengas / (1 - loss_output_conversion) * loss_output_conversion" - ) - ), - BILLIONS - ) - - - - diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_non_biogenic_carriers_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_non_biogenic_carriers_in_biomass_sankey.gql deleted file mode 100644 index 2c6a7ea964..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_non_biogenic_carriers_in_biomass_sankey.gql +++ /dev/null @@ -1,10 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas to non biogenic carriers (consisting of central heat, electricity and industry transformation) - -- unit = PJ -- query = - SUM( - Q(greengas_to_central_heat_prod_in_biomass_sankey), - Q(greengas_to_electricity_prod_in_biomass_sankey), - Q(greengas_to_industry_transformation_in_biomass_sankey), - Q(greengas_to_hydrogen_prod_in_biomass_sankey) - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_other_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_other_in_biomass_sankey.gql deleted file mode 100644 index 95d4a64f1a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_other_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and other - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(other)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_transport_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_transport_in_biomass_sankey.gql deleted file mode 100644 index 94beff5359..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/greengas_to_transport_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between greengas and transport - -- unit = PJ -- query = - DIVIDE( - SUM(V(INTERSECTION(G(final_demand_group), SECTOR(transport)), input_of(network_gas, compressed_network_gas))) * Q(share_of_sustainable_gas_in_gas_network), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql deleted file mode 100644 index d38fab7786..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_hydrogen_dem_in_biomass_sankey.gql +++ /dev/null @@ -1,14 +0,0 @@ -# Query for Biomass Sankey diagram: connection between hydrogen production and hydrogen demand - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_biogas * hydrogen_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_gas_power_fuelmix * hydrogen_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_waste_mix * hydrogen_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_wood_pellets * hydrogen_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_torrefied_biomass_pellets * hydrogen_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * hydrogen_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_losses_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_losses_in_biomass_sankey.gql deleted file mode 100644 index eb4a415e21..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/hydrogen_prod_to_losses_in_biomass_sankey.gql +++ /dev/null @@ -1,14 +0,0 @@ -# Query for Biomass Sankey diagram: connection between hydrogen production and losses - -- unit = PJ -- query = - DIVIDE( - SUM( - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_biogas * loss_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_gas_power_fuelmix * loss_output_conversion")) * V(energy_mixer_for_gas_power_fuel, bio_oil_input_conversion), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_waste_mix * loss_output_conversion")) * V(energy_distribution_biogenic_waste, share_of_energy_distribution_waste_mix), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_wood_pellets * loss_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_torrefied_biomass_pellets * loss_output_conversion")), - SUM(V(Q(hydrogen_producing_converters_sankey), "input_of_network_gas * loss_output_conversion")) * Q(share_of_sustainable_gas_in_gas_network)), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biofuels_in_biomass_sankey.gql deleted file mode 100644 index 00b69f9196..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Query for Biomass Sankey diagram: connection between import and biofuels - -- unit = PJ -- query = Q(import_of_biofuels) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biogenic_waste_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biogenic_waste_in_biomass_sankey.gql deleted file mode 100644 index f00dca1245..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_biogenic_waste_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between import and biogenic waste - -- unit = PJ -- query = - DIVIDE( - V(energy_import_biogenic_waste, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_dry_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_dry_biomass_in_biomass_sankey.gql deleted file mode 100644 index 66a7737b1f..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_dry_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between import and dry biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_import_dry_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_oily_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_oily_biomass_in_biomass_sankey.gql deleted file mode 100644 index 16e70889db..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_oily_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between import and oily biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_import_oily_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_wet_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_wet_biomass_in_biomass_sankey.gql deleted file mode 100644 index 975ba29859..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/import_wet_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between local production and wet biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_import_wet_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_biogenic_waste_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_biogenic_waste_in_biomass_sankey.gql deleted file mode 100644 index 57f1084ba2..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_biogenic_waste_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between local production and biogenic waste - -- unit = PJ -- query = - DIVIDE( - V(energy_production_biogenic_waste, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_dry_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_dry_biomass_in_biomass_sankey.gql deleted file mode 100644 index 03e83d58ea..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_dry_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between local production and dry biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_production_dry_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_oily_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_oily_biomass_in_biomass_sankey.gql deleted file mode 100644 index ac143f203a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_oily_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between local production and oily biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_production_oily_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_wet_biomass_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_wet_biomass_in_biomass_sankey.gql deleted file mode 100644 index 8c3353d1ad..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/local_wet_biomass_in_biomass_sankey.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Query for Biomass Sankey diagram: connection between local production and wet biomass - -- unit = PJ -- query = - DIVIDE( - V(energy_production_wet_biomass, demand), - BILLIONS - ) \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index 63915ef6e8..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,54 +0,0 @@ -# Query for Biomass Sankey diagram: connection between non biogenic carriers and biofuels -# All bio to bio transformations within the transformation nodes are subtracted, since these are accounted for elsewhere. -- query = - SUM( - DIVIDE( - SUM( - V( - G(industry_transformation), - "output_of_bio_kerosene / (1 - loss_output_conversion - residual_heat_input_conversion)" - ), - V( - G(industry_transformation), - "output_of_biodiesel / (1 - loss_output_conversion - residual_heat_input_conversion)" - ), - V( - G(industry_transformation), - "output_of_bio_oil / (1 - loss_output_conversion - residual_heat_input_conversion)" - ), - V(energy_production_fractionation_bio_pyrolysis_oil, "input_of_steam_hot_water + input_of_hydrogen"), - V( - energy_production_hvo_bio_kerosene, - energy_production_hvo_biodiesel, - energy_production_bio_ethanol_to_jet, - energy_production_biomethanol_to_jet, - input_of_hydrogen - ), - PRODUCT( - SUM( - V( - energy_production_hvo_bio_kerosene, - energy_production_bio_ethanol, - input_of_network_gas - ) - ), - Q(share_of_fossil_gas_in_gas_network) - ) - ), - BILLIONS - ), - NEG( - SUM( - Q(greengas_to_biodiesel_industry_transformation_in_sankey), - Q(greengas_to_bio_kerosene_industry_transformation_in_sankey), - Q(greengas_to_bio_oil_industry_transformation_in_sankey), - Q(wood_pellets_to_bio_oil_industry_transformation_in_sankey), - Q(wood_pellets_to_biodiesel_industry_transformation_in_sankey), - Q(wood_pellets_to_bio_kerosene_industry_transformation_in_sankey), - Q(bio_oil_to_bio_kerosene_industry_transformation_in_sankey), - Q(bio_oil_to_biodiesel_industry_transformation_in_sankey), - Q(bio_oil_to_bionaphtha_industry_transformation_in_sankey) - ) - ) - ) -- unit = PJ diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_greengas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_greengas_in_biomass_sankey.gql deleted file mode 100644 index a589a3619c..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/non_biogenic_carriers_to_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,24 +0,0 @@ -# Query for Biomass Sankey diagram: connection between non biogenic carriers and greengas -# The biofuels to greengas flows are subtracted from these flows, since these are accounted for in other flows within the sankey. - -- query = - SUM( - DIVIDE( - SUM( - V( - G(industry_transformation), - "output_of_greengas / (1 - loss_output_conversion - residual_heat_input_conversion)" - ) - ), - BILLIONS - ), - NEG( - SUM( - Q(biofuels_to_greengas_in_biomass_sankey), - Q(wood_pellets_to_greengas_industry_transformation_in_sankey), - Q(greengas_to_greengas_industry_transformation_in_sankey) - ) - ) - ) - -- unit = PJ \ No newline at end of file diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/oily_biomass_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/oily_biomass_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index a77f22849c..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/oily_biomass_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Query for Biomass Sankey diagram: connection between oily biomass and biofuels - -- unit = PJ -- query = - DIVIDE( - SUM( - V( - Q(liquid_biofuels_producers), - input_of_oily_biomass - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biofuels_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biofuels_in_biomass_sankey.gql deleted file mode 100644 index 701fead26f..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biofuels_in_biomass_sankey.gql +++ /dev/null @@ -1,13 +0,0 @@ -# Query for Biomass Sankey diagram: connection between wet biomass and biofuels - -- unit = PJ -- query = - DIVIDE( - SUM( - V( - Q(liquid_biofuels_producers), - input_of_wet_biomass - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biogas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biogas_in_biomass_sankey.gql deleted file mode 100644 index 2b0ebbd1a7..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_biogas_in_biomass_sankey.gql +++ /dev/null @@ -1,11 +0,0 @@ -# Query for Biomass Sankey diagram: connection between wet biomass and biogas - -- unit = PJ -- query = - DIVIDE( - PRODUCT( - V(energy_biogas_fermentation_wet_biomass, input_of_wet_biomass), - (1.0 - V(EDGE(energy_greengas_upgrade_biogas, energy_distribution_biogas), parent_share)) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_greengas_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_greengas_in_biomass_sankey.gql deleted file mode 100644 index f8c1ecf12a..0000000000 --- a/gqueries/output_elements/output_series/biomass_sankey/old_queries/wet_biomass_to_greengas_in_biomass_sankey.gql +++ /dev/null @@ -1,14 +0,0 @@ -# Query for Biomass Sankey diagram: connection between wet biomass and greengas - -- unit = PJ -- query = - DIVIDE( - SUM( - V(energy_greengas_gasification_wet_biomass, input_of_wet_biomass), - PRODUCT( - V(energy_biogas_fermentation_wet_biomass, input_of_wet_biomass), - V(EDGE(energy_greengas_upgrade_biogas, energy_distribution_biogas), parent_share) - ) - ), - BILLIONS - ) diff --git a/gqueries/output_elements/output_series/biomass_sankey/wood_pellets_to_industry_transformation_in_biomass_sankey.gql b/gqueries/output_elements/output_series/biomass_sankey/wood_pellets_to_industry_transformation_in_biomass_sankey.gql new file mode 100644 index 0000000000..675e55b412 --- /dev/null +++ b/gqueries/output_elements/output_series/biomass_sankey/wood_pellets_to_industry_transformation_in_biomass_sankey.gql @@ -0,0 +1,2 @@ +- unit = PJ +- query = Q(conversion_from_wood_pellets_to_industry_transformation)