From 202792911420308cb5289a18763c8768a8ce05bc Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Wed, 26 Aug 2026 15:31:31 +0200 Subject: [PATCH 1/7] Queries for new insulation chart --- .../useful_heat_demand_per_apartment_1945_1964.gql | 2 ++ .../useful_heat_demand_per_apartment_1965_1984.gql | 2 ++ .../useful_heat_demand_per_apartment_1985_2004.gql | 2 ++ .../useful_heat_demand_per_apartment_2005_present.gql | 2 ++ .../useful_heat_demand_per_apartment_before_1945.gql | 2 ++ .../apartments/useful_heat_demand_per_apartment_future.gql | 2 ++ .../useful_heat_demand_per_detached_house_1945_1964.gql | 2 ++ .../useful_heat_demand_per_detached_house_1965_1984.gql | 2 ++ .../useful_heat_demand_per_detached_house_1985_2004.gql | 2 ++ .../useful_heat_demand_per_detached_house_2005_present.gql | 2 ++ .../useful_heat_demand_per_detached_house_before_1945.gql | 2 ++ .../useful_heat_demand_per_detached_house_future.gql | 2 ++ .../useful_heat_demand_per_semi_detached_house_1945_1964.gql | 2 ++ .../useful_heat_demand_per_semi_detached_house_1965_1984.gql | 2 ++ .../useful_heat_demand_per_semi_detached_house_1985_2004.gql | 2 ++ ...eful_heat_demand_per_semi_detached_house_2005_present.gql | 2 ++ ...seful_heat_demand_per_semi_detached_house_before_1945.gql | 2 ++ .../useful_heat_demand_per_semi_detached_house_future.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1945_1964.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1965_1984.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1985_2004.gql | 2 ++ .../useful_heat_demand_per_terraced_house_2005_present.gql | 2 ++ .../useful_heat_demand_per_terraced_house_before_1945.gql | 2 ++ .../useful_heat_demand_per_terraced_house_future.gql | 2 ++ .../apartments/useful_demand_apartments_1945_1964.gql | 0 .../apartments/useful_demand_apartments_1965_1984.gql | 0 .../apartments/useful_demand_apartments_1985_2004.gql | 0 .../apartments/useful_demand_apartments_2005_present.gql | 0 .../apartments/useful_demand_apartments_before_1945.gql | 0 .../apartments/useful_demand_apartments_future.gql | 0 .../useful_demand_detached_houses_1945_1964.gql | 0 .../useful_demand_detached_houses_1965_1984.gql | 0 .../useful_demand_detached_houses_1985_2004.gql | 0 .../useful_demand_detached_houses_2005_present.gql | 0 .../useful_demand_detached_houses_before_1945.gql | 0 .../detached_houses/useful_demand_detached_houses_future.gql | 0 .../useful_demand_semi_detached_houses_1945_1964.gql | 0 .../useful_demand_semi_detached_houses_1965_1984.gql | 0 .../useful_demand_semi_detached_houses_1985_2004.gql | 0 .../useful_demand_semi_detached_houses_2005_present.gql | 0 .../useful_demand_semi_detached_houses_before_1945.gql | 0 .../useful_demand_semi_detached_houses_future.gql | 0 .../useful_demand_terraced_houses_1945_1964.gql | 0 .../useful_demand_terraced_houses_1965_1984.gql | 0 .../useful_demand_terraced_houses_1985_2004.gql | 0 .../useful_demand_terraced_houses_2005_present.gql | 0 .../useful_demand_terraced_houses_before_1945.gql | 0 .../terraced_houses/useful_demand_terraced_houses_future.gql | 0 .../total_demand_type/useful_demand_apartments.gql | 0 .../total_demand_type/useful_demand_detached_houses.gql | 0 .../total_demand_type/useful_demand_semi_detached_houses.gql | 0 .../total_demand_type/useful_demand_terraced_houses.gql | 0 .../useful_demand_total_residences_1945_1964.gql | 0 .../useful_demand_total_residences_1965_1984.gql | 0 .../useful_demand_total_residences_1985_2004.gql | 0 .../useful_demand_total_residences_2005_present.gql | 0 .../useful_demand_total_residences_before_1945.gql | 0 .../useful_demand_total_residences_future.gql | 0 .../useful_heat_demand_per_apartment_1945_1964_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_1965_1984_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_1985_2004_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_2005_present_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_before_1945_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_future_bar.gql | 2 ++ ...ul_heat_demand_per_fully_detached_house_1945_1964_bar.gql | 5 +++++ ...ul_heat_demand_per_fully_detached_house_1965_1984_bar.gql | 5 +++++ ...ul_heat_demand_per_fully_detached_house_1985_2004_bar.gql | 5 +++++ ...heat_demand_per_fully_detached_house_2005_present_bar.gql | 5 +++++ ..._heat_demand_per_fully_detached_house_before_1945_bar.gql | 5 +++++ ...seful_heat_demand_per_fully_detached_house_future_bar.gql | 5 +++++ ...ful_heat_demand_per_semi_detached_house_1945_1964_bar.gql | 2 ++ ...ful_heat_demand_per_semi_detached_house_1965_1984_bar.gql | 2 ++ ...ful_heat_demand_per_semi_detached_house_1985_2004_bar.gql | 2 ++ ..._heat_demand_per_semi_detached_house_2005_present_bar.gql | 2 ++ ...l_heat_demand_per_semi_detached_house_before_1945_bar.gql | 2 ++ ...useful_heat_demand_per_semi_detached_house_future_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1945_1964_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1965_1984_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1985_2004_bar.gql | 2 ++ ...seful_heat_demand_per_terraced_house_2005_present_bar.gql | 2 ++ ...useful_heat_demand_per_terraced_house_before_1945_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_future_bar.gql | 2 ++ 82 files changed, 114 insertions(+) create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql create mode 100644 gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql create mode 100644 gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql create mode 100644 gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql create mode 100644 gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_1945_1964.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_1965_1984.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_1985_2004.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_2005_present.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_before_1945.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/apartments/useful_demand_apartments_future.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_1945_1964.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_1965_1984.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_1985_2004.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_2005_present.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_before_1945.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/detached_houses/useful_demand_detached_houses_future.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_1945_1964.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_1965_1984.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_1985_2004.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_2005_present.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_before_1945.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/semi_detached_houses/useful_demand_semi_detached_houses_future.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_1945_1964.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_1965_1984.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_1985_2004.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_2005_present.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_before_1945.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/terraced_houses/useful_demand_terraced_houses_future.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_demand_type/useful_demand_apartments.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_demand_type/useful_demand_detached_houses.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_demand_type/useful_demand_semi_detached_houses.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_demand_type/useful_demand_terraced_houses.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_1945_1964.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_1965_1984.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_1985_2004.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_2005_present.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_before_1945.gql (100%) rename gqueries/general/useful_demand/households/{ => totals}/total_residences_building_period/useful_demand_total_residences_future.gql (100%) create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql new file mode 100644 index 0000000000..e12414f067 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1945_1964),Q(number_of_apartments_1945_1964)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql new file mode 100644 index 0000000000..e12414f067 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1945_1964),Q(number_of_apartments_1945_1964)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql new file mode 100644 index 0000000000..1551ddd2c6 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1985_2004),Q(number_of_apartments_1985_2004)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql new file mode 100644 index 0000000000..409666e0ea --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_2005_present),Q(number_of_apartments_2005_present)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql new file mode 100644 index 0000000000..161856f1f8 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_before_1945),Q(number_of_apartments_before_1945)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql new file mode 100644 index 0000000000..c7be32e65c --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_future),Q(number_of_apartments_future)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql new file mode 100644 index 0000000000..13e57bf678 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1945_1964),Q(number_of_detached_houses_1945_1964)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql new file mode 100644 index 0000000000..362c844c6e --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1965_1984),Q(number_of_detached_houses_1965_1984)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql new file mode 100644 index 0000000000..fc56e5cb4c --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1985_2004),Q(number_of_detached_houses_1985_2004)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql new file mode 100644 index 0000000000..cca3c37f73 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_2005_present),Q(number_of_detached_houses_2005_present)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql new file mode 100644 index 0000000000..0c2fb92f99 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_before_1945),Q(number_of_detached_houses_before_1945)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql new file mode 100644 index 0000000000..04431e05bd --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_future),Q(number_of_detached_houses_future)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql new file mode 100644 index 0000000000..ad2a1f22d8 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1945_1964),Q(number_of_semi_detached_houses_1945_1964)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql new file mode 100644 index 0000000000..bfebdae7a7 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1965_1984),Q(number_of_semi_detached_houses_1965_1984)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql new file mode 100644 index 0000000000..79b9c63e2b --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1985_2004),Q(number_of_semi_detached_houses_1985_2004)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql new file mode 100644 index 0000000000..4c36663602 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_2005_present),Q(number_of_semi_detached_houses_2005_present)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql new file mode 100644 index 0000000000..7edd80e11d --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_before_1945),Q(number_of_semi_detached_houses_before_1945)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql new file mode 100644 index 0000000000..586d5d6a94 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_future),Q(number_of_semi_detached_houses_future)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql new file mode 100644 index 0000000000..21c4365f4c --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1945_1964),Q(number_of_terraced_houses_1945_1964)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql new file mode 100644 index 0000000000..108a3a3c6b --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1965_1984),Q(number_of_terraced_houses_1965_1984)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql new file mode 100644 index 0000000000..48a3fb0fd5 --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1985_2004),Q(number_of_terraced_houses_1985_2004)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql new file mode 100644 index 0000000000..d6fb25cc3c --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_2005_present),Q(number_of_terraced_houses_2005_present)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql new file mode 100644 index 0000000000..c77ee36bbf --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_before_1945),Q(number_of_terraced_houses_before_1945)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql new file mode 100644 index 0000000000..d4f53c652c --- /dev/null +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_future),Q(number_of_terraced_houses_future)),1000000) +- unit = GJ diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1945_1964.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1945_1964.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1945_1964.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1945_1964.gql diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1965_1984.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1965_1984.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1965_1984.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1965_1984.gql diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1985_2004.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1985_2004.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_1985_2004.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_1985_2004.gql diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_2005_present.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_2005_present.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_2005_present.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_2005_present.gql diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_before_1945.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_before_1945.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_before_1945.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_before_1945.gql diff --git a/gqueries/general/useful_demand/households/apartments/useful_demand_apartments_future.gql b/gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_future.gql similarity index 100% rename from gqueries/general/useful_demand/households/apartments/useful_demand_apartments_future.gql rename to gqueries/general/useful_demand/households/totals/apartments/useful_demand_apartments_future.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1945_1964.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1945_1964.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1945_1964.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1945_1964.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1965_1984.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1965_1984.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1965_1984.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1965_1984.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1985_2004.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1985_2004.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_1985_2004.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_1985_2004.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_2005_present.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_2005_present.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_2005_present.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_2005_present.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_before_1945.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_before_1945.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_before_1945.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_before_1945.gql diff --git a/gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_future.gql b/gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_future.gql similarity index 100% rename from gqueries/general/useful_demand/households/detached_houses/useful_demand_detached_houses_future.gql rename to gqueries/general/useful_demand/households/totals/detached_houses/useful_demand_detached_houses_future.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1945_1964.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1945_1964.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1945_1964.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1945_1964.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1965_1984.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1965_1984.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1965_1984.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1965_1984.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1985_2004.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1985_2004.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_1985_2004.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_1985_2004.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_2005_present.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_2005_present.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_2005_present.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_2005_present.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_before_1945.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_before_1945.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_before_1945.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_before_1945.gql diff --git a/gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_future.gql b/gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_future.gql similarity index 100% rename from gqueries/general/useful_demand/households/semi_detached_houses/useful_demand_semi_detached_houses_future.gql rename to gqueries/general/useful_demand/households/totals/semi_detached_houses/useful_demand_semi_detached_houses_future.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1945_1964.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1945_1964.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1945_1964.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1945_1964.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1965_1984.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1965_1984.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1965_1984.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1965_1984.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1985_2004.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1985_2004.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_1985_2004.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_1985_2004.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_2005_present.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_2005_present.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_2005_present.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_2005_present.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_before_1945.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_before_1945.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_before_1945.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_before_1945.gql diff --git a/gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_future.gql b/gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_future.gql similarity index 100% rename from gqueries/general/useful_demand/households/terraced_houses/useful_demand_terraced_houses_future.gql rename to gqueries/general/useful_demand/households/totals/terraced_houses/useful_demand_terraced_houses_future.gql diff --git a/gqueries/general/useful_demand/households/total_demand_type/useful_demand_apartments.gql b/gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_apartments.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_demand_type/useful_demand_apartments.gql rename to gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_apartments.gql diff --git a/gqueries/general/useful_demand/households/total_demand_type/useful_demand_detached_houses.gql b/gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_detached_houses.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_demand_type/useful_demand_detached_houses.gql rename to gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_detached_houses.gql diff --git a/gqueries/general/useful_demand/households/total_demand_type/useful_demand_semi_detached_houses.gql b/gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_semi_detached_houses.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_demand_type/useful_demand_semi_detached_houses.gql rename to gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_semi_detached_houses.gql diff --git a/gqueries/general/useful_demand/households/total_demand_type/useful_demand_terraced_houses.gql b/gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_terraced_houses.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_demand_type/useful_demand_terraced_houses.gql rename to gqueries/general/useful_demand/households/totals/total_demand_type/useful_demand_terraced_houses.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1945_1964.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1945_1964.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1945_1964.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1945_1964.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1965_1984.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1965_1984.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1965_1984.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1965_1984.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1985_2004.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1985_2004.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_1985_2004.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_1985_2004.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_2005_present.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_2005_present.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_2005_present.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_2005_present.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_before_1945.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_before_1945.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_before_1945.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_before_1945.gql diff --git a/gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_future.gql b/gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_future.gql similarity index 100% rename from gqueries/general/useful_demand/households/total_residences_building_period/useful_demand_total_residences_future.gql rename to gqueries/general/useful_demand/households/totals/total_residences_building_period/useful_demand_total_residences_future.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql new file mode 100644 index 0000000000..c91f8a46b8 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_1945_1964),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql new file mode 100644 index 0000000000..5efb4c580c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_1965_1984),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql new file mode 100644 index 0000000000..741593e945 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_1985_2004),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql new file mode 100644 index 0000000000..7f5950c0f3 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_2005_present),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql new file mode 100644 index 0000000000..938ebb8432 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_before_1945),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql new file mode 100644 index 0000000000..cfdd887fd1 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_apartment_future),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql new file mode 100644 index 0000000000..831f6de259 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_1945_1964),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql new file mode 100644 index 0000000000..bb9a81e2e5 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_1965_1984),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql new file mode 100644 index 0000000000..0c705408f7 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_1985_2004),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql new file mode 100644 index 0000000000..8d30d9afb7 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_2005_present),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql new file mode 100644 index 0000000000..d8767fa5be --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_before_1945),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql new file mode 100644 index 0000000000..823e908702 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = ROUND(Q(useful_heat_demand_per_detached_house_future),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql new file mode 100644 index 0000000000..c318d3d935 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1945_1964),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql new file mode 100644 index 0000000000..51680c8b0a --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1965_1984),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql new file mode 100644 index 0000000000..58aa571ee2 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1985_2004),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql new file mode 100644 index 0000000000..396d42c7eb --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_2005_present),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql new file mode 100644 index 0000000000..9ab3cfa742 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_before_1945),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql new file mode 100644 index 0000000000..50dc727f3e --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_future),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql new file mode 100644 index 0000000000..90701815e6 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_1945_1964),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql new file mode 100644 index 0000000000..e32de8f89f --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_1965_1984),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql new file mode 100644 index 0000000000..81717aa074 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_1985_2004),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql new file mode 100644 index 0000000000..7df5ddfb54 --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_2005_present),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql new file mode 100644 index 0000000000..a50c013f9a --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_before_1945),2) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql new file mode 100644 index 0000000000..5bd03d754c --- /dev/null +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql @@ -0,0 +1,2 @@ +- query = ROUND(Q(useful_heat_demand_per_terraced_house_future),2) +- unit = GJ From 242098a12a1259227a121bf8f7410601fa9e176c Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Thu, 27 Aug 2026 11:18:28 +0200 Subject: [PATCH 2/7] Renamed the folder and omitted the ROUND() function in the queries --- .../useful_heat_demand_per_apartment_1945_1964_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_1965_1984_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_1985_2004_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_2005_present_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_before_1945_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_future_bar.gql | 2 ++ ...ul_heat_demand_per_fully_detached_house_1945_1964_bar.gql | 2 +- ...ul_heat_demand_per_fully_detached_house_1965_1984_bar.gql | 2 +- ...ul_heat_demand_per_fully_detached_house_1985_2004_bar.gql | 2 +- ...heat_demand_per_fully_detached_house_2005_present_bar.gql | 5 +++++ ..._heat_demand_per_fully_detached_house_before_1945_bar.gql | 5 +++++ ...seful_heat_demand_per_fully_detached_house_future_bar.gql | 2 +- ...ful_heat_demand_per_semi_detached_house_1945_1964_bar.gql | 2 ++ ...ful_heat_demand_per_semi_detached_house_1965_1984_bar.gql | 2 ++ ...ful_heat_demand_per_semi_detached_house_1985_2004_bar.gql | 2 ++ ..._heat_demand_per_semi_detached_house_2005_present_bar.gql | 2 ++ ...l_heat_demand_per_semi_detached_house_before_1945_bar.gql | 2 ++ ...useful_heat_demand_per_semi_detached_house_future_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1945_1964_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1965_1984_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_1985_2004_bar.gql | 2 ++ ...seful_heat_demand_per_terraced_house_2005_present_bar.gql | 2 ++ ...useful_heat_demand_per_terraced_house_before_1945_bar.gql | 2 ++ .../useful_heat_demand_per_terraced_house_future_bar.gql | 2 ++ .../useful_heat_demand_per_apartment_1945_1964_bar.gql | 2 -- .../useful_heat_demand_per_apartment_1965_1984_bar.gql | 2 -- .../useful_heat_demand_per_apartment_1985_2004_bar.gql | 2 -- .../useful_heat_demand_per_apartment_2005_present_bar.gql | 2 -- .../useful_heat_demand_per_apartment_before_1945_bar.gql | 2 -- .../useful_heat_demand_per_apartment_future_bar.gql | 2 -- ...heat_demand_per_fully_detached_house_2005_present_bar.gql | 5 ----- ..._heat_demand_per_fully_detached_house_before_1945_bar.gql | 5 ----- ...ful_heat_demand_per_semi_detached_house_1945_1964_bar.gql | 2 -- ...ful_heat_demand_per_semi_detached_house_1965_1984_bar.gql | 2 -- ...ful_heat_demand_per_semi_detached_house_1985_2004_bar.gql | 2 -- ..._heat_demand_per_semi_detached_house_2005_present_bar.gql | 2 -- ...l_heat_demand_per_semi_detached_house_before_1945_bar.gql | 2 -- ...useful_heat_demand_per_semi_detached_house_future_bar.gql | 2 -- .../useful_heat_demand_per_terraced_house_1945_1964_bar.gql | 2 -- .../useful_heat_demand_per_terraced_house_1965_1984_bar.gql | 2 -- .../useful_heat_demand_per_terraced_house_1985_2004_bar.gql | 2 -- ...seful_heat_demand_per_terraced_house_2005_present_bar.gql | 2 -- ...useful_heat_demand_per_terraced_house_before_1945_bar.gql | 2 -- .../useful_heat_demand_per_terraced_house_future_bar.gql | 2 -- 44 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql rename gqueries/output_elements/output_series/{vertical_stacked_bar_heat_demand_per_household => category_bar_heat_demand_per_household}/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql (70%) rename gqueries/output_elements/output_series/{vertical_stacked_bar_heat_demand_per_household => category_bar_heat_demand_per_household}/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql (70%) rename gqueries/output_elements/output_series/{vertical_stacked_bar_heat_demand_per_household => category_bar_heat_demand_per_household}/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql (70%) create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql rename gqueries/output_elements/output_series/{vertical_stacked_bar_heat_demand_per_household => category_bar_heat_demand_per_household}/useful_heat_demand_per_fully_detached_house_future_bar.gql (71%) create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql create mode 100644 gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql new file mode 100644 index 0000000000..aa8fbc4696 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_1945_1964) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql new file mode 100644 index 0000000000..25506b3de8 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_1965_1984) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql new file mode 100644 index 0000000000..4441087177 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_1985_2004) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql new file mode 100644 index 0000000000..7ed957adc3 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_2005_present) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql new file mode 100644 index 0000000000..9d3cbb7b2a --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_before_1945) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql new file mode 100644 index 0000000000..786360c502 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_apartment_future) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql similarity index 70% rename from gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql index 831f6de259..5d7b146435 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql @@ -1,5 +1,5 @@ # Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial # query name) can distinguish this from 'semi_detached'. -- query = ROUND(Q(useful_heat_demand_per_detached_house_1945_1964),2) +- query = Q(useful_heat_demand_per_detached_house_1945_1964) - unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql similarity index 70% rename from gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql index bb9a81e2e5..e18114302e 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql @@ -1,5 +1,5 @@ # Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial # query name) can distinguish this from 'semi_detached'. -- query = ROUND(Q(useful_heat_demand_per_detached_house_1965_1984),2) +- query = Q(useful_heat_demand_per_detached_house_1965_1984) - unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql similarity index 70% rename from gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql index 0c705408f7..5270e2da0c 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql @@ -1,5 +1,5 @@ # Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial # query name) can distinguish this from 'semi_detached'. -- query = ROUND(Q(useful_heat_demand_per_detached_house_1985_2004),2) +- query = Q(useful_heat_demand_per_detached_house_1985_2004) - unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql new file mode 100644 index 0000000000..5bb4c53c6b --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = Q(useful_heat_demand_per_detached_house_2005_present) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql new file mode 100644 index 0000000000..d2e8fc1b9f --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql @@ -0,0 +1,5 @@ +# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial +# query name) can distinguish this from 'semi_detached'. + +- query = Q(useful_heat_demand_per_detached_house_before_1945) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql similarity index 71% rename from gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql index 823e908702..c01ea3e407 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql @@ -1,5 +1,5 @@ # Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial # query name) can distinguish this from 'semi_detached'. -- query = ROUND(Q(useful_heat_demand_per_detached_house_future),2) +- query = Q(useful_heat_demand_per_detached_house_future) - unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql new file mode 100644 index 0000000000..e735c9208b --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_1945_1964) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql new file mode 100644 index 0000000000..8c0d9d2a1e --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_1965_1984) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql new file mode 100644 index 0000000000..94d5d8d25d --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_1985_2004) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql new file mode 100644 index 0000000000..62cb50148b --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_2005_present) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql new file mode 100644 index 0000000000..d2b1d4e7ba --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_before_1945) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql new file mode 100644 index 0000000000..9d99963119 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_semi_detached_house_future) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql new file mode 100644 index 0000000000..223b37ae2d --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_1945_1964) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql new file mode 100644 index 0000000000..525a61c84a --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_1965_1984) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql new file mode 100644 index 0000000000..32ac010996 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_1985_2004) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql new file mode 100644 index 0000000000..0a8e758d0d --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_2005_present) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql new file mode 100644 index 0000000000..f8f3a1e3d1 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_before_1945) +- unit = GJ diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql new file mode 100644 index 0000000000..17efafc282 --- /dev/null +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql @@ -0,0 +1,2 @@ +- query = Q(useful_heat_demand_per_terraced_house_future) +- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql deleted file mode 100644 index c91f8a46b8..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_1945_1964),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql deleted file mode 100644 index 5efb4c580c..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_1965_1984),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql deleted file mode 100644 index 741593e945..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_1985_2004),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql deleted file mode 100644 index 7f5950c0f3..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_2005_present),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql deleted file mode 100644 index 938ebb8432..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_before_1945),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql deleted file mode 100644 index cfdd887fd1..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_apartment_future),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql deleted file mode 100644 index 8d30d9afb7..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql +++ /dev/null @@ -1,5 +0,0 @@ -# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial -# query name) can distinguish this from 'semi_detached'. - -- query = ROUND(Q(useful_heat_demand_per_detached_house_2005_present),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql deleted file mode 100644 index d8767fa5be..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql +++ /dev/null @@ -1,5 +0,0 @@ -# Named 'fully_detached' instead of 'detached' so ETModel's dropdown filter (matches on partial -# query name) can distinguish this from 'semi_detached'. - -- query = ROUND(Q(useful_heat_demand_per_detached_house_before_1945),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql deleted file mode 100644 index c318d3d935..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1945_1964),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql deleted file mode 100644 index 51680c8b0a..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1965_1984),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql deleted file mode 100644 index 58aa571ee2..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_1985_2004),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql deleted file mode 100644 index 396d42c7eb..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_2005_present),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql deleted file mode 100644 index 9ab3cfa742..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_before_1945),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql deleted file mode 100644 index 50dc727f3e..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_semi_detached_house_future),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql deleted file mode 100644 index 90701815e6..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_1945_1964),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql deleted file mode 100644 index e32de8f89f..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_1965_1984),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql deleted file mode 100644 index 81717aa074..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_1985_2004),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql deleted file mode 100644 index 7df5ddfb54..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_2005_present),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql deleted file mode 100644 index a50c013f9a..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_before_1945),2) -- unit = GJ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql deleted file mode 100644 index 5bd03d754c..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql +++ /dev/null @@ -1,2 +0,0 @@ -- query = ROUND(Q(useful_heat_demand_per_terraced_house_future),2) -- unit = GJ From 7eaa44ae5c89455fd519cf696ceab48f07365db2 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Thu, 27 Aug 2026 11:24:44 +0200 Subject: [PATCH 3/7] Deleted queries no longer in use for totals bar --- .../useful_demand_total_residences_1945_1964_bar.gql | 3 --- .../useful_demand_total_residences_1965_1984_bar.gql | 3 --- .../useful_demand_total_residences_1985_2004_bar.gql | 3 --- .../useful_demand_total_residences_2005_present_bar.gql | 3 --- .../useful_demand_total_residences_before_1945_bar.gql | 3 --- .../useful_demand_total_residences_future_bar.gql | 3 --- 6 files changed, 18 deletions(-) delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1945_1964_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1965_1984_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1985_2004_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_2005_present_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_before_1945_bar.gql delete mode 100644 gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_future_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1945_1964_bar.gql deleted file mode 100644 index cef0756f8e..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1945_1964_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_1945_1964) -- unit = PJ - diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1965_1984_bar.gql deleted file mode 100644 index ff3c527423..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1965_1984_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_1965_1984) -- unit = PJ - diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1985_2004_bar.gql deleted file mode 100644 index b5e75ddfcc..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_1985_2004_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_1985_2004) -- unit = PJ - diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_2005_present_bar.gql deleted file mode 100644 index 533cb462af..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_2005_present_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_2005_present) -- unit = PJ - diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_before_1945_bar.gql deleted file mode 100644 index cab6013c06..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_before_1945_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_before_1945) -- unit = PJ - diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_future_bar.gql deleted file mode 100644 index 747d00d9e9..0000000000 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_total_residences_future_bar.gql +++ /dev/null @@ -1,3 +0,0 @@ -- query = Q(useful_demand_total_residences_future) -- unit = PJ - From 52299a01b0895e88acc141a33a8e3c69f5bfaf1c Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 28 Aug 2026 13:58:03 +0200 Subject: [PATCH 4/7] Small changes due to feedback - Fixed the query for apartments 1965_1984 - Improved readability of queries --- .../useful_heat_demand_per_apartment_1945_1964.gql | 9 ++++++++- .../useful_heat_demand_per_apartment_1965_1984.gql | 9 ++++++++- .../useful_heat_demand_per_apartment_1985_2004.gql | 9 ++++++++- .../useful_heat_demand_per_apartment_2005_present.gql | 9 ++++++++- .../useful_heat_demand_per_apartment_before_1945.gql | 9 ++++++++- .../useful_heat_demand_per_apartment_future.gql | 9 ++++++++- .../useful_heat_demand_per_detached_house_1945_1964.gql | 9 ++++++++- .../useful_heat_demand_per_detached_house_1965_1984.gql | 9 ++++++++- .../useful_heat_demand_per_detached_house_1985_2004.gql | 9 ++++++++- ...seful_heat_demand_per_detached_house_2005_present.gql | 9 ++++++++- ...useful_heat_demand_per_detached_house_before_1945.gql | 9 ++++++++- .../useful_heat_demand_per_detached_house_future.gql | 9 ++++++++- ...ful_heat_demand_per_semi_detached_house_1945_1964.gql | 9 ++++++++- ...ful_heat_demand_per_semi_detached_house_1965_1984.gql | 9 ++++++++- ...ful_heat_demand_per_semi_detached_house_1985_2004.gql | 9 ++++++++- ..._heat_demand_per_semi_detached_house_2005_present.gql | 9 ++++++++- ...l_heat_demand_per_semi_detached_house_before_1945.gql | 9 ++++++++- ...useful_heat_demand_per_semi_detached_house_future.gql | 9 ++++++++- .../useful_heat_demand_per_terraced_house_1945_1964.gql | 9 ++++++++- .../useful_heat_demand_per_terraced_house_1965_1984.gql | 9 ++++++++- .../useful_heat_demand_per_terraced_house_1985_2004.gql | 9 ++++++++- ...seful_heat_demand_per_terraced_house_2005_present.gql | 9 ++++++++- ...useful_heat_demand_per_terraced_house_before_1945.gql | 9 ++++++++- .../useful_heat_demand_per_terraced_house_future.gql | 9 ++++++++- 24 files changed, 192 insertions(+), 24 deletions(-) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql index e12414f067..0a6565baf3 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1945_1964),Q(number_of_apartments_1945_1964)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_1945_1964), + Q(number_of_apartments_1945_1964) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql index e12414f067..ff9d841282 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1945_1964),Q(number_of_apartments_1945_1964)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_1965_1984), + Q(number_of_apartments_1965_1984) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql index 1551ddd2c6..d03ea3da56 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_1985_2004),Q(number_of_apartments_1985_2004)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_1985_2004), + Q(number_of_apartments_1985_2004) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql index 409666e0ea..6ee44836b8 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_2005_present),Q(number_of_apartments_2005_present)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_2005_present), + Q(number_of_apartments_2005_present) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql index 161856f1f8..d9a57a8f1b 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_before_1945),Q(number_of_apartments_before_1945)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_before_1945), + Q(number_of_apartments_before_1945) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql index c7be32e65c..dfe6c3d684 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_apartments_future),Q(number_of_apartments_future)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_apartments_future), + Q(number_of_apartments_future) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql index 13e57bf678..57bf2c592f 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1945_1964),Q(number_of_detached_houses_1945_1964)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_1945_1964), + Q(number_of_detached_houses_1945_1964) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql index 362c844c6e..464bcad5ce 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1965_1984),Q(number_of_detached_houses_1965_1984)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_1965_1984), + Q(number_of_detached_houses_1965_1984) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql index fc56e5cb4c..047bb84189 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_1985_2004),Q(number_of_detached_houses_1985_2004)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_1985_2004), + Q(number_of_detached_houses_1985_2004) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql index cca3c37f73..e1444f8f45 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_2005_present),Q(number_of_detached_houses_2005_present)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_2005_present), + Q(number_of_detached_houses_2005_present) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql index 0c2fb92f99..8ea199ceff 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_before_1945),Q(number_of_detached_houses_before_1945)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_before_1945), + Q(number_of_detached_houses_before_1945) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql index 04431e05bd..96b87aff91 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_detached_houses_future),Q(number_of_detached_houses_future)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_detached_houses_future), + Q(number_of_detached_houses_future) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql index ad2a1f22d8..dd5b692f7c 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1945_1964),Q(number_of_semi_detached_houses_1945_1964)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_1945_1964), + Q(number_of_semi_detached_houses_1945_1964) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql index bfebdae7a7..4df98707c4 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1965_1984),Q(number_of_semi_detached_houses_1965_1984)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_1965_1984), + Q(number_of_semi_detached_houses_1965_1984) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql index 79b9c63e2b..21f8afbebc 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_1985_2004),Q(number_of_semi_detached_houses_1985_2004)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_1985_2004), + Q(number_of_semi_detached_houses_1985_2004) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql index 4c36663602..5da1a54572 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_2005_present),Q(number_of_semi_detached_houses_2005_present)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_2005_present), + Q(number_of_semi_detached_houses_2005_present) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql index 7edd80e11d..1bb7aa7556 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_before_1945),Q(number_of_semi_detached_houses_before_1945)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_before_1945), + Q(number_of_semi_detached_houses_before_1945) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql index 586d5d6a94..55815fe160 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_semi_detached_houses_future),Q(number_of_semi_detached_houses_future)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_semi_detached_houses_future), + Q(number_of_semi_detached_houses_future) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql index 21c4365f4c..f4916eee21 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1945_1964),Q(number_of_terraced_houses_1945_1964)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_1945_1964), + Q(number_of_terraced_houses_1945_1964) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql index 108a3a3c6b..7eaf79fa60 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1965_1984),Q(number_of_terraced_houses_1965_1984)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_1965_1984), + Q(number_of_terraced_houses_1965_1984) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql index 48a3fb0fd5..f4f446e328 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_1985_2004),Q(number_of_terraced_houses_1985_2004)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_1985_2004), + Q(number_of_terraced_houses_1985_2004) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql index d6fb25cc3c..c558d2d0d2 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_2005_present),Q(number_of_terraced_houses_2005_present)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_2005_present), + Q(number_of_terraced_houses_2005_present) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql index c77ee36bbf..b185c4b171 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_before_1945),Q(number_of_terraced_houses_before_1945)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_before_1945), + Q(number_of_terraced_houses_before_1945) + ), + MILLIONS + ) - unit = GJ diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql index d4f53c652c..8914b630b1 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql @@ -1,2 +1,9 @@ -- query = PRODUCT(DIVIDE(Q(useful_demand_terraced_houses_future),Q(number_of_terraced_houses_future)),1000000) +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_terraced_houses_future), + Q(number_of_terraced_houses_future) + ), + MILLIONS + ) - unit = GJ From 05bb22219368871031f5b7ca1e12d880f82cdc0d Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 28 Aug 2026 14:55:22 +0200 Subject: [PATCH 5/7] Indentation improvement --- .../apartments/useful_heat_demand_per_apartment_1945_1964.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1965_1984.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1985_2004.gql | 2 +- .../useful_heat_demand_per_apartment_2005_present.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_before_1945.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_future.gql | 2 +- .../useful_heat_demand_per_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_detached_house_future.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_future.gql | 2 +- .../useful_heat_demand_per_terraced_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_terraced_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_terraced_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_terraced_house_2005_present.gql | 2 +- .../useful_heat_demand_per_terraced_house_before_1945.gql | 2 +- .../useful_heat_demand_per_terraced_house_future.gql | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql index 0a6565baf3..2cafc12e58 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1945_1964), Q(number_of_apartments_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql index ff9d841282..2e3cf31210 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1965_1984), Q(number_of_apartments_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql index d03ea3da56..0d3839e720 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1985_2004), Q(number_of_apartments_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql index 6ee44836b8..f958327d07 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_2005_present), Q(number_of_apartments_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql index d9a57a8f1b..f257151d87 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_before_1945), Q(number_of_apartments_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql index dfe6c3d684..5a8d3dd1a9 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_future), Q(number_of_apartments_future) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql index 57bf2c592f..f4dd36f45b 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1945_1964), Q(number_of_detached_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql index 464bcad5ce..cefdb10927 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1965_1984), Q(number_of_detached_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql index 047bb84189..5aac509f4f 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1985_2004), Q(number_of_detached_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql index e1444f8f45..b0bbb15480 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_2005_present), Q(number_of_detached_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql index 8ea199ceff..7fa93e58c9 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_before_1945), Q(number_of_detached_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql index 96b87aff91..ce82cc98a2 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_future), Q(number_of_detached_houses_future) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql index dd5b692f7c..13e53f7073 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1945_1964), Q(number_of_semi_detached_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql index 4df98707c4..605aa1b810 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1965_1984), Q(number_of_semi_detached_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql index 21f8afbebc..b41ce663f8 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1985_2004), Q(number_of_semi_detached_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql index 5da1a54572..c33f2fc626 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_2005_present), Q(number_of_semi_detached_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql index 1bb7aa7556..26dffe4932 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_before_1945), Q(number_of_semi_detached_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql index 55815fe160..6d70e061c7 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_future), Q(number_of_semi_detached_houses_future) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql index f4916eee21..226c22fd96 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1945_1964), Q(number_of_terraced_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql index 7eaf79fa60..1243650511 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1965_1984), Q(number_of_terraced_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql index f4f446e328..9736b5b008 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1985_2004), Q(number_of_terraced_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql index c558d2d0d2..6f2f2a9c40 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_2005_present), Q(number_of_terraced_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql index b185c4b171..0d6d325c89 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_before_1945), Q(number_of_terraced_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql index 8914b630b1..cf42261439 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_future), Q(number_of_terraced_houses_future) From 827eb2edd2776988f4cb575a912af83e58495260 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 28 Aug 2026 15:51:17 +0200 Subject: [PATCH 6/7] Changed units to GJ/# - For all queries for the demand_per_residence and the underlying queries in general - Also renamed the folder with the queries to per_residence instead of per_house --- .../apartments/useful_heat_demand_per_apartment_1945_1964.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1965_1984.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1985_2004.gql | 2 +- .../useful_heat_demand_per_apartment_2005_present.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_before_1945.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_future.gql | 2 +- .../useful_heat_demand_per_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_detached_house_future.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_future.gql | 2 +- .../useful_heat_demand_per_terraced_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_terraced_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_terraced_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_terraced_house_2005_present.gql | 2 +- .../useful_heat_demand_per_terraced_house_before_1945.gql | 2 +- .../useful_heat_demand_per_terraced_house_future.gql | 2 +- .../useful_heat_demand_per_apartment_1945_1964_bar.gql | 2 +- .../useful_heat_demand_per_apartment_1965_1984_bar.gql | 2 +- .../useful_heat_demand_per_apartment_1985_2004_bar.gql | 2 +- .../useful_heat_demand_per_apartment_2005_present_bar.gql | 2 +- .../useful_heat_demand_per_apartment_before_1945_bar.gql | 2 +- .../useful_heat_demand_per_apartment_future_bar.gql | 2 +- ...seful_heat_demand_per_fully_detached_house_1945_1964_bar.gql | 2 +- ...seful_heat_demand_per_fully_detached_house_1965_1984_bar.gql | 2 +- ...seful_heat_demand_per_fully_detached_house_1985_2004_bar.gql | 2 +- ...ul_heat_demand_per_fully_detached_house_2005_present_bar.gql | 2 +- ...ful_heat_demand_per_fully_detached_house_before_1945_bar.gql | 2 +- .../useful_heat_demand_per_fully_detached_house_future_bar.gql | 2 +- ...useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql | 2 +- ...useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql | 2 +- ...useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql | 2 +- ...ful_heat_demand_per_semi_detached_house_2005_present_bar.gql | 2 +- ...eful_heat_demand_per_semi_detached_house_before_1945_bar.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_future_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_1945_1964_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_1965_1984_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_1985_2004_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_2005_present_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_before_1945_bar.gql | 2 +- .../useful_heat_demand_per_terraced_house_future_bar.gql | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_1945_1964_bar.gql (80%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_1965_1984_bar.gql (80%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_1985_2004_bar.gql (80%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_2005_present_bar.gql (80%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_before_1945_bar.gql (80%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_apartment_future_bar.gql (79%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_fully_detached_house_future_bar.gql (93%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql (82%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql (82%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql (82%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql (83%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql (82%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_semi_detached_house_future_bar.gql (81%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_1945_1964_bar.gql (81%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_1965_1984_bar.gql (81%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_1985_2004_bar.gql (81%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_2005_present_bar.gql (82%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_before_1945_bar.gql (81%) rename gqueries/output_elements/output_series/{category_bar_heat_demand_per_household => category_bar_heat_demand_per_residence}/useful_heat_demand_per_terraced_house_future_bar.gql (80%) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql index 0a6565baf3..c07a948c2f 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql index ff9d841282..dee7f6d39a 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql index d03ea3da56..71df7349a2 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql index 6ee44836b8..11318ae8e1 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql index d9a57a8f1b..c68e81fa4f 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql index dfe6c3d684..006822f076 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql index 57bf2c592f..c4e1b34164 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql index 464bcad5ce..95317b6e11 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql index 047bb84189..34395c66a5 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql index e1444f8f45..419fd17082 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql index 8ea199ceff..b9aabfb36e 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql index 96b87aff91..ee47e8240f 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql index dd5b692f7c..d91d72820b 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql index 4df98707c4..0b76203ffd 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql index 21f8afbebc..b114674e2c 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql index 5da1a54572..139ea61a38 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql index 1bb7aa7556..13dbcbe82a 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql index 55815fe160..5e0dcb79a6 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql index f4916eee21..9f269b2f7e 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql index 7eaf79fa60..4ede7fbad1 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql index f4f446e328..f7cb195dd5 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql index c558d2d0d2..1f2b3abd8f 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql index b185c4b171..a979d1b954 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql index 8914b630b1..c7a8bdbab6 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql @@ -6,4 +6,4 @@ ), MILLIONS ) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1945_1964_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1945_1964_bar.gql index aa8fbc4696..7c13bc6a93 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1945_1964_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1945_1964_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_1945_1964) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1965_1984_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1965_1984_bar.gql index 25506b3de8..f3608f69dc 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1965_1984_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1965_1984_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_1965_1984) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1985_2004_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1985_2004_bar.gql index 4441087177..548c76290e 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_1985_2004_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_1985_2004_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_1985_2004) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_2005_present_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_2005_present_bar.gql index 7ed957adc3..54c240328a 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_2005_present_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_2005_present_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_2005_present) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_before_1945_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_before_1945_bar.gql index 9d3cbb7b2a..844ee10fb2 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_before_1945_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_before_1945_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_before_1945) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_future_bar.gql similarity index 79% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_future_bar.gql index 786360c502..80f6d2420a 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_apartment_future_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_apartment_future_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_apartment_future) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql index 5d7b146435..3f67c9a09c 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1945_1964_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_1945_1964) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql index e18114302e..d66b5eefbd 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1965_1984_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_1965_1984) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql index 5270e2da0c..f91c3bded5 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_1985_2004_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_1985_2004) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql index 5bb4c53c6b..5a4b9d523b 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_2005_present_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_2005_present) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql index d2e8fc1b9f..86b5ac4c7a 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_before_1945_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_before_1945) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_future_bar.gql similarity index 93% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_future_bar.gql index c01ea3e407..dc28009f57 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_fully_detached_house_future_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_fully_detached_house_future_bar.gql @@ -2,4 +2,4 @@ # query name) can distinguish this from 'semi_detached'. - query = Q(useful_heat_demand_per_detached_house_future) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql similarity index 82% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql index e735c9208b..ade209592c 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1945_1964_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_1945_1964) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql similarity index 82% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql index 8c0d9d2a1e..4fc320f80f 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1965_1984_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_1965_1984) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql similarity index 82% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql index 94d5d8d25d..b8dfdd6c3b 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_1985_2004_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_1985_2004) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql similarity index 83% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql index 62cb50148b..cd80e6c6f7 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_2005_present_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_2005_present) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql similarity index 82% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql index d2b1d4e7ba..a840d9bba1 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_before_1945_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_before_1945) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_future_bar.gql similarity index 81% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_future_bar.gql index 9d99963119..31396bbd45 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_semi_detached_house_future_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_semi_detached_house_future_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_semi_detached_house_future) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1945_1964_bar.gql similarity index 81% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1945_1964_bar.gql index 223b37ae2d..1bf8202b6b 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1945_1964_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1945_1964_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_1945_1964) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1965_1984_bar.gql similarity index 81% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1965_1984_bar.gql index 525a61c84a..b37c037388 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1965_1984_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1965_1984_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_1965_1984) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1985_2004_bar.gql similarity index 81% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1985_2004_bar.gql index 32ac010996..37bff4a83d 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_1985_2004_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_1985_2004_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_1985_2004) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_2005_present_bar.gql similarity index 82% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_2005_present_bar.gql index 0a8e758d0d..17ba7ab283 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_2005_present_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_2005_present_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_2005_present) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_before_1945_bar.gql similarity index 81% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_before_1945_bar.gql index f8f3a1e3d1..a835d9761a 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_before_1945_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_before_1945_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_before_1945) -- unit = GJ +- unit = GJ/# diff --git a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_future_bar.gql similarity index 80% rename from gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql rename to gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_future_bar.gql index 17efafc282..7cd3f7fc9a 100644 --- a/gqueries/output_elements/output_series/category_bar_heat_demand_per_household/useful_heat_demand_per_terraced_house_future_bar.gql +++ b/gqueries/output_elements/output_series/category_bar_heat_demand_per_residence/useful_heat_demand_per_terraced_house_future_bar.gql @@ -1,2 +1,2 @@ - query = Q(useful_heat_demand_per_terraced_house_future) -- unit = GJ +- unit = GJ/# From 53d307d693a1671e338d23bb0575688545e81770 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 28 Aug 2026 15:57:45 +0200 Subject: [PATCH 7/7] Improved indentation so there's no conflict --- .../apartments/useful_heat_demand_per_apartment_1945_1964.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1965_1984.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_1985_2004.gql | 2 +- .../useful_heat_demand_per_apartment_2005_present.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_before_1945.gql | 2 +- .../apartments/useful_heat_demand_per_apartment_future.gql | 2 +- .../useful_heat_demand_per_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_detached_house_future.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_2005_present.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_before_1945.gql | 2 +- .../useful_heat_demand_per_semi_detached_house_future.gql | 2 +- .../useful_heat_demand_per_terraced_house_1945_1964.gql | 2 +- .../useful_heat_demand_per_terraced_house_1965_1984.gql | 2 +- .../useful_heat_demand_per_terraced_house_1985_2004.gql | 2 +- .../useful_heat_demand_per_terraced_house_2005_present.gql | 2 +- .../useful_heat_demand_per_terraced_house_before_1945.gql | 2 +- .../useful_heat_demand_per_terraced_house_future.gql | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql index c07a948c2f..0fccb9cf0a 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1945_1964), Q(number_of_apartments_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql index dee7f6d39a..0a76093a28 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1965_1984), Q(number_of_apartments_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql index 71df7349a2..96e4cea019 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_1985_2004), Q(number_of_apartments_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql index 11318ae8e1..6cdff74486 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_2005_present), Q(number_of_apartments_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql index c68e81fa4f..a340642608 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_before_1945), Q(number_of_apartments_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql index 006822f076..1afd48c1c9 100644 --- a/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql +++ b/gqueries/general/useful_demand/households/per_household/apartments/useful_heat_demand_per_apartment_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_apartments_future), Q(number_of_apartments_future) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql index c4e1b34164..e57a12f868 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1945_1964), Q(number_of_detached_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql index 95317b6e11..3c64e59d30 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1965_1984), Q(number_of_detached_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql index 34395c66a5..2f61b3a43b 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_1985_2004), Q(number_of_detached_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql index 419fd17082..cbc6c3b895 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_2005_present), Q(number_of_detached_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql index b9aabfb36e..f7958ec70a 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_before_1945), Q(number_of_detached_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql index ee47e8240f..d22e4921f9 100644 --- a/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/detached_houses/useful_heat_demand_per_detached_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_detached_houses_future), Q(number_of_detached_houses_future) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql index d91d72820b..bf6fc38bf6 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1945_1964), Q(number_of_semi_detached_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql index 0b76203ffd..b2d67fe044 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1965_1984), Q(number_of_semi_detached_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql index b114674e2c..25f0759830 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_1985_2004), Q(number_of_semi_detached_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql index 139ea61a38..24da4d9cc6 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_2005_present), Q(number_of_semi_detached_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql index 13dbcbe82a..eec4dd5d81 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_before_1945), Q(number_of_semi_detached_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql index 5e0dcb79a6..ff966a5295 100644 --- a/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/semi_detached_houses/useful_heat_demand_per_semi_detached_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_semi_detached_houses_future), Q(number_of_semi_detached_houses_future) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql index 9f269b2f7e..9e7efb6e8a 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1945_1964.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1945_1964), Q(number_of_terraced_houses_1945_1964) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql index 4ede7fbad1..61535dbbb0 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1965_1984.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1965_1984), Q(number_of_terraced_houses_1965_1984) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql index f7cb195dd5..f50515ef78 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_1985_2004.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_1985_2004), Q(number_of_terraced_houses_1985_2004) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql index 1f2b3abd8f..d2fe1c8638 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_2005_present.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_2005_present), Q(number_of_terraced_houses_2005_present) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql index a979d1b954..0799dff869 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_before_1945.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_before_1945), Q(number_of_terraced_houses_before_1945) diff --git a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql index c7a8bdbab6..0abe1c8a18 100644 --- a/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql +++ b/gqueries/general/useful_demand/households/per_household/terraced_houses/useful_heat_demand_per_terraced_house_future.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_terraced_houses_future), Q(number_of_terraced_houses_future)