Merge pull request #3004 from quintel/heat-refinement

Improvements for heat modelling changes
quintel · Jan 23, 2024 · 4d00b06 · 4d00b06
2 parents 4274cb0 + f3e6d6d
commit 4d00b06
Show file tree

Hide file tree

Showing 102 changed files with 517 additions and 13 deletions.
diff --git a/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1945_1964.gql b/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_1945_1964))
+- unit = curve
diff --git a/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1965_1984.gql b/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_1965_1984))
+- unit = curve
diff --git a/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1985_2004.gql b/...ating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_1985_2004))
+- unit = curve
diff --git a/...ng/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_2005_present.gql b/...ng/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_2005_present))
+- unit = curve
diff --git a/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_before_1945.gql b/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_before_1945))
+- unit = curve
diff --git a/..._heating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_future.gql b/..._heating/hourly_demand_per_consumer/hourly_demand_for_space_heating_apartments_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_future))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1945_1964.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1965_1984.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1985_2004.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004))
+- unit = curve
diff --git a/...urly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_2005_present.gql b/...urly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_2005_present))
+- unit = curve
diff --git a/...ourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_before_1945.gql b/...ourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_before_1945))
+- unit = curve
diff --git a/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_future.gql b/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_detached_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_detached_houses_future))
+- unit = curve
diff --git a/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1945_1964.gql b/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964))
+- unit = curve
diff --git a/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1965_1984.gql b/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984))
+- unit = curve
diff --git a/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1985_2004.gql b/...ly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004))
+- unit = curve
diff --git a/...demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_2005_present.gql b/...demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present))
+- unit = curve
diff --git a/..._demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_before_1945.gql b/..._demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945))
+- unit = curve
diff --git a/...ourly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_future.gql b/...ourly_demand_per_consumer/hourly_demand_for_space_heating_semi_detached_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_future))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1945_1964.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1965_1984.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984))
+- unit = curve
diff --git a/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1985_2004.gql b/.../hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004))
+- unit = curve
diff --git a/...urly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_2005_present.gql b/...urly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present))
+- unit = curve
diff --git a/...ourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_before_1945.gql b/...ourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945))
+- unit = curve
diff --git a/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_future.gql b/...ing/hourly_demand_per_consumer/hourly_demand_for_space_heating_terraced_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_future))
+- unit = curve
diff --git a/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1945_1964.gql b/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_1945_1964))
+- unit = curve
diff --git a/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1965_1984.gql b/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_1965_1984))
+- unit = curve
diff --git a/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1985_2004.gql b/...urly_production_for_consumer/hourly_production_for_space_heating_apartments_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_1985_2004))
+- unit = curve
diff --git a/...y_production_for_consumer/hourly_production_for_space_heating_apartments_2005_present.gql b/...y_production_for_consumer/hourly_production_for_space_heating_apartments_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_2005_present))
+- unit = curve
diff --git a/...ly_production_for_consumer/hourly_production_for_space_heating_apartments_before_1945.gql b/...ly_production_for_consumer/hourly_production_for_space_heating_apartments_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_before_1945))
+- unit = curve
diff --git a/.../hourly_production_for_consumer/hourly_production_for_space_heating_apartments_future.gql b/.../hourly_production_for_consumer/hourly_production_for_space_heating_apartments_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_future))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1945_1964.gql b/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1965_1984.gql b/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1985_2004.gql b/...production_for_consumer/hourly_production_for_space_heating_detached_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004))
+- unit = curve
diff --git a/...duction_for_consumer/hourly_production_for_space_heating_detached_houses_2005_present.gql b/...duction_for_consumer/hourly_production_for_space_heating_detached_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_2005_present))
+- unit = curve
diff --git a/...oduction_for_consumer/hourly_production_for_space_heating_detached_houses_before_1945.gql b/...oduction_for_consumer/hourly_production_for_space_heating_detached_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_before_1945))
+- unit = curve
diff --git a/...ly_production_for_consumer/hourly_production_for_space_heating_detached_houses_future.gql b/...ly_production_for_consumer/hourly_production_for_space_heating_detached_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_detached_houses_future))
+- unit = curve
diff --git a/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1945_1964.gql b/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964))
+- unit = curve
diff --git a/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1965_1984.gql b/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984))
+- unit = curve
diff --git a/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1985_2004.gql b/...ction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004))
+- unit = curve
diff --git a/...on_for_consumer/hourly_production_for_space_heating_semi_detached_houses_2005_present.gql b/...on_for_consumer/hourly_production_for_space_heating_semi_detached_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present))
+- unit = curve
diff --git a/...ion_for_consumer/hourly_production_for_space_heating_semi_detached_houses_before_1945.gql b/...ion_for_consumer/hourly_production_for_space_heating_semi_detached_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945))
+- unit = curve
diff --git a/...oduction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_future.gql b/...oduction_for_consumer/hourly_production_for_space_heating_semi_detached_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_semi_detached_houses_future))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1945_1964.gql b/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1945_1964.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1965_1984.gql b/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1965_1984.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984))
+- unit = curve
diff --git a/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1985_2004.gql b/...production_for_consumer/hourly_production_for_space_heating_terraced_houses_1985_2004.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004))
+- unit = curve
diff --git a/...duction_for_consumer/hourly_production_for_space_heating_terraced_houses_2005_present.gql b/...duction_for_consumer/hourly_production_for_space_heating_terraced_houses_2005_present.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present))
+- unit = curve
diff --git a/...oduction_for_consumer/hourly_production_for_space_heating_terraced_houses_before_1945.gql b/...oduction_for_consumer/hourly_production_for_space_heating_terraced_houses_before_1945.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945))
+- unit = curve
diff --git a/...ly_production_for_consumer/hourly_production_for_space_heating_terraced_houses_future.gql b/...ly_production_for_consumer/hourly_production_for_space_heating_terraced_houses_future.gql
@@ -0,0 +1,2 @@
+- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_terraced_houses_future))
+- unit = curve
diff --git a/...curves/energy_heat_flexibility_p2h_boiler_electricity_ht_steam_hot_water_output_curve.gql b/...curves/energy_heat_flexibility_p2h_boiler_electricity_ht_steam_hot_water_output_curve.gql
@@ -0,0 +1,2 @@
+- unit = curve
+- query = V(energy_heat_flexibility_p2h_boiler_ht_electricity, steam_hot_water_output_curve)
diff --git a/...rves/energy_heat_flexibility_p2h_heatpump_electricity_ht_steam_hot_water_output_curve.gql b/...rves/energy_heat_flexibility_p2h_heatpump_electricity_ht_steam_hot_water_output_curve.gql
@@ -0,0 +1,2 @@
+- unit = curve
+- query = V(energy_heat_flexibility_p2h_heatpump_ht_electricity, steam_hot_water_output_curve)
diff --git a/...rk/production_curves/energy_heat_well_deep_geothermal_mt_steam_hot_water_output_curve.gql b/...rk/production_curves/energy_heat_well_deep_geothermal_mt_steam_hot_water_output_curve.gql
@@ -1,6 +1,2 @@
 - unit = curve
