From 37d6370e70abcc7ff8a2698a932429f9452e7873 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 9 Jun 2026 09:05:11 +0200 Subject: [PATCH 01/26] Restructure primary emission queries --- .../co2/average_co2_emissions_of_imported_electricity.gql | 0 .../co2/average_co2_emissions_of_produced_electricity.gql | 0 .../primary_emissions}/co2/co2_emissions_1990.gql | 0 .../primary_emissions}/co2/co2_emissions_bunkers_1990.gql | 0 .../co2/co2_emissions_of_imported_electricity.gql | 0 .../co2/co2_emissions_of_produced_electricity.gql | 0 .../co2/co2_emissions_of_used_electricity.gql | 0 .../co2/co2_emissions_produced_abroad_consumed_local.gql | 0 .../co2/co2_emissions_produced_local_consumed_abroad.gql | 0 .../primary_emissions}/co2/delayed_emissions_co2.gql | 0 .../co2/delayed_emissions_emitted_co2.gql | 0 .../co2/delayed_emissions_indefinitely_co2.gql | 0 .../co2/industry/captured_co2_emissions_in_industry.gql | 0 ...ary_co2_emissions_of_ammonia_in_industry_energetic.gql | 0 ...missions_of_biomass_products_in_industry_energetic.gql | 0 ...ns_of_coal_and_coal_products_in_industry_energetic.gql | 0 ...co2_emissions_of_electricity_in_industry_energetic.gql | 0 ...issions_of_hydrogen_carriers_in_industry_energetic.gql | 0 ...ry_co2_emissions_of_methanol_in_industry_energetic.gql | 0 ..._natural_gas_and_derivatives_in_industry_energetic.gql | 0 ...ions_of_oil_and_oil_products_in_industry_energetic.gql | 0 ...emissions_of_steam_hot_water_in_industry_energetic.gql | 0 .../industry_chemical_fertilizers_non_energetic_co2.gql | 0 .../co2/industry_chemical_non_energetic_co2_emissions.gql | 0 .../co2/industry_chemical_other_non_energetic_co2.gql | 0 .../co2/initial_co2_emissions_of_imported_electricity.gql | 0 .../co2/primary_co2_emission_of_agriculture.gql | 0 .../co2/primary_co2_emission_of_buildings.gql | 0 .../co2/primary_co2_emission_of_bunkers.gql | 0 .../co2/primary_co2_emission_of_delayed_emissions.gql | 0 .../co2/primary_co2_emission_of_energy.gql | 0 .../co2/primary_co2_emission_of_households.gql | 0 .../co2/primary_co2_emission_of_industry.gql | 0 .../co2/primary_co2_emission_of_non_energetic.gql | 0 .../co2/primary_co2_emission_of_other.gql | 0 .../co2/primary_co2_emission_of_transport.gql | 0 .../co2/primary_co2_of_coal_and_derivatives.gql | 0 .../co2/primary_co2_of_imported_electricity.gql | 0 .../co2/primary_co2_of_imported_hydrogen.gql | 0 .../co2/primary_co2_of_natural_gas_and_derivatives.gql | 0 ...ry_co2_of_natural_gas_and_derivatives_in_transport.gql | 0 ...primary_co2_of_non_energetic_and_delayed_emissions.gql | 0 .../co2/primary_co2_of_oil_and_derivatives.gql | 0 .../primary_emissions}/co2/primary_co2_of_total.gql | 0 .../co2/relative_primary_co2_of_coal_and_derivatives.gql | 0 .../co2/relative_primary_co2_of_imported_electricity.gql | 0 .../co2/relative_primary_co2_of_imported_hydrogen.gql | 0 ...elative_primary_co2_of_natural_gas_and_derivatives.gql | 0 .../co2/relative_primary_co2_of_oil_and_derivatives.gql | 0 .../primary_emissions}/co2/total_co2_emissions.gql | 0 .../primary_emissions}/co2/total_local_co2_emissions.gql | 0 .../primary_emissions}/co2/total_net_co2_emissions.gql | 0 .../demand/emissions_molecules_export.gql | 0 .../demand/emissions_molecules_offshore_sequestration.gql | 0 ...ssions_molecules_other_utilisation_delayed_emitted.gql | 0 ...s_molecules_other_utilisation_delayed_indefinitely.gql | 0 .../emissions_production_synthetic_methanol_emitted.gql | 0 .../emissions_production_synthetic_methanol_utilised.gql | 0 .../emissions_delayed_emitted_co2.gql | 0 .../emissions_energetic_agriculture_co2.gql | 0 .../emissions_energetic_agriculture_other_ghg.gql | 0 .../emissions_energetic_all_co2.gql | 0 .../emissions_energetic_all_other_ghg.gql | 0 .../emissions_energetic_buildings_other_ghg.gql | 0 .../emissions_energetic_energy_other_ghg.gql | 0 .../emissions_energetic_households_other_ghg.gql | 0 .../emissions_energetic_industry_chemical_co2.gql | 0 .../emissions_energetic_industry_energy_co2.gql | 0 .../emissions_energetic_industry_other_ghg.gql | 0 .../emissions_energetic_other_industry_co2.gql | 0 .../emissions_energetic_transport_other_ghg.gql | 0 .../{ => primary_emissions}/emissions_indirect_co2.gql | 0 ...s_non_energetic_agriculture_fermentation_other_ghg.gql | 0 .../emissions_non_energetic_agriculture_manure_co2.gql | 0 ...issions_non_energetic_agriculture_manure_other_ghg.gql | 0 ...missions_non_energetic_agriculture_other_other_ghg.gql | 0 ...ons_non_energetic_agriculture_soil_cultivation_co2.gql | 0 ...n_energetic_agriculture_soil_cultivation_other_ghg.gql | 0 .../emissions_non_energetic_all_co2.gql | 0 .../emissions_non_energetic_all_other_ghg.gql | 0 .../emissions_non_energetic_industry_chemical_co2.gql | 0 ...missions_non_energetic_industry_chemical_other_ghg.gql | 0 ...ssions_non_energetic_industry_waste_management_co2.gql | 0 ..._non_energetic_industry_waste_management_other_ghg.gql | 0 .../emissions_non_energetic_other_industry_co2.gql | 0 .../emissions_non_energetic_other_industry_other_ghg.gql | 0 .../emissions_overview_energetic_agriculture_co2.gql | 0 .../emissions_overview_energetic_agriculture_ghg.gql | 6 ++++++ ...emissions_overview_energetic_built_environment_co2.gql | 6 ++++++ ...emissions_overview_energetic_built_environment_ghg.gql | 7 +++++++ .../emissions_overview_energetic_industry_co2.gql | 8 ++++++++ .../emissions_overview_energetic_industry_ghg.gql | 7 +++++++ .../emissions_overview_energetic_transport_co2.gql | 6 ++++++ .../emissions_overview_energetic_transport_ghg.gql | 6 ++++++ .../emissions_overview_non_energetic_agriculture_co2.gql | 7 +++++++ .../emissions_overview_non_energetic_agriculture_ghg.gql | 7 +++++++ .../emissions_overview_non_energetic_industry_co2.gql | 8 ++++++++ .../emissions_overview_non_energetic_industry_ghg.gql | 8 ++++++++ .../emissions/{ => primary_emissions}/emissions_total.gql | 0 .../DAC/emissions_captured_direct_air_capture_co2.gql | 0 .../supply/emissions_captured_biogenic_total.gql | 0 .../supply/emissions_captured_total.gql | 0 .../supply/emissions_captured_total_excluding_import.gql | 0 .../emissions_captured_hydrogen_autothermal_reformer.gql | 0 .../emissions_captured_hydrogen_biomass_gasification.gql | 0 ...emissions_captured_hydrogen_steam_methane_reformer.gql | 0 .../supply/hydrogen/emissions_captured_hydrogen_total.gql | 0 .../import/emissions_captured_import_co2_backup.gql | 0 .../import/emissions_captured_import_co2_baseload.gql | 0 .../supply/import/emissions_captured_import_co2_total.gql | 0 .../emissions_captured_industry_chemicals_fertilizers.gql | 0 .../emissions_captured_industry_chemicals_other.gql | 0 .../emissions_captured_industry_chemicals_refineries.gql | 0 .../emissions_captured_industry_external_coupling.gql | 0 .../supply/industry/emissions_captured_industry_other.gql | 0 .../industry/emissions_captured_industry_other_food.gql | 0 .../industry/emissions_captured_industry_other_paper.gql | 0 .../supply/industry/emissions_captured_industry_steel.gql | 0 .../supply/industry/emissions_captured_industry_total.gql | 0 .../emissions_captured_energy_chp_ht_wood_pellets.gql | 2 ++ .../emissions_captured_energy_chp_mt_wood_pellets.gql | 2 ++ .../emissions_captured_energy_power_wood_pellets.gql | 2 ++ .../supply/power/emissions_captured_power_biogenic.gql | 7 +++++++ .../power/emissions_captured_power_non_biogenic.gql | 3 +++ .../supply/power/emissions_captured_power_total.gql | 2 ++ 125 files changed, 94 insertions(+) rename gqueries/general/{ => emissions/primary_emissions}/co2/average_co2_emissions_of_imported_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/average_co2_emissions_of_produced_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_1990.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_bunkers_1990.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_of_imported_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_of_produced_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_of_used_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_produced_abroad_consumed_local.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/co2_emissions_produced_local_consumed_abroad.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/delayed_emissions_co2.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/delayed_emissions_emitted_co2.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/delayed_emissions_indefinitely_co2.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/captured_co2_emissions_in_industry.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_ammonia_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_biomass_products_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_coal_and_coal_products_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_electricity_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_hydrogen_carriers_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_methanol_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_natural_gas_and_derivatives_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_oil_and_oil_products_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry/primary_co2_emissions_of_steam_hot_water_in_industry_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry_chemical_fertilizers_non_energetic_co2.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry_chemical_non_energetic_co2_emissions.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/industry_chemical_other_non_energetic_co2.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/initial_co2_emissions_of_imported_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_agriculture.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_buildings.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_bunkers.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_delayed_emissions.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_energy.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_households.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_industry.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_non_energetic.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_other.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_emission_of_transport.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_coal_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_imported_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_imported_hydrogen.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_natural_gas_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_non_energetic_and_delayed_emissions.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_oil_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/primary_co2_of_total.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/relative_primary_co2_of_coal_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/relative_primary_co2_of_imported_electricity.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/relative_primary_co2_of_imported_hydrogen.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/relative_primary_co2_of_natural_gas_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/relative_primary_co2_of_oil_and_derivatives.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/total_co2_emissions.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/total_local_co2_emissions.gql (100%) rename gqueries/general/{ => emissions/primary_emissions}/co2/total_net_co2_emissions.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_molecules_export.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_molecules_offshore_sequestration.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_molecules_other_utilisation_delayed_emitted.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_molecules_other_utilisation_delayed_indefinitely.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_production_synthetic_methanol_emitted.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/demand/emissions_production_synthetic_methanol_utilised.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_delayed_emitted_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_agriculture_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_agriculture_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_all_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_all_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_buildings_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_energy_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_households_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_industry_chemical_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_industry_energy_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_industry_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_other_industry_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_energetic_transport_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_indirect_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_fermentation_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_manure_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_manure_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_other_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_soil_cultivation_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_agriculture_soil_cultivation_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_all_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_all_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_industry_chemical_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_industry_chemical_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_industry_waste_management_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_industry_waste_management_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_other_industry_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_non_energetic_other_industry_other_ghg.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/emissions_overview_energetic_agriculture_co2.gql (100%) create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql create mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql rename gqueries/general/emissions/{ => primary_emissions}/emissions_total.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/DAC/emissions_captured_direct_air_capture_co2.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/emissions_captured_biogenic_total.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/emissions_captured_total.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/emissions_captured_total_excluding_import.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/hydrogen/emissions_captured_hydrogen_autothermal_reformer.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/hydrogen/emissions_captured_hydrogen_biomass_gasification.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/hydrogen/emissions_captured_hydrogen_steam_methane_reformer.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/hydrogen/emissions_captured_hydrogen_total.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/import/emissions_captured_import_co2_backup.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/import/emissions_captured_import_co2_baseload.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/import/emissions_captured_import_co2_total.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_chemicals_fertilizers.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_chemicals_other.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_chemicals_refineries.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_external_coupling.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_other.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_other_food.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_other_paper.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_steel.gql (100%) rename gqueries/general/emissions/{ => primary_emissions}/supply/industry/emissions_captured_industry_total.gql (100%) create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql create mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql diff --git a/gqueries/general/co2/average_co2_emissions_of_imported_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/average_co2_emissions_of_imported_electricity.gql similarity index 100% rename from gqueries/general/co2/average_co2_emissions_of_imported_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/average_co2_emissions_of_imported_electricity.gql diff --git a/gqueries/general/co2/average_co2_emissions_of_produced_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/average_co2_emissions_of_produced_electricity.gql similarity index 100% rename from gqueries/general/co2/average_co2_emissions_of_produced_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/average_co2_emissions_of_produced_electricity.gql diff --git a/gqueries/general/co2/co2_emissions_1990.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_1990.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_1990.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_1990.gql diff --git a/gqueries/general/co2/co2_emissions_bunkers_1990.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_bunkers_1990.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_bunkers_1990.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_bunkers_1990.gql diff --git a/gqueries/general/co2/co2_emissions_of_imported_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_imported_electricity.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_of_imported_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_imported_electricity.gql diff --git a/gqueries/general/co2/co2_emissions_of_produced_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_produced_electricity.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_of_produced_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_produced_electricity.gql diff --git a/gqueries/general/co2/co2_emissions_of_used_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_used_electricity.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_of_used_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_of_used_electricity.gql diff --git a/gqueries/general/co2/co2_emissions_produced_abroad_consumed_local.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_produced_abroad_consumed_local.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_produced_abroad_consumed_local.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_produced_abroad_consumed_local.gql diff --git a/gqueries/general/co2/co2_emissions_produced_local_consumed_abroad.gql b/gqueries/general/emissions/primary_emissions/co2/co2_emissions_produced_local_consumed_abroad.gql similarity index 100% rename from gqueries/general/co2/co2_emissions_produced_local_consumed_abroad.gql rename to gqueries/general/emissions/primary_emissions/co2/co2_emissions_produced_local_consumed_abroad.gql diff --git a/gqueries/general/co2/delayed_emissions_co2.gql b/gqueries/general/emissions/primary_emissions/co2/delayed_emissions_co2.gql similarity index 100% rename from gqueries/general/co2/delayed_emissions_co2.gql rename to gqueries/general/emissions/primary_emissions/co2/delayed_emissions_co2.gql diff --git a/gqueries/general/co2/delayed_emissions_emitted_co2.gql b/gqueries/general/emissions/primary_emissions/co2/delayed_emissions_emitted_co2.gql similarity index 100% rename from gqueries/general/co2/delayed_emissions_emitted_co2.gql rename to gqueries/general/emissions/primary_emissions/co2/delayed_emissions_emitted_co2.gql diff --git a/gqueries/general/co2/delayed_emissions_indefinitely_co2.gql b/gqueries/general/emissions/primary_emissions/co2/delayed_emissions_indefinitely_co2.gql similarity index 100% rename from gqueries/general/co2/delayed_emissions_indefinitely_co2.gql rename to gqueries/general/emissions/primary_emissions/co2/delayed_emissions_indefinitely_co2.gql diff --git a/gqueries/general/co2/industry/captured_co2_emissions_in_industry.gql b/gqueries/general/emissions/primary_emissions/co2/industry/captured_co2_emissions_in_industry.gql similarity index 100% rename from gqueries/general/co2/industry/captured_co2_emissions_in_industry.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/captured_co2_emissions_in_industry.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_ammonia_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_ammonia_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_ammonia_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_ammonia_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_biomass_products_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_biomass_products_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_biomass_products_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_biomass_products_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_coal_and_coal_products_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_coal_and_coal_products_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_coal_and_coal_products_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_coal_and_coal_products_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_electricity_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_electricity_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_electricity_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_electricity_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_hydrogen_carriers_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_hydrogen_carriers_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_hydrogen_carriers_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_hydrogen_carriers_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_methanol_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_methanol_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_methanol_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_methanol_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_natural_gas_and_derivatives_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_natural_gas_and_derivatives_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_natural_gas_and_derivatives_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_natural_gas_and_derivatives_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_oil_and_oil_products_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_oil_and_oil_products_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_oil_and_oil_products_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_oil_and_oil_products_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry/primary_co2_emissions_of_steam_hot_water_in_industry_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_steam_hot_water_in_industry_energetic.gql similarity index 100% rename from gqueries/general/co2/industry/primary_co2_emissions_of_steam_hot_water_in_industry_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/industry/primary_co2_emissions_of_steam_hot_water_in_industry_energetic.gql diff --git a/gqueries/general/co2/industry_chemical_fertilizers_non_energetic_co2.gql b/gqueries/general/emissions/primary_emissions/co2/industry_chemical_fertilizers_non_energetic_co2.gql similarity index 100% rename from gqueries/general/co2/industry_chemical_fertilizers_non_energetic_co2.gql rename to gqueries/general/emissions/primary_emissions/co2/industry_chemical_fertilizers_non_energetic_co2.gql diff --git a/gqueries/general/co2/industry_chemical_non_energetic_co2_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/industry_chemical_non_energetic_co2_emissions.gql similarity index 100% rename from gqueries/general/co2/industry_chemical_non_energetic_co2_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/industry_chemical_non_energetic_co2_emissions.gql diff --git a/gqueries/general/co2/industry_chemical_other_non_energetic_co2.gql b/gqueries/general/emissions/primary_emissions/co2/industry_chemical_other_non_energetic_co2.gql similarity index 100% rename from gqueries/general/co2/industry_chemical_other_non_energetic_co2.gql rename to gqueries/general/emissions/primary_emissions/co2/industry_chemical_other_non_energetic_co2.gql diff --git a/gqueries/general/co2/initial_co2_emissions_of_imported_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/initial_co2_emissions_of_imported_electricity.gql similarity index 100% rename from gqueries/general/co2/initial_co2_emissions_of_imported_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/initial_co2_emissions_of_imported_electricity.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_agriculture.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_agriculture.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_agriculture.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_agriculture.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_buildings.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_buildings.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_buildings.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_buildings.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_bunkers.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_bunkers.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_bunkers.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_bunkers.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_delayed_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_delayed_emissions.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_delayed_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_delayed_emissions.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_energy.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_energy.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_energy.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_energy.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_households.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_households.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_households.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_households.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_industry.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_industry.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_industry.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_industry.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_non_energetic.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_non_energetic.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_non_energetic.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_non_energetic.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_other.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_other.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_other.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_other.gql diff --git a/gqueries/general/co2/primary_co2_emission_of_transport.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_transport.gql similarity index 100% rename from gqueries/general/co2/primary_co2_emission_of_transport.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_emission_of_transport.gql diff --git a/gqueries/general/co2/primary_co2_of_coal_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_coal_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_coal_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_coal_and_derivatives.gql diff --git a/gqueries/general/co2/primary_co2_of_imported_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_imported_electricity.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_imported_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_imported_electricity.gql diff --git a/gqueries/general/co2/primary_co2_of_imported_hydrogen.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_imported_hydrogen.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_imported_hydrogen.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_imported_hydrogen.gql diff --git a/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_natural_gas_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_natural_gas_and_derivatives.gql diff --git a/gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_natural_gas_and_derivatives_in_transport.gql diff --git a/gqueries/general/co2/primary_co2_of_non_energetic_and_delayed_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_non_energetic_and_delayed_emissions.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_non_energetic_and_delayed_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_non_energetic_and_delayed_emissions.gql diff --git a/gqueries/general/co2/primary_co2_of_oil_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_oil_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_oil_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_oil_and_derivatives.gql diff --git a/gqueries/general/co2/primary_co2_of_total.gql b/gqueries/general/emissions/primary_emissions/co2/primary_co2_of_total.gql similarity index 100% rename from gqueries/general/co2/primary_co2_of_total.gql rename to gqueries/general/emissions/primary_emissions/co2/primary_co2_of_total.gql diff --git a/gqueries/general/co2/relative_primary_co2_of_coal_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_coal_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/relative_primary_co2_of_coal_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_coal_and_derivatives.gql diff --git a/gqueries/general/co2/relative_primary_co2_of_imported_electricity.gql b/gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_imported_electricity.gql similarity index 100% rename from gqueries/general/co2/relative_primary_co2_of_imported_electricity.gql rename to gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_imported_electricity.gql diff --git a/gqueries/general/co2/relative_primary_co2_of_imported_hydrogen.gql b/gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_imported_hydrogen.gql similarity index 100% rename from gqueries/general/co2/relative_primary_co2_of_imported_hydrogen.gql rename to gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_imported_hydrogen.gql diff --git a/gqueries/general/co2/relative_primary_co2_of_natural_gas_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_natural_gas_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/relative_primary_co2_of_natural_gas_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_natural_gas_and_derivatives.gql diff --git a/gqueries/general/co2/relative_primary_co2_of_oil_and_derivatives.gql b/gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_oil_and_derivatives.gql similarity index 100% rename from gqueries/general/co2/relative_primary_co2_of_oil_and_derivatives.gql rename to gqueries/general/emissions/primary_emissions/co2/relative_primary_co2_of_oil_and_derivatives.gql diff --git a/gqueries/general/co2/total_co2_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/total_co2_emissions.gql similarity index 100% rename from gqueries/general/co2/total_co2_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/total_co2_emissions.gql diff --git a/gqueries/general/co2/total_local_co2_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/total_local_co2_emissions.gql similarity index 100% rename from gqueries/general/co2/total_local_co2_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/total_local_co2_emissions.gql diff --git a/gqueries/general/co2/total_net_co2_emissions.gql b/gqueries/general/emissions/primary_emissions/co2/total_net_co2_emissions.gql similarity index 100% rename from gqueries/general/co2/total_net_co2_emissions.gql rename to gqueries/general/emissions/primary_emissions/co2/total_net_co2_emissions.gql diff --git a/gqueries/general/emissions/demand/emissions_molecules_export.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_molecules_export.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_molecules_export.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_molecules_export.gql diff --git a/gqueries/general/emissions/demand/emissions_molecules_offshore_sequestration.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_molecules_offshore_sequestration.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_molecules_offshore_sequestration.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_molecules_offshore_sequestration.gql diff --git a/gqueries/general/emissions/demand/emissions_molecules_other_utilisation_delayed_emitted.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_molecules_other_utilisation_delayed_emitted.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_molecules_other_utilisation_delayed_emitted.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_molecules_other_utilisation_delayed_emitted.gql diff --git a/gqueries/general/emissions/demand/emissions_molecules_other_utilisation_delayed_indefinitely.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_molecules_other_utilisation_delayed_indefinitely.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_molecules_other_utilisation_delayed_indefinitely.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_molecules_other_utilisation_delayed_indefinitely.gql diff --git a/gqueries/general/emissions/demand/emissions_production_synthetic_methanol_emitted.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_production_synthetic_methanol_emitted.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_production_synthetic_methanol_emitted.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_production_synthetic_methanol_emitted.gql diff --git a/gqueries/general/emissions/demand/emissions_production_synthetic_methanol_utilised.gql b/gqueries/general/emissions/primary_emissions/demand/emissions_production_synthetic_methanol_utilised.gql similarity index 100% rename from gqueries/general/emissions/demand/emissions_production_synthetic_methanol_utilised.gql rename to gqueries/general/emissions/primary_emissions/demand/emissions_production_synthetic_methanol_utilised.gql diff --git a/gqueries/general/emissions/emissions_delayed_emitted_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_delayed_emitted_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_delayed_emitted_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_delayed_emitted_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_agriculture_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_agriculture_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_agriculture_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_agriculture_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_agriculture_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_agriculture_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_agriculture_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_agriculture_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_all_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_all_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_all_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_all_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_all_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_all_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_all_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_all_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_buildings_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_buildings_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_buildings_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_buildings_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_energy_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_energy_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_energy_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_energy_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_households_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_households_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_households_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_households_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_industry_chemical_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_industry_chemical_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_industry_chemical_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_industry_chemical_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_industry_energy_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_industry_energy_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_industry_energy_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_industry_energy_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_industry_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_industry_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_industry_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_industry_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_energetic_other_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_other_industry_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_other_industry_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_other_industry_co2.gql diff --git a/gqueries/general/emissions/emissions_energetic_transport_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_energetic_transport_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_energetic_transport_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_energetic_transport_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_indirect_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_indirect_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_indirect_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_indirect_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_fermentation_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_fermentation_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_fermentation_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_fermentation_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_manure_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_manure_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_manure_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_manure_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_manure_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_manure_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_manure_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_manure_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_other_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_other_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_other_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_other_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_soil_cultivation_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_soil_cultivation_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_soil_cultivation_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_soil_cultivation_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_agriculture_soil_cultivation_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_soil_cultivation_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_agriculture_soil_cultivation_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_agriculture_soil_cultivation_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_all_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_all_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_all_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_all_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_all_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_all_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_all_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_all_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_industry_chemical_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_chemical_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_industry_chemical_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_chemical_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_industry_chemical_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_chemical_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_industry_chemical_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_chemical_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_industry_waste_management_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_waste_management_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_industry_waste_management_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_waste_management_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_industry_waste_management_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_waste_management_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_industry_waste_management_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_industry_waste_management_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_other_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_other_industry_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_other_industry_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_other_industry_co2.gql diff --git a/gqueries/general/emissions/emissions_non_energetic_other_industry_other_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_non_energetic_other_industry_other_ghg.gql similarity index 100% rename from gqueries/general/emissions/emissions_non_energetic_other_industry_other_ghg.gql rename to gqueries/general/emissions/primary_emissions/emissions_non_energetic_other_industry_other_ghg.gql diff --git a/gqueries/general/emissions/emissions_overview_energetic_agriculture_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_co2.gql similarity index 100% rename from gqueries/general/emissions/emissions_overview_energetic_agriculture_co2.gql rename to gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_co2.gql diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql new file mode 100644 index 0000000000..d4605225aa --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(emissions_energetic_agriculture_other_ghg), + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql new file mode 100644 index 0000000000..268b9f1695 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(co2_sheet_buildings_households_total_co2_emissions_only_energetic) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql new file mode 100644 index 0000000000..1f6f0baa0b --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(emissions_energetic_households_other_ghg), + Q(emissions_energetic_buildings_other_ghg) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql new file mode 100644 index 0000000000..86aa8f38f2 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql @@ -0,0 +1,8 @@ +- query = + SUM( + Q(emissions_energetic_industry_chemical_co2), + Q(emissions_energetic_industry_energy_co2), + Q(emissions_energetic_other_industry_co2) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql new file mode 100644 index 0000000000..99eec82c1f --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(emissions_energetic_industry_energy_other_ghg), + Q(emissions_energetic_other_industry_other_ghg) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql new file mode 100644 index 0000000000..468c2587e9 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(co2_sheet_transport_total_co2_emissions_only_energetic) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql new file mode 100644 index 0000000000..931029c345 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql @@ -0,0 +1,6 @@ +- query = + SUM( + Q(co2_sheet_transport_other_ghg_emissions) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql new file mode 100644 index 0000000000..aabfa6978b --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(emissions_non_energetic_soil_cultivation_co2), + Q(emissions_non_energetic_manure_co2) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql new file mode 100644 index 0000000000..9f91bfab39 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(emissions_non_energetic_soil_cultivation_other_ghg), + Q(emissions_non_energetic_manure_other_ghg) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql new file mode 100644 index 0000000000..61c342515e --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql @@ -0,0 +1,8 @@ +- query = + SUM( + Q(emissions_non_energetic_other_industry_co2), + Q(emissions_non_energetic_industry_waste_management_co2), + Q(emissions_non_energetic_industry_chemical_co2) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql new file mode 100644 index 0000000000..57ca0b9014 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql @@ -0,0 +1,8 @@ +- query = + SUM( + Q(emissions_non_energetic_other_industry_other_ghg), + Q(emissions_non_energetic_industry_chemical_other_ghg), + Q(emissions_non_energetic_industry_waste_management_other_ghg) + ) + +- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/emissions_total.gql b/gqueries/general/emissions/primary_emissions/emissions_total.gql similarity index 100% rename from gqueries/general/emissions/emissions_total.gql rename to gqueries/general/emissions/primary_emissions/emissions_total.gql diff --git a/gqueries/general/emissions/supply/DAC/emissions_captured_direct_air_capture_co2.gql b/gqueries/general/emissions/primary_emissions/supply/DAC/emissions_captured_direct_air_capture_co2.gql similarity index 100% rename from gqueries/general/emissions/supply/DAC/emissions_captured_direct_air_capture_co2.gql rename to gqueries/general/emissions/primary_emissions/supply/DAC/emissions_captured_direct_air_capture_co2.gql diff --git a/gqueries/general/emissions/supply/emissions_captured_biogenic_total.gql b/gqueries/general/emissions/primary_emissions/supply/emissions_captured_biogenic_total.gql similarity index 100% rename from gqueries/general/emissions/supply/emissions_captured_biogenic_total.gql rename to gqueries/general/emissions/primary_emissions/supply/emissions_captured_biogenic_total.gql diff --git a/gqueries/general/emissions/supply/emissions_captured_total.gql b/gqueries/general/emissions/primary_emissions/supply/emissions_captured_total.gql similarity index 100% rename from gqueries/general/emissions/supply/emissions_captured_total.gql rename to gqueries/general/emissions/primary_emissions/supply/emissions_captured_total.gql diff --git a/gqueries/general/emissions/supply/emissions_captured_total_excluding_import.gql b/gqueries/general/emissions/primary_emissions/supply/emissions_captured_total_excluding_import.gql similarity index 100% rename from gqueries/general/emissions/supply/emissions_captured_total_excluding_import.gql rename to gqueries/general/emissions/primary_emissions/supply/emissions_captured_total_excluding_import.gql diff --git a/gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_autothermal_reformer.gql b/gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_autothermal_reformer.gql similarity index 100% rename from gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_autothermal_reformer.gql rename to gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_autothermal_reformer.gql diff --git a/gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_biomass_gasification.gql b/gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_biomass_gasification.gql similarity index 100% rename from gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_biomass_gasification.gql rename to gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_biomass_gasification.gql diff --git a/gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_steam_methane_reformer.gql b/gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_steam_methane_reformer.gql similarity index 100% rename from gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_steam_methane_reformer.gql rename to gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_steam_methane_reformer.gql diff --git a/gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_total.gql b/gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_total.gql similarity index 100% rename from gqueries/general/emissions/supply/hydrogen/emissions_captured_hydrogen_total.gql rename to gqueries/general/emissions/primary_emissions/supply/hydrogen/emissions_captured_hydrogen_total.gql diff --git a/gqueries/general/emissions/supply/import/emissions_captured_import_co2_backup.gql b/gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_backup.gql similarity index 100% rename from gqueries/general/emissions/supply/import/emissions_captured_import_co2_backup.gql rename to gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_backup.gql diff --git a/gqueries/general/emissions/supply/import/emissions_captured_import_co2_baseload.gql b/gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_baseload.gql similarity index 100% rename from gqueries/general/emissions/supply/import/emissions_captured_import_co2_baseload.gql rename to gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_baseload.gql diff --git a/gqueries/general/emissions/supply/import/emissions_captured_import_co2_total.gql b/gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_total.gql similarity index 100% rename from gqueries/general/emissions/supply/import/emissions_captured_import_co2_total.gql rename to gqueries/general/emissions/primary_emissions/supply/import/emissions_captured_import_co2_total.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_fertilizers.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_fertilizers.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_fertilizers.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_fertilizers.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_other.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_other.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_other.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_other.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_refineries.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_refineries.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_chemicals_refineries.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_chemicals_refineries.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_external_coupling.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_external_coupling.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_external_coupling.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_external_coupling.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_other.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_other.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_other_food.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other_food.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_other_food.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other_food.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_other_paper.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other_paper.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_other_paper.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_other_paper.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_steel.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_steel.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_steel.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_steel.gql diff --git a/gqueries/general/emissions/supply/industry/emissions_captured_industry_total.gql b/gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_total.gql similarity index 100% rename from gqueries/general/emissions/supply/industry/emissions_captured_industry_total.gql rename to gqueries/general/emissions/primary_emissions/supply/industry/emissions_captured_industry_total.gql diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql new file mode 100644 index 0000000000..92f0bc102d --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql @@ -0,0 +1,2 @@ +- query = DIVIDE(MV(energy_chp_ht_wood_pellets_ccs_captured_co2,demand),1000) +- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql new file mode 100644 index 0000000000..2438a072e1 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql @@ -0,0 +1,2 @@ +- query = DIVIDE(MV(energy_chp_mt_wood_pellets_ccs_captured_co2,demand),1000) +- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql new file mode 100644 index 0000000000..c34a3eb860 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql @@ -0,0 +1,2 @@ +- query = DIVIDE(MV(energy_power_wood_pellets_ccs_captured_co2,demand),1000) +- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql new file mode 100644 index 0000000000..0403df74ce --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql @@ -0,0 +1,7 @@ +- query = + SUM( + Q(emissions_captured_energy_chp_ht_wood_pellets) + Q(emissions_captured_energy_chp_mt_wood_pellets), + Q(emissions_captured_energy_chp_power_wood_pellets) + ) +- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql new file mode 100644 index 0000000000..0d7fb21f45 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql @@ -0,0 +1,3 @@ +- query = + Q(emssions_captured_power_total) - Q(emissions_captured_power_biogenic) +- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql new file mode 100644 index 0000000000..504e8981e8 --- /dev/null +++ b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql @@ -0,0 +1,2 @@ +- query = DIVIDE(MV(energy_power_captured_co2,demand),1000) +- unit = tonne \ No newline at end of file From 99006497f58d7d06c9c93b5ed25a433f4f03da2a Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 9 Jun 2026 10:40:29 +0200 Subject: [PATCH 02/26] Direct emissions queries for chart --- ...ct_emissions_indirect_emissions_total_ghg.gql | 11 +++++++++++ .../direct_emissions_agriculture_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_buildings_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_bunkers_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_energy_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_households_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_industry_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_lulucf_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_other_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_transport_total_ghg.gql | 15 +++++++++++++++ .../direct_emissions_waste_total_ghg.gql | 15 +++++++++++++++ ...hg_excl_indirect_emissions_lulucf_bunkers.gql | 10 ++++++++++ ...cl_indirect_emissions_excl_lulucf_bunkers.gql | 9 +++++++++ ...hg_incl_indirect_emissions_lulucf_bunkers.gql | 16 ++++++++++++++++ ...cl_indirect_emissions_lulucf_excl_bunkers.gql | 8 ++++++++ ...cl_lulucf_excl_indirect_emissions_bunkers.gql | 9 +++++++++ ...ture_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...ings_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...kers_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...ergy_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...olds_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...stry_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...lucf_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...ther_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...tal_ghg_future_for_direct_emissions_chart.gql | 2 ++ ...al_ghg_present_for_direct_emissions_chart.gql | 2 ++ ...port_total_ghg_for_direct_emissions_chart.gql | 2 ++ ...aste_total_ghg_for_direct_emissions_chart.gql | 2 ++ 28 files changed, 237 insertions(+) create mode 100644 gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql diff --git a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql new file mode 100644 index 0000000000..dfe04042bb --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql @@ -0,0 +1,11 @@ +- unit = mt +- query = + DIVIDE( + SUM( + MV( + MG(emissions_other_indirect_emissions), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql new file mode 100644 index 0000000000..43f689bf57 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_agriculture), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_agriculture), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql new file mode 100644 index 0000000000..457b7257f3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_buildings), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_buildings), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql new file mode 100644 index 0000000000..ab083059b8 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_bunkers), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_bunkers), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql new file mode 100644 index 0000000000..8c5bcf36ff --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_energy), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_energy), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql new file mode 100644 index 0000000000..1a5ba343b7 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_households), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_households), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql new file mode 100644 index 0000000000..8d8f7cf415 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_industry), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_industry), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql new file mode 100644 index 0000000000..06d91653c3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_lulucf), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_lulucf), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql new file mode 100644 index 0000000000..78bca021c3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_other), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_other), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql new file mode 100644 index 0000000000..83e3bb5a7a --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_transport), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_transport), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql new file mode 100644 index 0000000000..067489d5c5 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql @@ -0,0 +1,15 @@ +- unit = mt +- query = + DIVIDE( + SUM( + V( + G(emissions_waste), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MG(emissions_waste), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..1d6c57f94e --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,10 @@ +# Total GHG emissions excl. indirect emissions, LULUCF and international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_indirect_emissions_total_ghg)), + NEG(Q(direct_emissions_lulucf_total_ghg)), + NEG(Q(direct_emissions_bunkers_total_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql new file mode 100644 index 0000000000..f2bd3bb220 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql @@ -0,0 +1,9 @@ +# Total GHG emissions incl. indirect emissions, excl. LULUCF and international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_lulucf_total_ghg)), + NEG(Q(direct_emissions_bunkers_total_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..3b057636a4 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,16 @@ +# Total GHG emissions incl. indirect emissions, LULUCF and international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_energy_total_ghg), + Q(direct_emissions_industry_total_ghg), + Q(direct_emissions_transport_total_ghg), + Q(direct_emissions_buildings_total_ghg), + Q(direct_emissions_households_total_ghg), + Q(direct_emissions_agriculture_total_ghg), + Q(direct_emissions_other_total_ghg), + Q(direct_emissions_lulucf_total_ghg), + Q(direct_emissions_waste_total_ghg), + Q(direct_emissions_bunkers_total_ghg) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql new file mode 100644 index 0000000000..ad9395fc0a --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql @@ -0,0 +1,8 @@ +# Total GHG emissions incl. indirect emissions and LULUCF, excl. international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_bunkers_total_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql new file mode 100644 index 0000000000..93505e20c4 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql @@ -0,0 +1,9 @@ +# Total GHG emissions incl. LULUCF, excl indirect emissions and international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_indirect_emissions_total_ghg)), + NEG(Q(direct_emissions_bunkers_total_ghg)) + ) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..e124c52efd --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_agriculture_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..b822250b7b --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_buildings_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..2fb5cb5a73 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_bunkers_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..e9f9e487a1 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_energy_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..2556105056 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_households_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..ffe9b3c1e2 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_industry_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..7efaf15e6e --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_lulucf_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..abfad38c70 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_other_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..c7f85cd5af --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = future:Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..9a747a6ad7 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = present:Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..9cefa7ac66 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_transport_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..ea43ecf1b2 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_waste_total_ghg) From 199a301a4eba55c46b76f7d021e9da1d54e38c73 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 9 Jun 2026 16:03:47 +0200 Subject: [PATCH 03/26] Add MT query for total GHG emissions --- ..._incl_indirect_emissions_lulucf_bunkers.gql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..23c100bbc4 --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,18 @@ +# Mechanical turk query for total GHG emissions incl. indirect, LULUCF and international transport +# Sums results for all energy and molecule nodes + +- unit = mt +- query = + DIVIDE( + SUM( + V( + ALL(), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MALL(), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) From 64c893e503b3f818c24f1810958a9e74532fb54e Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 9 Jun 2026 16:44:44 +0200 Subject: [PATCH 04/26] Add 1990 emissions to emissions.csv files --- Gemfile.lock | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index e8980f9f43..68246a2c6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,6 +29,18 @@ GIT specs: rubel (0.1.1) +PATH + remote: ../atlas + specs: + atlas (1.0.0) + activemodel (>= 7) + activesupport (>= 7) + csv (>= 3) + gpgme (~> 2.0) + ostruct + turbine-graph (>= 0.1) + virtus (~> 1.0) + GEM remote: https://rubygems.org/ specs: From 114631625f587d77026d4bb15017ac824178a07e Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 11 Jun 2026 10:08:38 +0200 Subject: [PATCH 05/26] 1990 emission queries energy sector --- .../per_sector_1990/direct_emissions_energy_co2_1990.gql | 9 +++++++++ .../direct_emissions_energy_other_ghg_1990.gql | 9 +++++++++ .../direct_emissions_energy_total_ghg_1990.gql | 6 ++++++ ..._energy_total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ 4 files changed, 26 insertions(+) create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql new file mode 100644 index 0000000000..ddfb4999c6 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(energy, energetic, co2, 1990), + EMISSIONS(energy, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql new file mode 100644 index 0000000000..dfb37ffe00 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(energy, energetic, other_ghg, 1990), + EMISSIONS(energy, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql new file mode 100644 index 0000000000..92a0a9a047 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_energy_co2_1990), + Q(direct_emissions_energy_other_ghg_1990) + ) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..93675b7658 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_energy_total_ghg_1990) From aa6efaf56ed18a8c726602bf349451cb250fdb87 Mon Sep 17 00:00:00 2001 From: robindesmit-quintel Date: Thu, 11 Jun 2026 13:24:53 +0200 Subject: [PATCH 06/26] Add queries for the direct GHG emmisions per sector --- .../direct_emissions_agriculture_co2_1990.gql | 9 +++++++++ ...rect_emissions_agriculture_other_ghg_1990.gql | 9 +++++++++ ...rect_emissions_agriculture_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_buildings_co2_1990.gql | 9 +++++++++ ...direct_emissions_buildings_other_ghg_1990.gql | 9 +++++++++ ...direct_emissions_buildings_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_bunkers_co2_1990.gql | 11 +++++++++++ .../direct_emissions_bunkers_other_ghg_1990.gql | 11 +++++++++++ .../direct_emissions_bunkers_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_households_co2_1990.gql | 9 +++++++++ ...irect_emissions_households_other_ghg_1990.gql | 9 +++++++++ ...irect_emissions_households_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_industry_co2_1990.gql | 9 +++++++++ .../direct_emissions_industry_other_ghg_1990.gql | 9 +++++++++ .../direct_emissions_industry_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_lulucf_co2_1990.gql | 9 +++++++++ .../direct_emissions_lulucf_other_ghg_1990.gql | 9 +++++++++ .../direct_emissions_lulucf_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_other_co2_1990.gql | 9 +++++++++ .../direct_emissions_other_other_ghg_1990.gql | 9 +++++++++ .../direct_emissions_other_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_transport_co2_1990.gql | 9 +++++++++ ...direct_emissions_transport_other_ghg_1990.gql | 9 +++++++++ ...direct_emissions_transport_total_ghg_1990.gql | 6 ++++++ .../direct_emissions_waste_co2_1990.gql | 9 +++++++++ .../direct_emissions_waste_other_ghg_1990.gql | 9 +++++++++ .../direct_emissions_waste_total_ghg_1990.gql | 6 ++++++ .../totals/direct_emissions_total_ghg_1990.gql | 16 ++++++++++++++++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ ...total_ghg_1990_for_direct_emissions_chart.gql | 2 ++ 38 files changed, 256 insertions(+) create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql create mode 100644 gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql new file mode 100644 index 0000000000..08cbe67c63 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(agriculture, energetic, co2, 1990), + EMISSIONS(agriculture, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql new file mode 100644 index 0000000000..234b62ea22 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(agriculture, energetic, other_ghg, 1990), + EMISSIONS(agriculture, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql new file mode 100644 index 0000000000..e34c1e7f0e --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_agriculture_co2_1990), + Q(direct_emissions_agriculture_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql new file mode 100644 index 0000000000..649c6bf6f6 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(buildings, energetic, co2, 1990), + EMISSIONS(buildings, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql new file mode 100644 index 0000000000..2f7943297e --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(buildings, energetic, other_ghg, 1990), + EMISSIONS(buildings, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql new file mode 100644 index 0000000000..a036469d0c --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_buildings_co2_1990), + Q(direct_emissions_buildings_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql new file mode 100644 index 0000000000..f2a14ecb32 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql @@ -0,0 +1,11 @@ +- unit = mt +- query = + DIVIDE( + SUM( + (INPUT_VALUE(bunkers_allocated_percentage_shipping) / 100.0) + * EMISSIONS(bunkers_international_navigation, energetic, co2, 1990), + (INPUT_VALUE(bunkers_allocated_percentage_aviation) / 100.0) + * EMISSIONS(bunkers_international_aviation, energetic, co2, 1990), + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql new file mode 100644 index 0000000000..5fbdcbf9a3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql @@ -0,0 +1,11 @@ +- unit = mt +- query = + DIVIDE( + SUM( + (INPUT_VALUE(bunkers_allocated_percentage_shipping) / 100.0) + * EMISSIONS(bunkers_international_navigation, energetic, other_ghg, 1990), + (INPUT_VALUE(bunkers_allocated_percentage_aviation) / 100.0) + * EMISSIONS(bunkers_international_aviation, energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql new file mode 100644 index 0000000000..1bb6c0a8b0 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_bunkers_co2_1990), + Q(direct_emissions_bunkers_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql new file mode 100644 index 0000000000..30a3ec5e77 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(households, energetic, co2, 1990), + EMISSIONS(households, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql new file mode 100644 index 0000000000..52e6b7b118 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(households, energetic, other_ghg, 1990), + EMISSIONS(households, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql new file mode 100644 index 0000000000..cf22da9f71 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_households_co2_1990), + Q(direct_emissions_households_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql new file mode 100644 index 0000000000..9ddd7e348c --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(industry, energetic, co2, 1990), + EMISSIONS(industry, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql new file mode 100644 index 0000000000..f8a61cef92 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(industry, energetic, other_ghg, 1990), + EMISSIONS(industry, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql new file mode 100644 index 0000000000..b880aca838 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_industry_co2_1990), + Q(direct_emissions_industry_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql new file mode 100644 index 0000000000..0fa108619f --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(lulucf, energetic, co2, 1990), + EMISSIONS(lulucf, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql new file mode 100644 index 0000000000..c053cc4b8b --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(lulucf, energetic, other_ghg, 1990), + EMISSIONS(lulucf, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql new file mode 100644 index 0000000000..ec328816ba --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_lulucf_co2_1990), + Q(direct_emissions_lulucf_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql new file mode 100644 index 0000000000..de3434f262 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(other, energetic, co2, 1990), + EMISSIONS(other, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql new file mode 100644 index 0000000000..fa8655d556 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(other, energetic, other_ghg, 1990), + EMISSIONS(other, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql new file mode 100644 index 0000000000..c24b89a1cf --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_other_co2_1990), + Q(direct_emissions_other_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql new file mode 100644 index 0000000000..3a886181af --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(transport, energetic, co2, 1990), + EMISSIONS(transport, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql new file mode 100644 index 0000000000..64f08226f1 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(transport, energetic, other_ghg, 1990), + EMISSIONS(transport, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql new file mode 100644 index 0000000000..50c1b238e7 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_transport_co2_1990), + Q(direct_emissions_transport_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql new file mode 100644 index 0000000000..c8c35e61a6 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(waste, energetic, co2, 1990), + EMISSIONS(waste, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql new file mode 100644 index 0000000000..4a305eafc3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(waste, energetic, other_ghg, 1990), + EMISSIONS(waste, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql new file mode 100644 index 0000000000..8a75df5d2e --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + SUM( + Q(direct_emissions_waste_co2_1990), + Q(direct_emissions_waste_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql new file mode 100644 index 0000000000..9185a83f00 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql @@ -0,0 +1,16 @@ +# Total GHG emissions incl. indirect emissions, LULUCF and international transport + +- unit = mt +- query = + SUM( + Q(direct_emissions_energy_total_ghg_1990), + Q(direct_emissions_industry_total_ghg_1990), + Q(direct_emissions_transport_total_ghg_1990), + Q(direct_emissions_buildings_total_ghg_1990), + Q(direct_emissions_households_total_ghg_1990), + Q(direct_emissions_agriculture_total_ghg_1990), + Q(direct_emissions_other_total_ghg_1990), + Q(direct_emissions_lulucf_total_ghg_1990), + Q(direct_emissions_waste_total_ghg_1990), + Q(direct_emissions_bunkers_total_ghg_1990) + ) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..35e141ecf2 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_agriculture_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..2337988eb6 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_buildings_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..6567f913a0 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_bunkers_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..f5900b67c8 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_households_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..3b86fca8a7 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_industry_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..37262126d6 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_lulucf_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..0adee77226 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_other_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..594a1d4207 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..9fc1882a53 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_transport_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql new file mode 100644 index 0000000000..fef7274393 --- /dev/null +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql @@ -0,0 +1,2 @@ +- unit = mt +- query = Q(direct_emissions_waste_total_ghg_1990) From 17932e5d5cf997b960a3c7e71f568c24ffd0d1c8 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 11 Jun 2026 16:40:14 +0200 Subject: [PATCH 07/26] Queries for MT test --- .../direct_emissions_bunkers_co2_1990.gql | 2 +- .../direct_emissions_lulucf_co2_1990.gql | 6 ++- ...direct_emissions_lulucf_other_ghg_1990.gql | 1 - .../totals/direct_emissions_co2_1990.gql | 16 +++++++ .../direct_emissions_other_ghg_1990.gql | 16 +++++++ .../direct_emissions_total_ghg_1990.gql | 2 +- .../turk_direct_emissions_co2_1990.gql | 42 +++++++++++++++++++ .../turk_direct_emissions_other_ghg_1990.gql | 39 +++++++++++++++++ .../turk_direct_emissions_total_ghg_1990.gql | 8 ++++ 9 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql index f2a14ecb32..ccd05b2520 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql @@ -5,7 +5,7 @@ (INPUT_VALUE(bunkers_allocated_percentage_shipping) / 100.0) * EMISSIONS(bunkers_international_navigation, energetic, co2, 1990), (INPUT_VALUE(bunkers_allocated_percentage_aviation) / 100.0) - * EMISSIONS(bunkers_international_aviation, energetic, co2, 1990), + * EMISSIONS(bunkers_international_aviation, energetic, co2, 1990) ), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql index 0fa108619f..3c1c70230a 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql @@ -1,9 +1,11 @@ +# LULUCF removals should be handled as negative CO2 emissions + - unit = mt - query = DIVIDE( SUM( - EMISSIONS(lulucf, energetic, co2, 1990), - EMISSIONS(lulucf, non_energetic, co2, 1990) + EMISSIONS(lulucf_emissions, non_energetic, co2, 1990), + NEG(EMISSIONS(lulucf_removals, non_energetic, co2, 1990)) ), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql index c053cc4b8b..11186cf775 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql @@ -2,7 +2,6 @@ - query = DIVIDE( SUM( - EMISSIONS(lulucf, energetic, other_ghg, 1990), EMISSIONS(lulucf, non_energetic, other_ghg, 1990) ), THOUSANDS diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql new file mode 100644 index 0000000000..ad1ac75ee0 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql @@ -0,0 +1,16 @@ +# Total CO2 emissions incl. indirect emissions, LULUCF and international transport for 1990 + +- unit = mt +- query = + SUM( + Q(direct_emissions_energy_co2_1990), + Q(direct_emissions_industry_co2_1990), + Q(direct_emissions_transport_co2_1990), + Q(direct_emissions_buildings_co2_1990), + Q(direct_emissions_households_co2_1990), + Q(direct_emissions_agriculture_co2_1990), + Q(direct_emissions_other_co2_1990), + Q(direct_emissions_lulucf_co2_1990), + Q(direct_emissions_waste_co2_1990), + Q(direct_emissions_bunkers_co2_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql new file mode 100644 index 0000000000..c74f517afc --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql @@ -0,0 +1,16 @@ +# Total other GHG emissions incl. indirect emissions, LULUCF and international transport for 1990 + +- unit = mt +- query = + SUM( + Q(direct_emissions_energy_other_ghg_1990), + Q(direct_emissions_industry_other_ghg_1990), + Q(direct_emissions_transport_other_ghg_1990), + Q(direct_emissions_buildings_other_ghg_1990), + Q(direct_emissions_households_other_ghg_1990), + Q(direct_emissions_agriculture_other_ghg_1990), + Q(direct_emissions_other_other_ghg_1990), + Q(direct_emissions_lulucf_other_ghg_1990), + Q(direct_emissions_waste_other_ghg_1990), + Q(direct_emissions_bunkers_other_ghg_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql index 9185a83f00..0aaa3a8fd0 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql @@ -1,4 +1,4 @@ -# Total GHG emissions incl. indirect emissions, LULUCF and international transport +# Total GHG emissions incl. indirect emissions, LULUCF and international transport for 1990 - unit = mt - query = diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql new file mode 100644 index 0000000000..7cca6c919b --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql @@ -0,0 +1,42 @@ +# Mechanical turk query for 1990 CO2 emissions +# Sums all co2 values for 1990 from emissions.csv +# Bunkers is handled separately as the result depends on the set input for bunkers + +- unit = mt +- query = + SUM( + DIVIDE( + SUM( + EMISSIONS(agriculture_non_specified, energetic, co2, 1990), + EMISSIONS(agriculture_non_specified, non_energetic, co2, 1990), + EMISSIONS(buildings_non_specified, energetic, co2, 1990), + EMISSIONS(energy_ccus, non_energetic, co2, 1990), + EMISSIONS(energy_electricity_and_heat_production, energetic, co2, 1990), + EMISSIONS(energy_fuels_production, energetic, co2, 1990), + EMISSIONS(energy_fugitive_emissions, non_energetic, co2, 1990), + EMISSIONS(energy_hydrogen_production, non_energetic, co2, 1990), + EMISSIONS(energy_methanol_production, non_energetic, co2, 1990), + EMISSIONS(households_non_specified, energetic, co2, 1990), + EMISSIONS(industry_aluminium, non_energetic, co2, 1990), + EMISSIONS(industry_chemicals, non_energetic, co2, 1990), + EMISSIONS(industry_fertilizers, non_energetic, co2, 1990), + EMISSIONS(industry_food, non_energetic, co2, 1990), + EMISSIONS(industry_non_specified, energetic, co2, 1990), + EMISSIONS(industry_other_metals, non_energetic, co2, 1990), + EMISSIONS(industry_other, non_energetic, co2, 1990), + EMISSIONS(industry_paper, non_energetic, co2, 1990), + EMISSIONS(industry_refineries, energetic, co2, 1990), + EMISSIONS(industry_refineries, non_energetic, co2, 1990), + EMISSIONS(industry_steel, non_energetic, co2, 1990), + EMISSIONS(lulucf_emissions, non_energetic, co2, 1990), + NEG(EMISSIONS(lulucf_removals, non_energetic, co2, 1990)), + EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), + EMISSIONS(other_non_specified, energetic, co2, 1990), + EMISSIONS(other_other_transportation, energetic, co2, 1990), + EMISSIONS(transport_non_specified, energetic, co2, 1990), + EMISSIONS(waste_non_specified, non_energetic, co2, 1990) + ), + THOUSANDS + ), + Q(direct_emissions_bunkers_co2_1990) + ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql new file mode 100644 index 0000000000..e57bf3d31a --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql @@ -0,0 +1,39 @@ +# Mechanical turk query for 1990 other GHG emissions +# Sums all other_ghg values for 1990 from emissions.csv +# Bunkers is handled separately as the result depends on the set input for bunkers + +- unit = mt +- query = + SUM( + DIVIDE( + SUM( + EMISSIONS(agriculture_non_specified, energetic, other_ghg, 1990), + EMISSIONS(agriculture_non_specified, non_energetic, other_ghg, 1990), + EMISSIONS(buildings_non_specified, energetic, other_ghg, 1990), + EMISSIONS(energy_electricity_and_heat_production, energetic, other_ghg, 1990), + EMISSIONS(energy_fuels_production, energetic, other_ghg, 1990), + EMISSIONS(energy_fugitive_emissions, non_energetic, other_ghg, 1990), + EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 1990), + EMISSIONS(energy_methanol_production, non_energetic, other_ghg, 1990), + EMISSIONS(households_non_specified, energetic, other_ghg, 1990), + EMISSIONS(industry_aluminium, non_energetic, other_ghg, 1990), + EMISSIONS(industry_chemicals, non_energetic, other_ghg, 1990), + EMISSIONS(industry_fertilizers, non_energetic, other_ghg, 1990), + EMISSIONS(industry_food, non_energetic, other_ghg, 1990), + EMISSIONS(industry_non_specified, energetic, other_ghg, 1990), + EMISSIONS(industry_other_metals, non_energetic, other_ghg, 1990), + EMISSIONS(industry_other, non_energetic, other_ghg, 1990), + EMISSIONS(industry_paper, non_energetic, other_ghg, 1990), + EMISSIONS(industry_refineries, energetic, other_ghg, 1990), + EMISSIONS(industry_refineries, non_energetic, other_ghg, 1990), + EMISSIONS(industry_steel, non_energetic, other_ghg, 1990), + EMISSIONS(lulucf_emissions, non_energetic, other_ghg, 1990), + EMISSIONS(other_non_specified, energetic, other_ghg, 1990), + EMISSIONS(other_other_transportation, energetic, other_ghg, 1990), + EMISSIONS(transport_non_specified, energetic, other_ghg, 1990), + EMISSIONS(waste_non_specified, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ), + Q(direct_emissions_bunkers_other_ghg_1990) + ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql new file mode 100644 index 0000000000..826aa9e4c1 --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql @@ -0,0 +1,8 @@ +# Mechanical turk query for 1990 total GHG emissions + +- unit = mt +- query = + SUM( + Q(turk_direct_emissions_co2_1990), + Q(turk_direct_emissions_other_ghg_1990) + ) From 3918fe7fbb8c4656c1a677d1d8bfdcd530cd3bac Mon Sep 17 00:00:00 2001 From: robindesmit-quintel Date: Thu, 11 Jun 2026 17:29:25 +0200 Subject: [PATCH 08/26] Include the Direct total GHG emissions and its reduction relative 1990. --- ...l_ghg_incl_indirect_emissions_lulucf_bunkers.gql | 3 +-- ...eduction_of_direct_ghg_emissions_versus_1990.gql | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql index 3b057636a4..96e8d5a42b 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -1,6 +1,5 @@ # Total GHG emissions incl. indirect emissions, LULUCF and international transport - -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_energy_total_ghg), diff --git a/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql b/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql new file mode 100644 index 0000000000..616cb0ad42 --- /dev/null +++ b/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql @@ -0,0 +1,13 @@ +- query = + IF( + GRAPH().future?, + -> { + SUM(-1, + (DIVIDE(Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + Q(direct_emissions_total_ghg_1990))) + ) + }, + -> { 0 } + ) + +- unit = factor From 337ec9f2f9311b0b4a88aa82ecbc6e00ea54a3e5 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 16 Jun 2026 16:49:41 +0200 Subject: [PATCH 09/26] Rewrite 1990 queries --- .../direct_emissions_agriculture_co2_1990.gql | 9 +++++++++ .../direct_emissions_buildings_co2_1990.gql | 6 ++++++ .../co2}/direct_emissions_bunkers_co2_1990.gql | 0 .../co2/direct_emissions_energy_co2_1990.gql | 13 +++++++++++++ .../direct_emissions_households_co2_1990.gql | 6 ++++++ .../co2/direct_emissions_industry_co2_1990.gql | 18 ++++++++++++++++++ .../co2}/direct_emissions_lulucf_co2_1990.gql | 0 .../co2/direct_emissions_other_co2_1990.gql | 10 ++++++++++ .../direct_emissions_transport_co2_1990.gql | 6 ++++++ .../co2/direct_emissions_waste_co2_1990.gql | 6 ++++++ ...ct_emissions_agriculture_other_ghg_1990.gql | 9 +++++++++ ...rect_emissions_buildings_other_ghg_1990.gql | 6 ++++++ ...direct_emissions_bunkers_other_ghg_1990.gql | 0 .../direct_emissions_energy_other_ghg_1990.gql | 12 ++++++++++++ ...ect_emissions_households_other_ghg_1990.gql | 6 ++++++ ...irect_emissions_industry_other_ghg_1990.gql | 18 ++++++++++++++++++ .../direct_emissions_lulucf_other_ghg_1990.gql | 6 ++++++ .../direct_emissions_other_other_ghg_1990.gql | 9 +++++++++ ...rect_emissions_transport_other_ghg_1990.gql | 6 ++++++ .../direct_emissions_waste_other_ghg_1990.gql | 6 ++++++ ...ct_emissions_agriculture_total_ghg_1990.gql | 0 ...rect_emissions_buildings_total_ghg_1990.gql | 0 ...direct_emissions_bunkers_total_ghg_1990.gql | 0 .../direct_emissions_energy_total_ghg_1990.gql | 0 ...ect_emissions_households_total_ghg_1990.gql | 0 ...irect_emissions_industry_total_ghg_1990.gql | 0 .../direct_emissions_lulucf_total_ghg_1990.gql | 0 .../direct_emissions_other_total_ghg_1990.gql | 0 ...rect_emissions_transport_total_ghg_1990.gql | 0 .../direct_emissions_waste_total_ghg_1990.gql | 0 .../totals/direct_emissions_co2_1990.gql | 0 .../totals/direct_emissions_other_ghg_1990.gql | 0 .../totals/direct_emissions_total_ghg_1990.gql | 0 .../direct_emissions_agriculture_co2_1990.gql | 9 --------- ...ct_emissions_agriculture_other_ghg_1990.gql | 9 --------- .../direct_emissions_buildings_co2_1990.gql | 9 --------- ...rect_emissions_buildings_other_ghg_1990.gql | 9 --------- .../direct_emissions_energy_co2_1990.gql | 9 --------- .../direct_emissions_energy_other_ghg_1990.gql | 9 --------- .../direct_emissions_households_co2_1990.gql | 9 --------- ...ect_emissions_households_other_ghg_1990.gql | 9 --------- .../direct_emissions_industry_co2_1990.gql | 9 --------- ...irect_emissions_industry_other_ghg_1990.gql | 9 --------- .../direct_emissions_lulucf_other_ghg_1990.gql | 8 -------- .../direct_emissions_other_co2_1990.gql | 9 --------- .../direct_emissions_other_other_ghg_1990.gql | 9 --------- .../direct_emissions_transport_co2_1990.gql | 9 --------- ...rect_emissions_transport_other_ghg_1990.gql | 9 --------- .../direct_emissions_waste_co2_1990.gql | 9 --------- .../direct_emissions_waste_other_ghg_1990.gql | 9 --------- 50 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/co2}/direct_emissions_bunkers_co2_1990.gql (100%) create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/co2}/direct_emissions_lulucf_co2_1990.gql (100%) create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/other_ghg}/direct_emissions_bunkers_other_ghg_1990.gql (100%) create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_agriculture_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_buildings_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_bunkers_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_energy_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_households_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_industry_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_lulucf_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_other_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_transport_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{per_sector_1990 => 1990_emissions/per_sector/total_ghg}/direct_emissions_waste_total_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{ => 1990_emissions}/totals/direct_emissions_co2_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{ => 1990_emissions}/totals/direct_emissions_other_ghg_1990.gql (100%) rename gqueries/general/emissions/direct_emissions/{ => 1990_emissions}/totals/direct_emissions_total_ghg_1990.gql (100%) delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql delete mode 100644 gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql new file mode 100644 index 0000000000..512864c010 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(agriculture_non_specified, energetic, co2, 1990), + EMISSIONS(agriculture_non_specified, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql new file mode 100644 index 0000000000..eb8e859c31 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(buildings_non_specified, energetic, co2, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_co2_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql new file mode 100644 index 0000000000..9db829551f --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql @@ -0,0 +1,13 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(energy_ccus, non_energetic, co2, 1990), + EMISSIONS(energy_electricity_and_heat_production, energetic, co2, 1990), + EMISSIONS(energy_fuels_production, energetic, co2, 1990), + EMISSIONS(energy_fugitive_emissions, non_energetic, co2, 1990), + EMISSIONS(energy_hydrogen_production, non_energetic, co2, 1990), + EMISSIONS(energy_methanol_production, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql new file mode 100644 index 0000000000..b5712f8707 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(households_non_specified, energetic, co2, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql new file mode 100644 index 0000000000..5604dc54ce --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql @@ -0,0 +1,18 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(industry_aluminium, non_energetic, co2, 1990), + EMISSIONS(industry_chemicals, non_energetic, co2, 1990), + EMISSIONS(industry_fertilizers, non_energetic, co2, 1990), + EMISSIONS(industry_food, non_energetic, co2, 1990), + EMISSIONS(industry_non_specified, energetic, co2, 1990), + EMISSIONS(industry_other, non_energetic, co2, 1990), + EMISSIONS(industry_other_metals, non_energetic, co2, 1990), + EMISSIONS(industry_paper, non_energetic, co2, 1990), + EMISSIONS(industry_refineries, energetic, co2, 1990), + EMISSIONS(industry_refineries, non_energetic, co2, 1990), + EMISSIONS(industry_steel, non_energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_co2_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql new file mode 100644 index 0000000000..efabd167c8 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql @@ -0,0 +1,10 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), + EMISSIONS(other_non_specified, energetic, co2, 1990), + EMISSIONS(other_other_transportation, energetic, co2, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql new file mode 100644 index 0000000000..3ab7193b60 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(transport_non_specified, energetic, co2, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql new file mode 100644 index 0000000000..11fd1cb5e4 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(waste_non_specified, non_energetic, co2, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql new file mode 100644 index 0000000000..7d17f2b779 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(agriculture_non_specified, energetic, other_ghg, 1990), + EMISSIONS(agriculture_non_specified, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql new file mode 100644 index 0000000000..4c16f59564 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(buildings_non_specified, energetic, other_ghg, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_other_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql new file mode 100644 index 0000000000..b143da06b1 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql @@ -0,0 +1,12 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(energy_electricity_and_heat_production, energetic, other_ghg, 1990), + EMISSIONS(energy_fuels_production, energetic, other_ghg, 1990), + EMISSIONS(energy_fugitive_emissions, non_energetic, other_ghg, 1990), + EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 1990), + EMISSIONS(energy_methanol_production, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql new file mode 100644 index 0000000000..c1bf453848 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(households_non_specified, energetic, other_ghg, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql new file mode 100644 index 0000000000..7b11ffca03 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql @@ -0,0 +1,18 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(industry_aluminium, non_energetic, other_ghg, 1990), + EMISSIONS(industry_chemicals, non_energetic, other_ghg, 1990), + EMISSIONS(industry_fertilizers, non_energetic, other_ghg, 1990), + EMISSIONS(industry_food, non_energetic, other_ghg, 1990), + EMISSIONS(industry_non_specified, energetic, other_ghg, 1990), + EMISSIONS(industry_other, non_energetic, other_ghg, 1990), + EMISSIONS(industry_other_metals, non_energetic, other_ghg, 1990), + EMISSIONS(industry_paper, non_energetic, other_ghg, 1990), + EMISSIONS(industry_refineries, energetic, other_ghg, 1990), + EMISSIONS(industry_refineries, non_energetic, other_ghg, 1990), + EMISSIONS(industry_steel, non_energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql new file mode 100644 index 0000000000..4895d1a108 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(lulucf_emissions, non_energetic, other_ghg, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql new file mode 100644 index 0000000000..66d8e545bc --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql @@ -0,0 +1,9 @@ +- unit = mt +- query = + DIVIDE( + SUM( + EMISSIONS(other_non_specified, energetic, other_ghg, 1990), + EMISSIONS(other_other_transportation, energetic, other_ghg, 1990) + ), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql new file mode 100644 index 0000000000..c97e6e179b --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(transport_non_specified, energetic, other_ghg, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql new file mode 100644 index 0000000000..0427cef024 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql @@ -0,0 +1,6 @@ +- unit = mt +- query = + DIVIDE( + EMISSIONS(waste_non_specified, non_energetic, other_ghg, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_bunkers_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_co2_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_other_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql deleted file mode 100644 index 08cbe67c63..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(agriculture, energetic, co2, 1990), - EMISSIONS(agriculture, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql deleted file mode 100644 index 234b62ea22..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_agriculture_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(agriculture, energetic, other_ghg, 1990), - EMISSIONS(agriculture, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql deleted file mode 100644 index 649c6bf6f6..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(buildings, energetic, co2, 1990), - EMISSIONS(buildings, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql deleted file mode 100644 index 2f7943297e..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_buildings_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(buildings, energetic, other_ghg, 1990), - EMISSIONS(buildings, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql deleted file mode 100644 index ddfb4999c6..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(energy, energetic, co2, 1990), - EMISSIONS(energy, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql deleted file mode 100644 index dfb37ffe00..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_energy_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(energy, energetic, other_ghg, 1990), - EMISSIONS(energy, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql deleted file mode 100644 index 30a3ec5e77..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(households, energetic, co2, 1990), - EMISSIONS(households, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql deleted file mode 100644 index 52e6b7b118..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_households_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(households, energetic, other_ghg, 1990), - EMISSIONS(households, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql deleted file mode 100644 index 9ddd7e348c..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(industry, energetic, co2, 1990), - EMISSIONS(industry, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql deleted file mode 100644 index f8a61cef92..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_industry_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(industry, energetic, other_ghg, 1990), - EMISSIONS(industry, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql deleted file mode 100644 index 11186cf775..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_lulucf_other_ghg_1990.gql +++ /dev/null @@ -1,8 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(lulucf, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql deleted file mode 100644 index de3434f262..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(other, energetic, co2, 1990), - EMISSIONS(other, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql deleted file mode 100644 index fa8655d556..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_other_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(other, energetic, other_ghg, 1990), - EMISSIONS(other, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql deleted file mode 100644 index 3a886181af..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(transport, energetic, co2, 1990), - EMISSIONS(transport, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql deleted file mode 100644 index 64f08226f1..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_transport_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(transport, energetic, other_ghg, 1990), - EMISSIONS(transport, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql deleted file mode 100644 index c8c35e61a6..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_co2_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(waste, energetic, co2, 1990), - EMISSIONS(waste, non_energetic, co2, 1990) - ), - THOUSANDS - ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql deleted file mode 100644 index 4a305eafc3..0000000000 --- a/gqueries/general/emissions/direct_emissions/per_sector_1990/direct_emissions_waste_other_ghg_1990.gql +++ /dev/null @@ -1,9 +0,0 @@ -- unit = mt -- query = - DIVIDE( - SUM( - EMISSIONS(waste, energetic, other_ghg, 1990), - EMISSIONS(waste, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ) From e7d6ff3a5359dd347c059f459552233aaf42a62c Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 11:55:22 +0200 Subject: [PATCH 10/26] Change unit from mt to MT --- .../per_sector/co2/direct_emissions_agriculture_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_buildings_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_bunkers_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_energy_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_households_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_industry_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_lulucf_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_other_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_transport_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_waste_co2_1990.gql | 2 +- .../other_ghg/direct_emissions_agriculture_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_buildings_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_bunkers_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_energy_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_households_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_industry_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_lulucf_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_other_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_transport_other_ghg_1990.gql | 2 +- .../other_ghg/direct_emissions_waste_other_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_agriculture_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_buildings_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_bunkers_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_energy_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_households_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_industry_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_lulucf_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_other_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_transport_total_ghg_1990.gql | 2 +- .../total_ghg/direct_emissions_waste_total_ghg_1990.gql | 2 +- .../1990_emissions/totals/direct_emissions_co2_1990.gql | 2 +- .../1990_emissions/totals/direct_emissions_other_ghg_1990.gql | 2 +- .../1990_emissions/totals/direct_emissions_total_ghg_1990.gql | 2 +- .../direct_emissions_indirect_emissions_total_ghg.gql | 2 +- .../per_sector/direct_emissions_agriculture_total_ghg.gql | 2 +- .../per_sector/direct_emissions_buildings_total_ghg.gql | 2 +- .../per_sector/direct_emissions_bunkers_total_ghg.gql | 2 +- .../per_sector/direct_emissions_energy_total_ghg.gql | 2 +- .../per_sector/direct_emissions_households_total_ghg.gql | 2 +- .../per_sector/direct_emissions_industry_total_ghg.gql | 2 +- .../per_sector/direct_emissions_lulucf_total_ghg.gql | 2 +- .../per_sector/direct_emissions_other_total_ghg.gql | 2 +- .../per_sector/direct_emissions_transport_total_ghg.gql | 2 +- .../per_sector/direct_emissions_waste_total_ghg.gql | 2 +- ...issions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql | 2 +- ...ns_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql | 2 +- ...ns_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql | 2 +- ...ns_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql | 2 +- ...ns_agriculture_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...issions_agriculture_total_ghg_for_direct_emissions_chart.gql | 2 +- ...ions_buildings_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...emissions_buildings_total_ghg_for_direct_emissions_chart.gql | 2 +- ...ssions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...t_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql | 2 +- ...issions_energy_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...ct_emissions_energy_total_ghg_for_direct_emissions_chart.gql | 2 +- ...ons_households_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...missions_households_total_ghg_for_direct_emissions_chart.gql | 2 +- ...sions_industry_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ..._emissions_industry_total_ghg_for_direct_emissions_chart.gql | 2 +- ...issions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...ct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql | 2 +- ...missions_other_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...ect_emissions_other_total_ghg_for_direct_emissions_chart.gql | 2 +- ...rect_emissions_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...ct_emissions_total_ghg_future_for_direct_emissions_chart.gql | 2 +- ...t_emissions_total_ghg_present_for_direct_emissions_chart.gql | 2 +- ...ions_transport_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...emissions_transport_total_ghg_for_direct_emissions_chart.gql | 2 +- ...missions_waste_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- ...ect_emissions_waste_total_ghg_for_direct_emissions_chart.gql | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql index 512864c010..5956990e96 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql index eb8e859c31..8b9107f2ca 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(buildings_non_specified, energetic, co2, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql index ccd05b2520..427bf0473a 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql index 9db829551f..5e04e9e215 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql index b5712f8707..ae3727d0dc 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(households_non_specified, energetic, co2, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql index 5604dc54ce..b6a5c1270e 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql index 3c1c70230a..0a823865f0 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql @@ -1,6 +1,6 @@ # LULUCF removals should be handled as negative CO2 emissions -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql index efabd167c8..be9a74144d 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql index 3ab7193b60..9933cc6086 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(transport_non_specified, energetic, co2, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql index 11fd1cb5e4..36f567da6d 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(waste_non_specified, non_energetic, co2, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql index 7d17f2b779..18ee43d469 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql index 4c16f59564..f25bc24658 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(buildings_non_specified, energetic, other_ghg, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql index 5fbdcbf9a3..b676376fb4 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql index b143da06b1..71afce3fe5 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql index c1bf453848..adca3d2183 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(households_non_specified, energetic, other_ghg, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql index 7b11ffca03..01f253df03 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql index 4895d1a108..eca865b2e3 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(lulucf_emissions, non_energetic, other_ghg, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql index 66d8e545bc..36511dbd64 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql index c97e6e179b..b45cbaf071 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(transport_non_specified, energetic, other_ghg, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql index 0427cef024..9c4c927d13 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( EMISSIONS(waste_non_specified, non_energetic, other_ghg, 1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql index e34c1e7f0e..b1d7037917 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_agriculture_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql index a036469d0c..2bcde9ae30 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_buildings_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql index 1bb6c0a8b0..136c3a4f24 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_bunkers_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql index 92a0a9a047..aebd3e0eb3 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_energy_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql index cf22da9f71..07592a5beb 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_households_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql index b880aca838..6172f8a73e 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_industry_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql index ec328816ba..94239d8bb2 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_lulucf_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql index c24b89a1cf..2ce9966ceb 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_other_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql index 50c1b238e7..a343d5b7e6 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_transport_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql index 8a75df5d2e..25e2d28362 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg_1990.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_waste_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql index ad1ac75ee0..0c2870eced 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql @@ -1,6 +1,6 @@ # Total CO2 emissions incl. indirect emissions, LULUCF and international transport for 1990 -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_energy_co2_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql index c74f517afc..6401760efa 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql @@ -1,6 +1,6 @@ # Total other GHG emissions incl. indirect emissions, LULUCF and international transport for 1990 -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_energy_other_ghg_1990), diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql index 0aaa3a8fd0..eebdcefc41 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql @@ -1,6 +1,6 @@ # Total GHG emissions incl. indirect emissions, LULUCF and international transport for 1990 -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_energy_total_ghg_1990), diff --git a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql index dfe04042bb..67452735fe 100644 --- a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql index 43f689bf57..6eb87aeece 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql index 457b7257f3..55910c6947 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql index ab083059b8..8bfd930985 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql index 8c5bcf36ff..29b2f41ba1 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql index 1a5ba343b7..7122c35298 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql index 8d8f7cf415..326d709d40 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql index 06d91653c3..9160250306 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql index 78bca021c3..f83b4a2f45 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql index 83e3bb5a7a..5da2ed78b5 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql index 067489d5c5..8e86191894 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql @@ -1,4 +1,4 @@ -- unit = mt +- unit = MT - query = DIVIDE( SUM( diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql index 1d6c57f94e..0e0bd814c2 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql @@ -1,6 +1,6 @@ # Total GHG emissions excl. indirect emissions, LULUCF and international transport -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql index f2bd3bb220..34f0e85c36 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql @@ -1,6 +1,6 @@ # Total GHG emissions incl. indirect emissions, excl. LULUCF and international transport -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql index ad9395fc0a..d0b0596eb5 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql @@ -1,6 +1,6 @@ # Total GHG emissions incl. indirect emissions and LULUCF, excl. international transport -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql index 93505e20c4..f01aba2b91 100644 --- a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql @@ -1,6 +1,6 @@ # Total GHG emissions incl. LULUCF, excl indirect emissions and international transport -- unit = mt +- unit = MT - query = SUM( Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql index 35e141ecf2..98a6866d1e 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_agriculture_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql index e124c52efd..af403e6451 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_agriculture_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_agriculture_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql index 2337988eb6..2b1e6a7605 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_buildings_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql index b822250b7b..d53927b733 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_buildings_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_buildings_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql index 6567f913a0..26a48aafb1 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_bunkers_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql index 2fb5cb5a73..5fd9b6005f 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_bunkers_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_bunkers_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql index 93675b7658..d2347251ac 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_energy_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql index e9f9e487a1..730e6cf98b 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_energy_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_energy_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql index f5900b67c8..09814c91d5 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_households_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql index 2556105056..b402e133d4 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_households_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_households_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql index 3b86fca8a7..3ccbb1362f 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_industry_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql index ffe9b3c1e2..d5f2bf4529 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_industry_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_industry_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql index 37262126d6..f8a237aa78 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_lulucf_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql index 7efaf15e6e..2705ddc271 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_lulucf_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_lulucf_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql index 0adee77226..0855c7051b 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_other_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql index abfad38c70..cd9a5a24ed 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_other_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_other_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql index 594a1d4207..6ca3164609 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql index c7f85cd5af..a5ba9cc7cf 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_future_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = future:Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql index 9a747a6ad7..2d4f07fb71 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_present_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = present:Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql index 9fc1882a53..3c54b47694 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_transport_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql index 9cefa7ac66..45ab3600cc 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_transport_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_transport_total_ghg) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql index fef7274393..cd9b4960ea 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_waste_total_ghg_1990) diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql index ea43ecf1b2..ca55a2cce5 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_waste_total_ghg_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ -- unit = mt +- unit = MT - query = Q(direct_emissions_waste_total_ghg) From 745599827af94bd5f14f6fc5f29170c13a25f6f0 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 13:22:41 +0200 Subject: [PATCH 11/26] Corrections in dashboard items --- ...tion_of_total_ghg_emissions_versus_1990.gql | 18 ++++++++++++++++++ ...rd_direct_emissions_total_ghg_emissions.gql | 4 ++++ ...ion_of_direct_ghg_emissions_versus_1990.gql | 13 ------------- 3 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql create mode 100644 gqueries/output_elements/dashboard/dashboard_direct_emissions_total_ghg_emissions.gql delete mode 100644 gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql diff --git a/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql b/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql new file mode 100644 index 0000000000..7016adf592 --- /dev/null +++ b/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql @@ -0,0 +1,18 @@ +# Reduction of direct total GHG emissions future vs. 1990 + +- query = + IF( + GRAPH().future?, + -> { + SUM( + -1, + DIVIDE( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), + Q(direct_emissions_total_ghg_1990) + ) + ) + }, + -> { 0 } + ) + +- unit = factor diff --git a/gqueries/output_elements/dashboard/dashboard_direct_emissions_total_ghg_emissions.gql b/gqueries/output_elements/dashboard/dashboard_direct_emissions_total_ghg_emissions.gql new file mode 100644 index 0000000000..3c9aa92aee --- /dev/null +++ b/gqueries/output_elements/dashboard/dashboard_direct_emissions_total_ghg_emissions.gql @@ -0,0 +1,4 @@ +# Direct total GHG emissions in future year + +- query = Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) +- unit = MT diff --git a/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql b/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql deleted file mode 100644 index 616cb0ad42..0000000000 --- a/gqueries/output_elements/dashboard/dashboard_reduction_of_direct_ghg_emissions_versus_1990.gql +++ /dev/null @@ -1,13 +0,0 @@ -- query = - IF( - GRAPH().future?, - -> { - SUM(-1, - (DIVIDE(Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), - Q(direct_emissions_total_ghg_1990))) - ) - }, - -> { 0 } - ) - -- unit = factor From bc379fb01619bbd6cddc472c726d5236b29cb7ef Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 14:14:45 +0200 Subject: [PATCH 12/26] Remove unnecessary mechanical turk 1990 emission queries --- .../turk_direct_emissions_co2_1990.gql | 42 ------------------- .../turk_direct_emissions_other_ghg_1990.gql | 39 ----------------- .../turk_direct_emissions_total_ghg_1990.gql | 8 ---- 3 files changed, 89 deletions(-) delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql deleted file mode 100644 index 7cca6c919b..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_co2_1990.gql +++ /dev/null @@ -1,42 +0,0 @@ -# Mechanical turk query for 1990 CO2 emissions -# Sums all co2 values for 1990 from emissions.csv -# Bunkers is handled separately as the result depends on the set input for bunkers - -- unit = mt -- query = - SUM( - DIVIDE( - SUM( - EMISSIONS(agriculture_non_specified, energetic, co2, 1990), - EMISSIONS(agriculture_non_specified, non_energetic, co2, 1990), - EMISSIONS(buildings_non_specified, energetic, co2, 1990), - EMISSIONS(energy_ccus, non_energetic, co2, 1990), - EMISSIONS(energy_electricity_and_heat_production, energetic, co2, 1990), - EMISSIONS(energy_fuels_production, energetic, co2, 1990), - EMISSIONS(energy_fugitive_emissions, non_energetic, co2, 1990), - EMISSIONS(energy_hydrogen_production, non_energetic, co2, 1990), - EMISSIONS(energy_methanol_production, non_energetic, co2, 1990), - EMISSIONS(households_non_specified, energetic, co2, 1990), - EMISSIONS(industry_aluminium, non_energetic, co2, 1990), - EMISSIONS(industry_chemicals, non_energetic, co2, 1990), - EMISSIONS(industry_fertilizers, non_energetic, co2, 1990), - EMISSIONS(industry_food, non_energetic, co2, 1990), - EMISSIONS(industry_non_specified, energetic, co2, 1990), - EMISSIONS(industry_other_metals, non_energetic, co2, 1990), - EMISSIONS(industry_other, non_energetic, co2, 1990), - EMISSIONS(industry_paper, non_energetic, co2, 1990), - EMISSIONS(industry_refineries, energetic, co2, 1990), - EMISSIONS(industry_refineries, non_energetic, co2, 1990), - EMISSIONS(industry_steel, non_energetic, co2, 1990), - EMISSIONS(lulucf_emissions, non_energetic, co2, 1990), - NEG(EMISSIONS(lulucf_removals, non_energetic, co2, 1990)), - EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), - EMISSIONS(other_non_specified, energetic, co2, 1990), - EMISSIONS(other_other_transportation, energetic, co2, 1990), - EMISSIONS(transport_non_specified, energetic, co2, 1990), - EMISSIONS(waste_non_specified, non_energetic, co2, 1990) - ), - THOUSANDS - ), - Q(direct_emissions_bunkers_co2_1990) - ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql deleted file mode 100644 index e57bf3d31a..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_other_ghg_1990.gql +++ /dev/null @@ -1,39 +0,0 @@ -# Mechanical turk query for 1990 other GHG emissions -# Sums all other_ghg values for 1990 from emissions.csv -# Bunkers is handled separately as the result depends on the set input for bunkers - -- unit = mt -- query = - SUM( - DIVIDE( - SUM( - EMISSIONS(agriculture_non_specified, energetic, other_ghg, 1990), - EMISSIONS(agriculture_non_specified, non_energetic, other_ghg, 1990), - EMISSIONS(buildings_non_specified, energetic, other_ghg, 1990), - EMISSIONS(energy_electricity_and_heat_production, energetic, other_ghg, 1990), - EMISSIONS(energy_fuels_production, energetic, other_ghg, 1990), - EMISSIONS(energy_fugitive_emissions, non_energetic, other_ghg, 1990), - EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 1990), - EMISSIONS(energy_methanol_production, non_energetic, other_ghg, 1990), - EMISSIONS(households_non_specified, energetic, other_ghg, 1990), - EMISSIONS(industry_aluminium, non_energetic, other_ghg, 1990), - EMISSIONS(industry_chemicals, non_energetic, other_ghg, 1990), - EMISSIONS(industry_fertilizers, non_energetic, other_ghg, 1990), - EMISSIONS(industry_food, non_energetic, other_ghg, 1990), - EMISSIONS(industry_non_specified, energetic, other_ghg, 1990), - EMISSIONS(industry_other_metals, non_energetic, other_ghg, 1990), - EMISSIONS(industry_other, non_energetic, other_ghg, 1990), - EMISSIONS(industry_paper, non_energetic, other_ghg, 1990), - EMISSIONS(industry_refineries, energetic, other_ghg, 1990), - EMISSIONS(industry_refineries, non_energetic, other_ghg, 1990), - EMISSIONS(industry_steel, non_energetic, other_ghg, 1990), - EMISSIONS(lulucf_emissions, non_energetic, other_ghg, 1990), - EMISSIONS(other_non_specified, energetic, other_ghg, 1990), - EMISSIONS(other_other_transportation, energetic, other_ghg, 1990), - EMISSIONS(transport_non_specified, energetic, other_ghg, 1990), - EMISSIONS(waste_non_specified, non_energetic, other_ghg, 1990) - ), - THOUSANDS - ), - Q(direct_emissions_bunkers_other_ghg_1990) - ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql deleted file mode 100644 index 826aa9e4c1..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_1990.gql +++ /dev/null @@ -1,8 +0,0 @@ -# Mechanical turk query for 1990 total GHG emissions - -- unit = mt -- query = - SUM( - Q(turk_direct_emissions_co2_1990), - Q(turk_direct_emissions_other_ghg_1990) - ) From 6e98f6330bba5a2d209005f01e18b76001e3d4e7 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 14:36:55 +0200 Subject: [PATCH 13/26] Bump Atlas to quintel/atlas@64b4688 --- Gemfile.lock | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 68246a2c6a..e8980f9f43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,18 +29,6 @@ GIT specs: rubel (0.1.1) -PATH - remote: ../atlas - specs: - atlas (1.0.0) - activemodel (>= 7) - activesupport (>= 7) - csv (>= 3) - gpgme (~> 2.0) - ostruct - turbine-graph (>= 0.1) - virtus (~> 1.0) - GEM remote: https://rubygems.org/ specs: From e5e55e3a55cbae755e1f0649eacd92ee4a1cd58e Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 7 Jul 2026 15:15:03 +0200 Subject: [PATCH 14/26] Correct for interactive rebase error --- .../emissions_overview_energetic_agriculture_ghg.gql | 6 ------ ...emissions_overview_energetic_built_environment_co2.gql | 6 ------ ...emissions_overview_energetic_built_environment_ghg.gql | 7 ------- .../emissions_overview_energetic_industry_co2.gql | 8 -------- .../emissions_overview_energetic_industry_ghg.gql | 7 ------- .../emissions_overview_energetic_transport_co2.gql | 6 ------ .../emissions_overview_energetic_transport_ghg.gql | 6 ------ .../emissions_overview_non_energetic_agriculture_co2.gql | 7 ------- .../emissions_overview_non_energetic_agriculture_ghg.gql | 7 ------- .../emissions_overview_non_energetic_industry_co2.gql | 8 -------- .../emissions_overview_non_energetic_industry_ghg.gql | 8 -------- .../emissions_captured_energy_chp_ht_wood_pellets.gql | 2 -- .../emissions_captured_energy_chp_mt_wood_pellets.gql | 2 -- .../emissions_captured_energy_power_wood_pellets.gql | 2 -- .../supply/power/emissions_captured_power_biogenic.gql | 7 ------- .../power/emissions_captured_power_non_biogenic.gql | 3 --- .../supply/power/emissions_captured_power_total.gql | 2 -- 17 files changed, 94 deletions(-) delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql delete mode 100644 gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql delete mode 100644 gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql deleted file mode 100644 index d4605225aa..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_agriculture_ghg.gql +++ /dev/null @@ -1,6 +0,0 @@ -- query = - SUM( - Q(emissions_energetic_agriculture_other_ghg), - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql deleted file mode 100644 index 268b9f1695..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_co2.gql +++ /dev/null @@ -1,6 +0,0 @@ -- query = - SUM( - Q(co2_sheet_buildings_households_total_co2_emissions_only_energetic) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql deleted file mode 100644 index 1f6f0baa0b..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_built_environment_ghg.gql +++ /dev/null @@ -1,7 +0,0 @@ -- query = - SUM( - Q(emissions_energetic_households_other_ghg), - Q(emissions_energetic_buildings_other_ghg) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql deleted file mode 100644 index 86aa8f38f2..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_co2.gql +++ /dev/null @@ -1,8 +0,0 @@ -- query = - SUM( - Q(emissions_energetic_industry_chemical_co2), - Q(emissions_energetic_industry_energy_co2), - Q(emissions_energetic_other_industry_co2) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql deleted file mode 100644 index 99eec82c1f..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_industry_ghg.gql +++ /dev/null @@ -1,7 +0,0 @@ -- query = - SUM( - Q(emissions_energetic_industry_energy_other_ghg), - Q(emissions_energetic_other_industry_other_ghg) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql deleted file mode 100644 index 468c2587e9..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_co2.gql +++ /dev/null @@ -1,6 +0,0 @@ -- query = - SUM( - Q(co2_sheet_transport_total_co2_emissions_only_energetic) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql deleted file mode 100644 index 931029c345..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_energetic_transport_ghg.gql +++ /dev/null @@ -1,6 +0,0 @@ -- query = - SUM( - Q(co2_sheet_transport_other_ghg_emissions) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql deleted file mode 100644 index aabfa6978b..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_co2.gql +++ /dev/null @@ -1,7 +0,0 @@ -- query = - SUM( - Q(emissions_non_energetic_soil_cultivation_co2), - Q(emissions_non_energetic_manure_co2) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql deleted file mode 100644 index 9f91bfab39..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_agriculture_ghg.gql +++ /dev/null @@ -1,7 +0,0 @@ -- query = - SUM( - Q(emissions_non_energetic_soil_cultivation_other_ghg), - Q(emissions_non_energetic_manure_other_ghg) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql deleted file mode 100644 index 61c342515e..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_co2.gql +++ /dev/null @@ -1,8 +0,0 @@ -- query = - SUM( - Q(emissions_non_energetic_other_industry_co2), - Q(emissions_non_energetic_industry_waste_management_co2), - Q(emissions_non_energetic_industry_chemical_co2) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql b/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql deleted file mode 100644 index 57ca0b9014..0000000000 --- a/gqueries/general/emissions/primary_emissions/emissions_overview_non_energetic_industry_ghg.gql +++ /dev/null @@ -1,8 +0,0 @@ -- query = - SUM( - Q(emissions_non_energetic_other_industry_other_ghg), - Q(emissions_non_energetic_industry_chemical_other_ghg), - Q(emissions_non_energetic_industry_waste_management_other_ghg) - ) - -- unit = T \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql deleted file mode 100644 index 92f0bc102d..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_ht_wood_pellets.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = DIVIDE(MV(energy_chp_ht_wood_pellets_ccs_captured_co2,demand),1000) -- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql deleted file mode 100644 index 2438a072e1..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_chp_mt_wood_pellets.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = DIVIDE(MV(energy_chp_mt_wood_pellets_ccs_captured_co2,demand),1000) -- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql deleted file mode 100644 index c34a3eb860..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_energy_power_wood_pellets.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = DIVIDE(MV(energy_power_wood_pellets_ccs_captured_co2,demand),1000) -- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql deleted file mode 100644 index 0403df74ce..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_biogenic.gql +++ /dev/null @@ -1,7 +0,0 @@ -- query = - SUM( - Q(emissions_captured_energy_chp_ht_wood_pellets) - Q(emissions_captured_energy_chp_mt_wood_pellets), - Q(emissions_captured_energy_chp_power_wood_pellets) - ) -- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql deleted file mode 100644 index 0d7fb21f45..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_non_biogenic.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = - Q(emssions_captured_power_total) - Q(emissions_captured_power_biogenic) -- unit = tonne \ No newline at end of file diff --git a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql b/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql deleted file mode 100644 index 504e8981e8..0000000000 --- a/gqueries/general/emissions/primary_emissions/supply/power/emissions_captured_power_total.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = DIVIDE(MV(energy_power_captured_co2,demand),1000) -- unit = tonne \ No newline at end of file From 1ccec80de264cd1e92ca986edc3adb7fe288c538 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 9 Jul 2026 14:12:54 +0200 Subject: [PATCH 15/26] Update ghg queries with mapping method --- .../direct_emissions_indirect_emissions_total_ghg.gql | 2 +- .../per_sector/direct_emissions_agriculture_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_buildings_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_bunkers_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_energy_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_households_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_industry_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_lulucf_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_other_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_transport_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_waste_total_ghg.gql | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql index 67452735fe..bee780600b 100644 --- a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql @@ -3,7 +3,7 @@ DIVIDE( SUM( MV( - MG(emissions_other_indirect_emissions), + other_indirect_emissions_non_energetic_co2, direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql index 6eb87aeece..4277450948 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_agriculture), + SECTOR(emissions_sector, "Agriculture"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_agriculture), + MSECTOR(emissions_sector, "Agriculture"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql index 55910c6947..e98894689e 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_buildings), + SECTOR(emissions_sector, "Buildings"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_buildings), + MSECTOR(emissions_sector, "Buildings"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql index 8bfd930985..86938a5ace 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_bunkers), + SECTOR(emissions_sector, "Bunkers"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_bunkers), + MSECTOR(emissions_sector, "Bunkers"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql index 29b2f41ba1..0f23f041d5 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_energy), + SECTOR(emissions_sector, "Energy"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_energy), + MSECTOR(emissions_sector, "Energy"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql index 7122c35298..7d1ad81976 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_households), + SECTOR(emissions_sector, "Households"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_households), + MSECTOR(emissions_sector, "Households"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql index 326d709d40..bfc6574e9c 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_industry), + SECTOR(emissions_sector, "Industry"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_industry), + MSECTOR(emissions_sector, "Industry"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql index 9160250306..d059c2419f 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_lulucf), + SECTOR(emissions_sector, "LULUCF"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_lulucf), + MSECTOR(emissions_sector, "LULUCF"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql index f83b4a2f45..c79cc43f56 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_other), + SECTOR(emissions_sector, "Other"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_other), + MSECTOR(emissions_sector, "Other"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql index 5da2ed78b5..c5df9d0382 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_transport), + SECTOR(emissions_sector, "Transport"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_transport), + MSECTOR(emissions_sector, "Transport"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql index 8e86191894..9e771fd768 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - G(emissions_waste), + SECTOR(emissions_sector, "Waste"), direct_reporting_emissions_total_ghg_emissions ), MV( - MG(emissions_waste), + MSECTOR(emissions_sector, "Waste"), direct_reporting_emissions_total_ghg_emissions ) ), From 1987489187c90c40ad9f4ba110f77b1d2bbe730f Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 9 Jul 2026 15:01:30 +0200 Subject: [PATCH 16/26] Update 1990 queries with mapping --- .../co2/direct_emissions_agriculture_co2_1990.gql | 5 +---- .../co2/direct_emissions_buildings_co2_1990.gql | 2 +- .../co2/direct_emissions_energy_co2_1990.gql | 9 +-------- .../co2/direct_emissions_households_co2_1990.gql | 2 +- .../co2/direct_emissions_industry_co2_1990.gql | 14 +------------- .../co2/direct_emissions_other_co2_1990.gql | 6 +----- .../co2/direct_emissions_transport_co2_1990.gql | 2 +- .../co2/direct_emissions_waste_co2_1990.gql | 2 +- ...direct_emissions_agriculture_other_ghg_1990.gql | 5 +---- .../direct_emissions_buildings_other_ghg_1990.gql | 2 +- .../direct_emissions_energy_other_ghg_1990.gql | 8 +------- .../direct_emissions_households_other_ghg_1990.gql | 2 +- .../direct_emissions_industry_other_ghg_1990.gql | 14 +------------- .../direct_emissions_other_other_ghg_1990.gql | 5 +---- .../direct_emissions_transport_other_ghg_1990.gql | 2 +- .../direct_emissions_waste_other_ghg_1990.gql | 2 +- 16 files changed, 16 insertions(+), 66 deletions(-) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql index 5956990e96..d85f2d3233 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_agriculture_co2_1990.gql @@ -1,9 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(agriculture_non_specified, energetic, co2, 1990), - EMISSIONS(agriculture_non_specified, non_energetic, co2, 1990) - ), + EMISSIONS(emissions_sector, "Agriculture", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql index 8b9107f2ca..8d66257262 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_buildings_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(buildings_non_specified, energetic, co2, 1990), + EMISSIONS(emissions_sector, "Buildings", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql index 5e04e9e215..01190098ed 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_energy_co2_1990.gql @@ -1,13 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(energy_ccus, non_energetic, co2, 1990), - EMISSIONS(energy_electricity_and_heat_production, energetic, co2, 1990), - EMISSIONS(energy_fuels_production, energetic, co2, 1990), - EMISSIONS(energy_fugitive_emissions, non_energetic, co2, 1990), - EMISSIONS(energy_hydrogen_production, non_energetic, co2, 1990), - EMISSIONS(energy_methanol_production, non_energetic, co2, 1990) - ), + EMISSIONS(emissions_sector, "Energy", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql index ae3727d0dc..08f1a64ba8 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_households_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(households_non_specified, energetic, co2, 1990), + EMISSIONS(emissions_sector, "Households", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql index b6a5c1270e..91d1c81a4d 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_industry_co2_1990.gql @@ -1,18 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(industry_aluminium, non_energetic, co2, 1990), - EMISSIONS(industry_chemicals, non_energetic, co2, 1990), - EMISSIONS(industry_fertilizers, non_energetic, co2, 1990), - EMISSIONS(industry_food, non_energetic, co2, 1990), - EMISSIONS(industry_non_specified, energetic, co2, 1990), - EMISSIONS(industry_other, non_energetic, co2, 1990), - EMISSIONS(industry_other_metals, non_energetic, co2, 1990), - EMISSIONS(industry_paper, non_energetic, co2, 1990), - EMISSIONS(industry_refineries, energetic, co2, 1990), - EMISSIONS(industry_refineries, non_energetic, co2, 1990), - EMISSIONS(industry_steel, non_energetic, co2, 1990) - ), + EMISSIONS(emissions_sector, "Industry", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql index be9a74144d..e6bb005cd3 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_other_co2_1990.gql @@ -1,10 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), - EMISSIONS(other_non_specified, energetic, co2, 1990), - EMISSIONS(other_other_transportation, energetic, co2, 1990) - ), + EMISSIONS(emissions_sector, "Other", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql index 9933cc6086..858272e11f 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(transport_non_specified, energetic, co2, 1990), + EMISSIONS(emissions_sector, "Transport", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql index 36f567da6d..eea17d20bd 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_waste_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(waste_non_specified, non_energetic, co2, 1990), + EMISSIONS(emissions_sector, "Waste", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql index 18ee43d469..cc15520fed 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg_1990.gql @@ -1,9 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(agriculture_non_specified, energetic, other_ghg, 1990), - EMISSIONS(agriculture_non_specified, non_energetic, other_ghg, 1990) - ), + EMISSIONS(emissions_sector, "Agriculture", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql index f25bc24658..44c4fa5fb9 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(buildings_non_specified, energetic, other_ghg, 1990), + EMISSIONS(emissions_sector, "Buildings", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql index 71afce3fe5..c584ab1cec 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg_1990.gql @@ -1,12 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(energy_electricity_and_heat_production, energetic, other_ghg, 1990), - EMISSIONS(energy_fuels_production, energetic, other_ghg, 1990), - EMISSIONS(energy_fugitive_emissions, non_energetic, other_ghg, 1990), - EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 1990), - EMISSIONS(energy_methanol_production, non_energetic, other_ghg, 1990) - ), + EMISSIONS(emissions_sector, "Energy", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql index adca3d2183..293d4f9ce3 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(households_non_specified, energetic, other_ghg, 1990), + EMISSIONS(emissions_sector, "Households", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql index 01f253df03..12af3bf202 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg_1990.gql @@ -1,18 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(industry_aluminium, non_energetic, other_ghg, 1990), - EMISSIONS(industry_chemicals, non_energetic, other_ghg, 1990), - EMISSIONS(industry_fertilizers, non_energetic, other_ghg, 1990), - EMISSIONS(industry_food, non_energetic, other_ghg, 1990), - EMISSIONS(industry_non_specified, energetic, other_ghg, 1990), - EMISSIONS(industry_other, non_energetic, other_ghg, 1990), - EMISSIONS(industry_other_metals, non_energetic, other_ghg, 1990), - EMISSIONS(industry_paper, non_energetic, other_ghg, 1990), - EMISSIONS(industry_refineries, energetic, other_ghg, 1990), - EMISSIONS(industry_refineries, non_energetic, other_ghg, 1990), - EMISSIONS(industry_steel, non_energetic, other_ghg, 1990) - ), + EMISSIONS(emissions_sector, "Industry", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql index 36511dbd64..f345431562 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg_1990.gql @@ -1,9 +1,6 @@ - unit = MT - query = DIVIDE( - SUM( - EMISSIONS(other_non_specified, energetic, other_ghg, 1990), - EMISSIONS(other_other_transportation, energetic, other_ghg, 1990) - ), + EMISSIONS(emissions_sector, "Other", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql index b45cbaf071..c62069fd2a 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(transport_non_specified, energetic, other_ghg, 1990), + EMISSIONS(emissions_sector, "Transport", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql index 9c4c927d13..0c09318774 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(waste_non_specified, non_energetic, other_ghg, 1990), + EMISSIONS(emissions_sector, "Waste", other_ghg, 1990), THOUSANDS ) From 8c8174264e5c26df5dbf6da86a759f5d0532332d Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Tue, 14 Jul 2026 15:13:32 +0200 Subject: [PATCH 17/26] Unit styling change in query --- ...issions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql index 23c100bbc4..e4f6cf88ec 100644 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -1,7 +1,7 @@ # Mechanical turk query for total GHG emissions incl. indirect, LULUCF and international transport # Sums results for all energy and molecule nodes -- unit = mt +- unit = MT - query = DIVIDE( SUM( From 8ed48ecd73cbf71d34fb07faded4fa3c3ce551c7 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 14:09:17 +0200 Subject: [PATCH 18/26] Rename and restructure 1990 queries --- ...issions_co2_incl_indirect_emissions_lulucf_bunkers_1990.gql} | 0 ...s_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql} | 0 ...s_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql} | 0 ...t_emissions_reduction_of_total_ghg_emissions_versus_1990.gql | 2 +- ...rect_emissions_total_ghg_1990_for_direct_emissions_chart.gql | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename gqueries/general/emissions/direct_emissions/1990_emissions/totals/{direct_emissions_co2_1990.gql => co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990.gql} (100%) rename gqueries/general/emissions/direct_emissions/1990_emissions/totals/{direct_emissions_other_ghg_1990.gql => other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql} (100%) rename gqueries/general/emissions/direct_emissions/1990_emissions/totals/{direct_emissions_total_ghg_1990.gql => total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql} (100%) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_co2_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_other_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/1990_emissions/totals/direct_emissions_total_ghg_1990.gql rename to gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990.gql diff --git a/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql b/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql index 7016adf592..af1edef752 100644 --- a/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql +++ b/gqueries/output_elements/dashboard/dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990.gql @@ -8,7 +8,7 @@ -1, DIVIDE( Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers), - Q(direct_emissions_total_ghg_1990) + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990) ) ) }, diff --git a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql index 6ca3164609..2e6415dc34 100644 --- a/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql +++ b/gqueries/output_elements/output_series/direct_emissions_per_sector_chart/direct_emissions_total_ghg_1990_for_direct_emissions_chart.gql @@ -1,2 +1,2 @@ - unit = MT -- query = Q(direct_emissions_total_ghg_1990) +- query = Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990) From 0ab22be5674b41e198dc0dd103f0167f8dd49edc Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 15:26:20 +0200 Subject: [PATCH 19/26] Expand 1990 total emission queries set --- .../direct_emissions_indirect_emissions_co2_1990.gql | 6 ++++++ ...co2_excl_indirect_emissions_lulucf_bunkers_1990.gql | 10 ++++++++++ ...ncl_indirect_emissions_excl_lulucf_bunkers_1990.gql | 9 +++++++++ ...ncl_indirect_emissions_lulucf_excl_bunkers_1990.gql | 8 ++++++++ ...ncl_lulucf_excl_indirect_emissions_bunkers_1990.gql | 9 +++++++++ ...ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql | 10 ++++++++++ ...ncl_indirect_emissions_excl_lulucf_bunkers_1990.gql | 9 +++++++++ ...ncl_indirect_emissions_lulucf_excl_bunkers_1990.gql | 8 ++++++++ ...ncl_lulucf_excl_indirect_emissions_bunkers_1990.gql | 9 +++++++++ ...ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql | 8 ++++++++ ...ncl_indirect_emissions_excl_lulucf_bunkers_1990.gql | 8 ++++++++ ...ncl_indirect_emissions_lulucf_excl_bunkers_1990.gql | 8 ++++++++ ...ncl_lulucf_excl_indirect_emissions_bunkers_1990.gql | 8 ++++++++ 13 files changed, 110 insertions(+) create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql create mode 100644 gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql new file mode 100644 index 0000000000..4e8e62be27 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql @@ -0,0 +1,6 @@ +- unit = MT +- query = + DIVIDE( + EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), + THOUSANDS + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..a633149172 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers_1990.gql @@ -0,0 +1,10 @@ +# Total CO2 emissions excl. indirect emissions, LULUCF and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_indirect_emissions_co2_1990)), + NEG(Q(direct_emissions_lulucf_co2_1990)), + NEG(Q(direct_emissions_bunkers_co2_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..386d3e7f77 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql @@ -0,0 +1,9 @@ +# Total CO2 emissions incl. indirect emissions, excl. LULUCF and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_lulucf_co2_1990)), + NEG(Q(direct_emissions_bunkers_co2_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql new file mode 100644 index 0000000000..3e802f176c --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total CO2 emissions incl. indirect emissions and LULUCF, excl. international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_bunkers_co2_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql new file mode 100644 index 0000000000..29a6ca5b5e --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql @@ -0,0 +1,9 @@ +# Total CO2 emissions incl. LULUCF, excl indirect emissions and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_indirect_emissions_co2_1990)), + NEG(Q(direct_emissions_bunkers_co2_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..701b4885c3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql @@ -0,0 +1,10 @@ +# Total other GHG emissions excl. indirect emissions, LULUCF and international transport for 1990 +# Only indirect CO2 emissions are modelled, therefore there is no query for indirect other GHG + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_lulucf_other_ghg_1990)), + NEG(Q(direct_emissions_bunkers_other_ghg_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..70b31c703a --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql @@ -0,0 +1,9 @@ +# Total other GHG emissions incl. indirect emissions, excl. LULUCF and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_lulucf_other_ghg_1990)), + NEG(Q(direct_emissions_bunkers_other_ghg_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql new file mode 100644 index 0000000000..8cf66af3b4 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total other GHG emissions incl. indirect emissions and LULUCF, excl. international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_bunkers_other_ghg_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql new file mode 100644 index 0000000000..eae06dfafa --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql @@ -0,0 +1,9 @@ +# Total other GHG emissions incl. LULUCF, excl indirect emissions and international transport for 1990 +# Only indirect CO2 emissions are modelled, therefore there is no query for indirect other GHG + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_bunkers_other_ghg_1990)) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..90e7d24440 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total GHG emissions excl. indirect emissions, LULUCF and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers_1990), + Q(direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..a5603d626c --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total GHG emissions incl. indirect emissions, excl. LULUCF and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers_1990), + Q(direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql new file mode 100644 index 0000000000..d61c0498a9 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total GHG emissions incl. indirect emissions and LULUCF, excl. international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers_1990), + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers_1990) + ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql new file mode 100644 index 0000000000..e17cabf8a5 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990.gql @@ -0,0 +1,8 @@ +# Total GHG emissions incl. LULUCF, excl indirect emissions and international transport for 1990 + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers_1990), + Q(direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers_1990) + ) From 094c5e4c038d37ef1c4a9240fcbdd932a524d2b1 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 15:44:55 +0200 Subject: [PATCH 20/26] MT queries --- ...rk_direct_emissions_total_ghg_all_nodes.gql | 18 ++++++++++++++++++ ..._indirect_emissions_lulucf_bunkers_1990.gql | 4 ++++ ..._emissions_lulucf_bunkers_1990_manually.gql | 12 ++++++++++++ ..._incl_indirect_emissions_lulucf_bunkers.gql | 18 ++---------------- 4 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql create mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql new file mode 100644 index 0000000000..e4f6cf88ec --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql @@ -0,0 +1,18 @@ +# Mechanical turk query for total GHG emissions incl. indirect, LULUCF and international transport +# Sums results for all energy and molecule nodes + +- unit = MT +- query = + DIVIDE( + SUM( + V( + ALL(), + direct_reporting_emissions_total_ghg_emissions + ), + MV( + MALL(), + direct_reporting_emissions_total_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql new file mode 100644 index 0000000000..231448d553 --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql @@ -0,0 +1,4 @@ +# Total GHG emissions excl. indirect emissions, LULUCF and international transport for 1990 + +- unit = MT +- query = Q(direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql new file mode 100644 index 0000000000..6e43568d20 --- /dev/null +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql @@ -0,0 +1,12 @@ +# Mechanical turk query for total GHG emissions excl. indirect, LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990), + NEG(Q(direct_emissions_indirect_emissions_co2_1990)), + NEG(Q(direct_emissions_lulucf_co2_1990)), + NEG(Q(direct_emissions_lulucf_other_ghg_1990)), + NEG(Q(direct_emissions_bunkers_co2_1990)), + NEG(Q(direct_emissions_bunkers_other_ghg_1990)) + ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql index e4f6cf88ec..e8ae41c34d 100644 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql +++ b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -1,18 +1,4 @@ -# Mechanical turk query for total GHG emissions incl. indirect, LULUCF and international transport -# Sums results for all energy and molecule nodes +# Total GHG emissions incl. indirect emissions, LULUCF and international transport - unit = MT -- query = - DIVIDE( - SUM( - V( - ALL(), - direct_reporting_emissions_total_ghg_emissions - ), - MV( - MALL(), - direct_reporting_emissions_total_ghg_emissions - ) - ), - BILLIONS - ) +- query = Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) From a83934a8d8916396f42cfecc0d1093f96b176d42 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 16:34:35 +0200 Subject: [PATCH 21/26] Update queries according to mapping file --- .../direct_emissions_indirect_emissions_co2_1990.gql | 2 +- .../per_sector/co2/direct_emissions_bunkers_co2_1990.gql | 4 ++-- .../per_sector/co2/direct_emissions_transport_co2_1990.gql | 2 +- .../other_ghg/direct_emissions_bunkers_other_ghg_1990.gql | 4 ++-- .../other_ghg/direct_emissions_transport_other_ghg_1990.gql | 2 +- .../per_sector/direct_emissions_bunkers_total_ghg.gql | 4 ++-- .../per_sector/direct_emissions_transport_total_ghg.gql | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql index 4e8e62be27..d51addf170 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/miscellaneous/direct_emissions_indirect_emissions_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(other_indirect_emissions, non_energetic, co2, 1990), + EMISSIONS(emissions_subsector, "Indirect emissions", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql index 427bf0473a..228950a3c7 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_bunkers_co2_1990.gql @@ -3,9 +3,9 @@ DIVIDE( SUM( (INPUT_VALUE(bunkers_allocated_percentage_shipping) / 100.0) - * EMISSIONS(bunkers_international_navigation, energetic, co2, 1990), + * EMISSIONS(emissions_subsector, "International navigation", co2, 1990), (INPUT_VALUE(bunkers_allocated_percentage_aviation) / 100.0) - * EMISSIONS(bunkers_international_aviation, energetic, co2, 1990) + * EMISSIONS(emissions_subsector, "International aviation", co2, 1990) ), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql index 858272e11f..ed2df2bc89 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_transport_co2_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(emissions_sector, "Transport", co2, 1990), + EMISSIONS(emissions_sector, "National transport", co2, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql index b676376fb4..2334f84aaf 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg_1990.gql @@ -3,9 +3,9 @@ DIVIDE( SUM( (INPUT_VALUE(bunkers_allocated_percentage_shipping) / 100.0) - * EMISSIONS(bunkers_international_navigation, energetic, other_ghg, 1990), + * EMISSIONS(emissions_subsector, "International navigation", other_ghg, 1990), (INPUT_VALUE(bunkers_allocated_percentage_aviation) / 100.0) - * EMISSIONS(bunkers_international_aviation, energetic, other_ghg, 1990) + * EMISSIONS(emissions_subsector, "International aviation", other_ghg, 1990) ), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql index c62069fd2a..4a09f723af 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg_1990.gql @@ -1,6 +1,6 @@ - unit = MT - query = DIVIDE( - EMISSIONS(emissions_sector, "Transport", other_ghg, 1990), + EMISSIONS(emissions_sector, "National transport", other_ghg, 1990), THOUSANDS ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql index 86938a5ace..da070f82e8 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - SECTOR(emissions_sector, "Bunkers"), + SECTOR(emissions_sector, "International transport"), direct_reporting_emissions_total_ghg_emissions ), MV( - MSECTOR(emissions_sector, "Bunkers"), + MSECTOR(emissions_sector, "International transport"), direct_reporting_emissions_total_ghg_emissions ) ), diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql index c5df9d0382..ef5e2ceeb0 100644 --- a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql @@ -3,11 +3,11 @@ DIVIDE( SUM( V( - SECTOR(emissions_sector, "Transport"), + SECTOR(emissions_sector, "National transport"), direct_reporting_emissions_total_ghg_emissions ), MV( - MSECTOR(emissions_sector, "Transport"), + MSECTOR(emissions_sector, "National transport"), direct_reporting_emissions_total_ghg_emissions ) ), From 87acdfa7cce4403e5f8c97bb0cc473a539947101 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 16:45:29 +0200 Subject: [PATCH 22/26] Update indirect emissions query --- .../direct_emissions_indirect_emissions_total_ghg.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql index bee780600b..84732e6b02 100644 --- a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql +++ b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_total_ghg.gql @@ -3,7 +3,7 @@ DIVIDE( SUM( MV( - other_indirect_emissions_non_energetic_co2, + MSECTOR(emissions_subsector, "Indirect emissions"), direct_reporting_emissions_total_ghg_emissions ) ), From 72a17fbb1aa4addd142a7f8ca37b17cbd848c0af Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 16:54:13 +0200 Subject: [PATCH 23/26] Update LULUCF 1990 emissions query --- .../per_sector/co2/direct_emissions_lulucf_co2_1990.gql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql index 0a823865f0..2db6b9f8df 100644 --- a/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql +++ b/gqueries/general/emissions/direct_emissions/1990_emissions/per_sector/co2/direct_emissions_lulucf_co2_1990.gql @@ -4,8 +4,8 @@ - query = DIVIDE( SUM( - EMISSIONS(lulucf_emissions, non_energetic, co2, 1990), - NEG(EMISSIONS(lulucf_removals, non_energetic, co2, 1990)) + EMISSIONS(emissions_sector, "LULUCF", co2, 1990), + NEG(EMISSIONS(emissions_subsector, "Removals", co2, 1990)) ), THOUSANDS ) From cbb7aa14eba06c0368d9f60e5199652bca54b5ce Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 16 Jul 2026 10:06:55 +0200 Subject: [PATCH 24/26] Remove mechanical turk queries --- ...rk_direct_emissions_total_ghg_all_nodes.gql | 18 ------------------ ..._indirect_emissions_lulucf_bunkers_1990.gql | 4 ---- ..._emissions_lulucf_bunkers_1990_manually.gql | 12 ------------ ..._incl_indirect_emissions_lulucf_bunkers.gql | 4 ---- 4 files changed, 38 deletions(-) delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql delete mode 100644 gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql deleted file mode 100644 index e4f6cf88ec..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_all_nodes.gql +++ /dev/null @@ -1,18 +0,0 @@ -# Mechanical turk query for total GHG emissions incl. indirect, LULUCF and international transport -# Sums results for all energy and molecule nodes - -- unit = MT -- query = - DIVIDE( - SUM( - V( - ALL(), - direct_reporting_emissions_total_ghg_emissions - ), - MV( - MALL(), - direct_reporting_emissions_total_ghg_emissions - ) - ), - BILLIONS - ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql deleted file mode 100644 index 231448d553..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total GHG emissions excl. indirect emissions, LULUCF and international transport for 1990 - -- unit = MT -- query = Q(direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql deleted file mode 100644 index 6e43568d20..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers_1990_manually.gql +++ /dev/null @@ -1,12 +0,0 @@ -# Mechanical turk query for total GHG emissions excl. indirect, LULUCF and international transport - -- unit = MT -- query = - SUM( - Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers_1990), - NEG(Q(direct_emissions_indirect_emissions_co2_1990)), - NEG(Q(direct_emissions_lulucf_co2_1990)), - NEG(Q(direct_emissions_lulucf_other_ghg_1990)), - NEG(Q(direct_emissions_bunkers_co2_1990)), - NEG(Q(direct_emissions_bunkers_other_ghg_1990)) - ) diff --git a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql deleted file mode 100644 index e8ae41c34d..0000000000 --- a/gqueries/mechanical_turk/emissions/turk_direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql +++ /dev/null @@ -1,4 +0,0 @@ -# Total GHG emissions incl. indirect emissions, LULUCF and international transport - -- unit = MT -- query = Q(direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers) From a9bbf793e025a4a69f8701da28b926cb96dc80c4 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 16 Jul 2026 10:45:49 +0200 Subject: [PATCH 25/26] Move total GHG queries to dedicated folder --- .../{ => total_ghg}/direct_emissions_agriculture_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_buildings_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_bunkers_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_energy_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_households_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_industry_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_lulucf_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_other_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_transport_total_ghg.gql | 0 .../{ => total_ghg}/direct_emissions_waste_total_ghg.gql | 0 ...emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql | 0 ...ions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql | 0 ...emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql | 0 ...ions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql | 0 ...ions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_agriculture_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_buildings_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_bunkers_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_energy_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_households_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_industry_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_lulucf_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_other_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_transport_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/per_sector/{ => total_ghg}/direct_emissions_waste_total_ghg.gql (100%) rename gqueries/general/emissions/direct_emissions/totals/{ => total_ghg}/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql (100%) rename gqueries/general/emissions/direct_emissions/totals/{ => total_ghg}/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql (100%) rename gqueries/general/emissions/direct_emissions/totals/{ => total_ghg}/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql (100%) rename gqueries/general/emissions/direct_emissions/totals/{ => total_ghg}/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql (100%) rename gqueries/general/emissions/direct_emissions/totals/{ => total_ghg}/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql (100%) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_agriculture_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_agriculture_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_buildings_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_buildings_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_bunkers_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_bunkers_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_energy_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_energy_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_households_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_households_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_industry_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_industry_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_lulucf_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_lulucf_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_other_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_other_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_transport_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_transport_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/per_sector/direct_emissions_waste_total_ghg.gql rename to gqueries/general/emissions/direct_emissions/per_sector/total_ghg/direct_emissions_waste_total_ghg.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql rename to gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_excl_indirect_emissions_lulucf_bunkers.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql rename to gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql rename to gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql rename to gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql diff --git a/gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql similarity index 100% rename from gqueries/general/emissions/direct_emissions/totals/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql rename to gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql From e2fb4ae9dc2620bb993b4e51f19cb2aeef8e0175 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 16 Jul 2026 11:18:18 +0200 Subject: [PATCH 26/26] Add CO2 and other GHG queries for start/future year --- .../direct_emissions_indirect_emissions_co2.gql | 12 ++++++++++++ .../co2/direct_emissions_agriculture_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_buildings_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_bunkers_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_energy_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_households_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_industry_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_lulucf_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_other_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_transport_co2.gql | 17 +++++++++++++++++ .../co2/direct_emissions_waste_co2.gql | 17 +++++++++++++++++ .../direct_emissions_agriculture_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_buildings_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_bunkers_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_energy_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_households_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_industry_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_lulucf_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_other_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_transport_other_ghg.gql | 15 +++++++++++++++ .../direct_emissions_waste_other_ghg.gql | 15 +++++++++++++++ ...2_excl_indirect_emissions_lulucf_bunkers.gql | 10 ++++++++++ ...l_indirect_emissions_excl_lulucf_bunkers.gql | 9 +++++++++ ...2_incl_indirect_emissions_lulucf_bunkers.gql | 16 ++++++++++++++++ ...l_indirect_emissions_lulucf_excl_bunkers.gql | 8 ++++++++ ...l_lulucf_excl_indirect_emissions_bunkers.gql | 9 +++++++++ ...g_excl_indirect_emissions_lulucf_bunkers.gql | 10 ++++++++++ ...l_indirect_emissions_excl_lulucf_bunkers.gql | 9 +++++++++ ...g_incl_indirect_emissions_lulucf_bunkers.gql | 16 ++++++++++++++++ ...l_indirect_emissions_lulucf_excl_bunkers.gql | 8 ++++++++ ...l_lulucf_excl_indirect_emissions_bunkers.gql | 9 +++++++++ ...g_incl_indirect_emissions_lulucf_bunkers.gql | 1 + 32 files changed, 437 insertions(+) create mode 100644 gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_agriculture_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_buildings_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_bunkers_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_energy_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_households_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_industry_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_lulucf_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_other_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_transport_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_waste_co2.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql create mode 100644 gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql diff --git a/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_co2.gql b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_co2.gql new file mode 100644 index 0000000000..76789801d1 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/miscellaneous/direct_emissions_indirect_emissions_co2.gql @@ -0,0 +1,12 @@ + +- unit = MT +- query = + DIVIDE( + SUM( + MV( + MSECTOR(emissions_subsector, "Indirect emissions"), + direct_reporting_emissions_co2_production + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_agriculture_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_agriculture_co2.gql new file mode 100644 index 0000000000..ff98f58371 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_agriculture_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Agriculture"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Agriculture"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_buildings_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_buildings_co2.gql new file mode 100644 index 0000000000..6f2eb7dee8 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_buildings_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Buildings"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Buildings"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_bunkers_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_bunkers_co2.gql new file mode 100644 index 0000000000..a9f886e6af --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_bunkers_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "International transport"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "International transport"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_energy_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_energy_co2.gql new file mode 100644 index 0000000000..9be388be46 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_energy_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Energy"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Energy"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_households_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_households_co2.gql new file mode 100644 index 0000000000..09cb10c000 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_households_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Households"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Households"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_industry_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_industry_co2.gql new file mode 100644 index 0000000000..212846a1f2 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_industry_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Industry"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Industry"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_lulucf_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_lulucf_co2.gql new file mode 100644 index 0000000000..6603b2b4f3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_lulucf_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "LULUCF"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "LULUCF"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_other_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_other_co2.gql new file mode 100644 index 0000000000..78c04c9698 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_other_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Other"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Other"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_transport_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_transport_co2.gql new file mode 100644 index 0000000000..cb31d397cc --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_transport_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "National transport"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "National transport"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_waste_co2.gql b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_waste_co2.gql new file mode 100644 index 0000000000..d24fbd50c2 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/co2/direct_emissions_waste_co2.gql @@ -0,0 +1,17 @@ +# Net CO2 emissions defined by subtracting captured CO2 from gross produced CO2 + +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Waste"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ), + MV( + MSECTOR(emissions_sector, "Waste"), + "direct_reporting_emissions_co2_production - direct_reporting_emissions_co2_capture" + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg.gql new file mode 100644 index 0000000000..265f9380e4 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_agriculture_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Agriculture"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Agriculture"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg.gql new file mode 100644 index 0000000000..7b5e79cc98 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_buildings_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Buildings"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Buildings"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg.gql new file mode 100644 index 0000000000..16c07cb8a5 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_bunkers_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "International transport"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "International transport"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg.gql new file mode 100644 index 0000000000..9073a30f4d --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_energy_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Energy"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Energy"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg.gql new file mode 100644 index 0000000000..447c644686 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_households_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Households"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Households"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg.gql new file mode 100644 index 0000000000..6212bd6820 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_industry_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Industry"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Industry"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg.gql new file mode 100644 index 0000000000..6f60c2456f --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_lulucf_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "LULUCF"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "LULUCF"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg.gql new file mode 100644 index 0000000000..857b0c6af1 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_other_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Other"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Other"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg.gql new file mode 100644 index 0000000000..476d9c3b3b --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_transport_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "National transport"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "National transport"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg.gql b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg.gql new file mode 100644 index 0000000000..08db1bd4e0 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/per_sector/other_ghg/direct_emissions_waste_other_ghg.gql @@ -0,0 +1,15 @@ +- unit = MT +- query = + DIVIDE( + SUM( + V( + SECTOR(emissions_sector, "Waste"), + direct_reporting_emissions_other_ghg_emissions + ), + MV( + MSECTOR(emissions_sector, "Waste"), + direct_reporting_emissions_other_ghg_emissions + ) + ), + BILLIONS + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..a29438493f --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_excl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,10 @@ +# Total CO2 emissions excl. indirect emissions, LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_indirect_emissions_co2)), + NEG(Q(direct_emissions_lulucf_co2)), + NEG(Q(direct_emissions_bunkers_co2)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers.gql new file mode 100644 index 0000000000..5b71a1dd45 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_excl_lulucf_bunkers.gql @@ -0,0 +1,9 @@ +# Total CO2 emissions incl. indirect emissions, excl. LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_lulucf_co2)), + NEG(Q(direct_emissions_bunkers_co2)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..a73506c8a1 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,16 @@ +# Total CO2 emissions incl. indirect emissions, LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_energy_co2), + Q(direct_emissions_industry_co2), + Q(direct_emissions_transport_co2), + Q(direct_emissions_buildings_co2), + Q(direct_emissions_households_co2), + Q(direct_emissions_agriculture_co2), + Q(direct_emissions_other_co2), + Q(direct_emissions_lulucf_co2), + Q(direct_emissions_waste_co2), + Q(direct_emissions_bunkers_co2) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers.gql new file mode 100644 index 0000000000..8d69281f50 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_indirect_emissions_lulucf_excl_bunkers.gql @@ -0,0 +1,8 @@ +# Total CO2 emissions incl. indirect emissions and LULUCF, excl. international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_bunkers_co2)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers.gql new file mode 100644 index 0000000000..ec7995d14f --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/co2/direct_emissions_co2_incl_lulucf_excl_indirect_emissions_bunkers.gql @@ -0,0 +1,9 @@ +# Total CO2 emissions incl. LULUCF, excl indirect emissions and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_co2_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_indirect_emissions_co2)), + NEG(Q(direct_emissions_bunkers_co2)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..67ff458bbe --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_excl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,10 @@ +# Total other GHG emissions excl. indirect emissions, LULUCF and international transport +# Only indirect CO2 emissions are modelled, therefore there is no query for indirect other GHG + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_lulucf_other_ghg)), + NEG(Q(direct_emissions_bunkers_other_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql new file mode 100644 index 0000000000..36709e7855 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_excl_lulucf_bunkers.gql @@ -0,0 +1,9 @@ +# Total other GHG emissions incl. indirect emissions, excl. LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_lulucf_other_ghg)), + NEG(Q(direct_emissions_bunkers_other_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers.gql new file mode 100644 index 0000000000..7a4088bbc3 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -0,0 +1,16 @@ +# Total other GHG emissions incl. indirect emissions, LULUCF and international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_energy_other_ghg), + Q(direct_emissions_industry_other_ghg), + Q(direct_emissions_transport_other_ghg), + Q(direct_emissions_buildings_other_ghg), + Q(direct_emissions_households_other_ghg), + Q(direct_emissions_agriculture_other_ghg), + Q(direct_emissions_other_other_ghg), + Q(direct_emissions_lulucf_other_ghg), + Q(direct_emissions_waste_other_ghg), + Q(direct_emissions_bunkers_other_ghg) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql new file mode 100644 index 0000000000..f17ed0d4ca --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_indirect_emissions_lulucf_excl_bunkers.gql @@ -0,0 +1,8 @@ +# Total other GHG emissions incl. indirect emissions and LULUCF, excl. international transport + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_bunkers_other_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql new file mode 100644 index 0000000000..db19feea83 --- /dev/null +++ b/gqueries/general/emissions/direct_emissions/totals/other_ghg/direct_emissions_other_ghg_incl_lulucf_excl_indirect_emissions_bunkers.gql @@ -0,0 +1,9 @@ +# Total other GHG emissions incl. LULUCF, excl indirect emissions and international transport +# Only indirect CO2 emissions are modelled, therefore there is no query for indirect other GHG + +- unit = MT +- query = + SUM( + Q(direct_emissions_other_ghg_incl_indirect_emissions_lulucf_bunkers), + NEG(Q(direct_emissions_bunkers_other_ghg)) + ) diff --git a/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql index 96e8d5a42b..6112cb4154 100644 --- a/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql +++ b/gqueries/general/emissions/direct_emissions/totals/total_ghg/direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers.gql @@ -1,4 +1,5 @@ # Total GHG emissions incl. indirect emissions, LULUCF and international transport + - unit = MT - query = SUM(