-- query = 
-    SUM_CURVES(
-        V(energy_heat_well_deep_mt_geothermal, steam_hot_water_output_curve),
-        V(energy_heat_well_shallow_heatpump_mt_geothermal, steam_hot_water_output_curve)
-    )
+- query = V(energy_heat_well_deep_mt_geothermal, steam_hot_water_output_curve)
diff --git a/gqueries/mechanical_turk/employment/turk_number_of_households.gql b/gqueries/mechanical_turk/employment/turk_number_of_households.gql
@@ -1,4 +1,4 @@
 # Return number of households
 
-- query = AREA(number_of_residences)
+- query = Q(number_of_residences)
 - unit =
diff --git a/gqueries/modules/scenario_report/regional_report/number_of_residences_built_per_year.gql b/gqueries/modules/scenario_report/regional_report/number_of_residences_built_per_year.gql
@@ -1,5 +1,5 @@
 - query =
     DIVIDE(
-        QUERY_DELTA(-> { AREA(number_of_residences) }),
+        QUERY_DELTA(-> { Q(number_of_residences) }),
         Q(scenario_duration)
     )
diff --git a/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1945_1964.gql b/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1945_1964.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_1945_1964)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_1945_1964)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1965_1984.gql b/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1965_1984.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_1965_1984)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_1965_1984)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1985_2004.gql b/...eholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_1985_2004.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_1985_2004)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_1985_2004)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...lds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_2005_present.gql b/...lds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_2005_present.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_2005_present)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_2005_present)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...olds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_before_1945.gql b/...olds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_before_1945.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_before_1945)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_before_1945)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...ouseholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_future.gql b/...ouseholds_deficits/absolute_deficit_useful_demand_for_space_heating_apartments_future.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_apartments_future)) -
+        SUM(Q(hourly_production_for_space_heating_apartments_future)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1945_1964.gql b/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1945_1964.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_1945_1964)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_1945_1964)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1965_1984.gql b/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1965_1984.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_1965_1984)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_1965_1984)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1985_2004.gql b/...s_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_1985_2004.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_1985_2004)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_1985_2004)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...eficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_2005_present.gql b/...eficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_2005_present.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_2005_present)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_2005_present)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_before_1945.gql b/...deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_before_1945.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_before_1945)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_before_1945)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...olds_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_future.gql b/...olds_deficits/absolute_deficit_useful_demand_for_space_heating_detached_houses_future.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_detached_houses_future)) -
+        SUM(Q(hourly_production_for_space_heating_detached_houses_future)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1945_1964.gql b/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1945_1964.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_1945_1964)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_1945_1964)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1965_1984.gql b/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1965_1984.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_1965_1984)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_1965_1984)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1985_2004.gql b/...icits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_1985_2004.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_1985_2004)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_1985_2004)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...ts/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_2005_present.gql b/...ts/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_2005_present.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_2005_present)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_2005_present)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...its/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_before_1945.gql b/...its/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_before_1945.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_before_1945)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_before_1945)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...deficits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_future.gql b/...deficits/absolute_deficit_useful_demand_for_space_heating_semi_detached_houses_future.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_semi_detached_houses_future)) -
+        SUM(Q(hourly_production_for_space_heating_semi_detached_houses_future)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...s_deficits/absolute_deficit_useful_demand_for_space_heating_terraced_houses_1945_1964.gql b/...s_deficits/absolute_deficit_useful_demand_for_space_heating_terraced_houses_1945_1964.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_terraced_houses_1945_1964)) -
+        SUM(Q(hourly_production_for_space_heating_terraced_houses_1945_1964)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
diff --git a/...s_deficits/absolute_deficit_useful_demand_for_space_heating_terraced_houses_1965_1984.gql b/...s_deficits/absolute_deficit_useful_demand_for_space_heating_terraced_houses_1965_1984.gql
@@ -0,0 +1,10 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        SUM(Q(hourly_demand_for_space_heating_terraced_houses_1965_1984)) -
+        SUM(Q(hourly_production_for_space_heating_terraced_houses_1965_1984)),
+        THOUSANDS
+      ),
+      MJ_PER_MWH
+    )
+- unit = GJ
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- query = FEVER_DEMAND_CURVE(V(households_useful_demand_for_space_heating_apartments_1945_1964))
		- unit = curve
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- query = FEVER_PRODUCTION_CURVE(V(households_useful_demand_for_space_heating_apartments_1945_1964))
		- unit = curve
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- unit = curve
		- query = V(energy_heat_flexibility_p2h_boiler_ht_electricity, steam_hot_water_output_curve)