From 356516a1afd644e03770c7c4674c78ee637039f5 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 4 Aug 2026 13:42:30 +0200 Subject: [PATCH 01/28] Add new sliders for nr of buildings, insulation and behaviour --- .../buildings_space_heating_behaviour.ad | 17 +++++++ ...buildings_insulation_existing_buildings.ad | 21 ++++++++ ...dings_insulation_level_buildings_future.ad | 26 ---------- ...ings_insulation_level_buildings_present.ad | 30 ------------ .../buildings_insulation_new_buildings.ad | 21 ++++++++ ...uildings_number_of_buildings_demolished.ad | 43 +++++++++++++++++ .../buildings_number_of_buildings_future.ad | 44 ----------------- .../buildings_number_of_buildings_new.ad | 46 ++++++++++++++++++ .../buildings_number_of_buildings_present.ad | 48 ------------------- 9 files changed, 148 insertions(+), 148 deletions(-) create mode 100644 inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad create mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad delete mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad delete mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad create mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad create mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad delete mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad create mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad delete mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad diff --git a/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad b/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad new file mode 100644 index 0000000000..2c176d32e4 --- /dev/null +++ b/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad @@ -0,0 +1,17 @@ +# Sets the reduction in heat demand due to behavioural changes. It updates heating demand for +# existing and new buildings. +# Priority is set to 0 to go after number of buildings and insulation sliders. + +- query = + relative_change = DIVIDE(100 + USER_INPUT(), 100); + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change) + ) +- priority = 0 +- max_value = 50.0 +- min_value = -50.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad new file mode 100644 index 0000000000..adfa90ee05 --- /dev/null +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad @@ -0,0 +1,21 @@ +# Sets the reduction in heating demand of existing buildings due to improved insulation. It updates: +# - Useful demand for space heating +# - Typical useful heat demand area attribute +# - Investment costs for insulation +# +# Priority is set to 1 to go after number of buildings but before behaviour sliders. + +- query = + relative_change = DIVIDE(100 + USER_INPUT(), 100); + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_present, relative_change), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad deleted file mode 100644 index b781a9f413..0000000000 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad +++ /dev/null @@ -1,26 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_future = USER_INPUT(); - number_of_units_future = INPUT_VALUE(buildings_number_of_buildings_future); - typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - - EACH( - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_buildings_future, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_buildings_future),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_buildings_future),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_buildings_future) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad deleted file mode 100644 index 0da2de80bf..0000000000 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad +++ /dev/null @@ -1,30 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_present) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings) }); - number_of_units_future = INPUT_VALUE(buildings_number_of_buildings_present); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_space_heating_buildings_present, preset_demand)}); - - EACH( - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_buildings_present, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_buildings_present),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_buildings_present),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_buildings_present) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad new file mode 100644 index 0000000000..e4d4a48d99 --- /dev/null +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad @@ -0,0 +1,21 @@ +# Sets the reduction in heating demand of new buildings due to improved insulation. It updates: +# - Useful demand for space heating +# - Typical useful heat demand area attribute +# - Investment costs for insulation +# +# Priority is set to 1 to go after number of buildings but before behaviour sliders. + +- query = + relative_change = DIVIDE(100 + USER_INPUT(), 100); + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_future, relative_change), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad new file mode 100644 index 0000000000..b2c5f27b4a --- /dev/null +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -0,0 +1,43 @@ +# Sets the demolition of existing buildings. It updates: +# - Useful demand for space heating for existing buildings +# - Useful demand for cooling (combined effect total nr of buildings) +# - Useful demand for lighting (combined effect total nr of buildings) +# - Useful demand for appliances (combined effect total nr of buildings) +# - Building surface available for PV (combined effect total nr of buildings) +# - Number of units of existing buildings +# +# Priority set to 2 to go before insulation, heating behaviour, appliances efficiency and +# development of demand sliders. + +- query = + number_of_existing_buildings_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); + number_of_buildings_demolished = USER_INPUT(); + number_of_existing_buildings_future = number_of_existing_buildings_present - number_of_buildings_demolished; + + number_of_new_buildings_future = INPUT_VALUE(buildings_number_of_buildings_new); + + total_number_of_buildings_future = number_of_existing_buildings_future + number_of_new_buildings_future; + + relative_change_existing_buildings = DIVIDE(number_of_existing_buildings_future, number_of_existing_buildings_present); + relative_change_total = DIVIDE(total_number_of_buildings_future, number_of_existing_buildings_present); + + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)})); + useful_lighting_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)})); + useful_appliances_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)})); + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)})); + + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change_existing_buildings), + UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), + UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), + UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), + UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_buildings) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad deleted file mode 100644 index 2480d92947..0000000000 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad +++ /dev/null @@ -1,44 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the number of buildings_future -# - updates the insulation costs -# - the roof surface available for solar PV on buildings based on the changed total number of buildings -# - the total useful demand for cooling based on the changed total number of buildings -# - the total useful demand for lighting based on the changed total number of buildings -# - the total useful demand for appliances based on the changed total number of buildings -# - the electricity production of buildings solar PV, because user sets a share of the potential - -- query = - insulation_value_future = INPUT_VALUE(buildings_insulation_level_buildings_future); - number_of_units_future = USER_INPUT(); - typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); - total_number_of_units_future = USER_INPUT() + INPUT_VALUE(buildings_number_of_buildings_present); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); - useful_lighting_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); - useful_appliances_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_future), - UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), - UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), - UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_buildings) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad new file mode 100644 index 0000000000..d78ca51e37 --- /dev/null +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad @@ -0,0 +1,46 @@ +# Sets the number of new buildings. It updates: +# - Useful demand for space heating for new buildings, using typical heat demand area attribute +# - Useful demand for cooling (combined effect total nr of buildings) +# - Useful demand for lighting (combined effect total nr of buildings) +# - Useful demand for appliances (combined effect total nr of buildings) +# - Building surface available for PV (combined effect total nr of buildings) +# - Number of units of new buildings +# +# Priority set to 2 to go before insulation, heating behaviour, appliances efficiency and +# development of demand sliders. + +- query = + insulation_value_new_buildings = AREA(typical_useful_demand_for_space_heating_buildings_future); + typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); + heat_demand_per_unit = insulation_value_new_buildings * typical_surface_area_per_unit * MJ_PER_KWH; + + number_of_existing_buildings_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); + number_of_buildings_demolished = INPUT_VALUE(buildings_number_of_buildings_demolished); + number_of_existing_buildings_future = number_of_existing_buildings_present - number_of_buildings_demolished; + + number_of_new_buildings_future = USER_INPUT(); + + total_number_of_buildings_future = number_of_existing_buildings_future + number_of_new_buildings_future; + relative_change = DIVIDE(total_number_of_buildings_future, number_of_existing_buildings_present); + + useful_heat_demand_new_buildings_future = PRODUCT(number_of_new_buildings_future, heat_demand_per_unit); + useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)})); + useful_lighting_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)})); + useful_appliances_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)})); + roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)})); + + EACH( + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_new_buildings_future), + UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), + UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), + UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), + UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_buildings_future) + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_buildings) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad deleted file mode 100644 index ba0e0abde5..0000000000 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad +++ /dev/null @@ -1,48 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of buildings_present -# - updates the insulation costs -# - the roof surface available for solar PV on buildings based on the changed total number of buildings -# - the total useful demand for cooling based on the changed total number of buildings -# - the total useful demand for lighting based on the changed total number of buildings -# - the total useful demand for appliances based on the changed total number of buildings -# - the electricity production of buildings solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_present) }); - insulation_value_future = INPUT_VALUE(buildings_insulation_level_buildings_present); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); - total_number_of_units_future = USER_INPUT() + INPUT_VALUE(buildings_number_of_buildings_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_space_heating_buildings_present, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); - useful_lighting_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); - useful_appliances_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, useful_heat_demand_future), - UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), - UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), - UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_buildings) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_buildings) -- step_value = 1.0 -- unit = # -- update_period = future From 54ab1661e3e97e238e8b634e75d76153e4732a7a Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 4 Aug 2026 13:42:50 +0200 Subject: [PATCH 02/28] Update docs URL in docs string of insulation costs queries --- .../buildings/costs_of_insulation_buildings_future.gql | 4 ++-- .../buildings/costs_of_insulation_buildings_present.gql | 4 ++-- .../apartments/costs_of_insulation_apartments_1945_1964.gql | 4 ++-- .../apartments/costs_of_insulation_apartments_1965_1984.gql | 4 ++-- .../apartments/costs_of_insulation_apartments_1985_2004.gql | 4 ++-- .../costs_of_insulation_apartments_2005_present.gql | 4 ++-- .../apartments/costs_of_insulation_apartments_before_1945.gql | 4 ++-- .../apartments/costs_of_insulation_apartments_future.gql | 4 ++-- .../costs_of_insulation_detached_houses_1945_1964.gql | 4 ++-- .../costs_of_insulation_detached_houses_1965_1984.gql | 4 ++-- .../costs_of_insulation_detached_houses_1985_2004.gql | 4 ++-- .../costs_of_insulation_detached_houses_2005_present.gql | 4 ++-- .../costs_of_insulation_detached_houses_before_1945.gql | 4 ++-- .../costs_of_insulation_detached_houses_future.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_1945_1964.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_1965_1984.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_1985_2004.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_2005_present.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_before_1945.gql | 4 ++-- .../costs_of_insulation_semi_detached_houses_future.gql | 4 ++-- .../costs_of_insulation_terraced_houses_1945_1964.gql | 4 ++-- .../costs_of_insulation_terraced_houses_1965_1984.gql | 4 ++-- .../costs_of_insulation_terraced_houses_1985_2004.gql | 4 ++-- .../costs_of_insulation_terraced_houses_2005_present.gql | 4 ++-- .../costs_of_insulation_terraced_houses_before_1945.gql | 4 ++-- .../costs_of_insulation_terraced_houses_future.gql | 4 ++-- 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_future.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_future.gql index 72e37014cc..7d3cbc2806 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_future.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_future.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for buildings_future -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_future) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_present.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_present.gql index e666baa1d8..0a9ce40eab 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_present.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/buildings/costs_of_insulation_buildings_present.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for buildings_present -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_present) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1945_1964.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1945_1964.gql index ff858eb4d2..6605271903 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1945_1964.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1945_1964.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_1945_1964 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1945_1964) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1965_1984.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1965_1984.gql index c3978acf80..d4411d0474 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1965_1984.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1965_1984.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_1965_1984 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1965_1984) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1985_2004.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1985_2004.gql index cfea5363a9..e96624b6e7 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1985_2004.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_1985_2004.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_1985_2004 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1985_2004) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_2005_present.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_2005_present.gql index ba41887631..287cbbbb82 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_2005_present.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_2005_present.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_2005_present -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_2005_present) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_before_1945.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_before_1945.gql index 73196f9586..175c04e2c5 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_before_1945.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_before_1945.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_before_1945 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_before_1945) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_future.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_future.gql index 9ae913c316..fa7b04c120 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_future.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/apartments/costs_of_insulation_apartments_future.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for apartments_future -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_future) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1945_1964.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1945_1964.gql index c70f0d1f4b..673fb8ad29 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1945_1964.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1945_1964.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_1945_1964 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1965_1984.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1965_1984.gql index edaa7c55d8..e71ea4d4c1 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1965_1984.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1965_1984.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_1965_1984 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1985_2004.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1985_2004.gql index e1245bbfd1..6132936bd0 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1985_2004.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_1985_2004.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_1985_2004 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_2005_present.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_2005_present.gql index 0127ca4d33..a57ecbf420 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_2005_present.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_2005_present.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_2005_present -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_before_1945.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_before_1945.gql index 9e7c23b62d..2716a8a1c2 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_before_1945.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_before_1945.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_before_1945 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_future.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_future.gql index e692a8ac32..fd627e85f7 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_future.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/detached_houses/costs_of_insulation_detached_houses_future.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for detached_houses_future -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1945_1964.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1945_1964.gql index c84e78ffb6..0464a8337e 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1945_1964.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1945_1964.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_1945_1964 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1965_1984.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1965_1984.gql index 643e1b7f43..2842cd6008 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1965_1984.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1965_1984.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_1965_1984 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1985_2004.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1985_2004.gql index f80dd30422..d4a092d4e0 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1985_2004.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_1985_2004.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_1985_2004 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_2005_present.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_2005_present.gql index 8f51b2ee97..37790b3166 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_2005_present.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_2005_present.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_2005_present -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_before_1945.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_before_1945.gql index 7ad641d639..ad1b70659f 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_before_1945.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_before_1945.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_before_1945 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_future.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_future.gql index 52d453b9eb..2d03a43443 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_future.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/semi_detached_houses/costs_of_insulation_semi_detached_houses_future.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for semi_detached_houses_future -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1945_1964.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1945_1964.gql index 7aea7fcc2a..6bad43c1cb 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1945_1964.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1945_1964.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_1945_1964 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1965_1984.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1965_1984.gql index d1aacda557..3d84bc6fd9 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1965_1984.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1965_1984.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_1965_1984 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1985_2004.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1985_2004.gql index afa95ec91f..1a7b196462 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1985_2004.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_1985_2004.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_1985_2004 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_2005_present.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_2005_present.gql index 3762878057..db31c3500a 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_2005_present.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_2005_present.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_2005_present -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_before_1945.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_before_1945.gql index 79929cb4ba..35afe900d2 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_before_1945.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_before_1945.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_before_1945 -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945) }); diff --git a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_future.gql b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_future.gql index 5943e40070..32a239d58f 100644 --- a/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_future.gql +++ b/gqueries/general/costs/mece_costs/1_building_and_installations/insulation/households/terraced_houses/costs_of_insulation_terraced_houses_future.gql @@ -1,7 +1,7 @@ # This query calculates the insulation costs for terraced_houses_future -# The calculated costs are only updated for the future year, in the present year +# The calculated costs are only updated for the future year, in the present year # the insulation costs are assumed to be zero. This is done with IF-statements. -# See https://docs.energytransitionmodel.com/main/insulation/#insulation-costs +# See https://docs.energytransitionmodel.com/main/cost-insulation-costs - query = insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future) }); From e876035beccf86462310504023a59a2eccd7dbb0 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 7 Aug 2026 13:41:23 +0200 Subject: [PATCH 03/28] Queries for nr. of buildigns figure Also, changed priorities to accomodate for settings_weather_curves_set.ac --- .../number_of_existing_buildings_mekko.gql | 2 ++ .../number_of_new_buildings_mekko.gql | 2 ++ .../buildings_number_of_buildings_demolished.ad | 4 ++-- .../buildings_number/buildings_number_of_buildings_new.ad | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_existing_buildings_mekko.gql create mode 100644 gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_new_buildings_mekko.gql diff --git a/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_existing_buildings_mekko.gql b/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_existing_buildings_mekko.gql new file mode 100644 index 0000000000..610c8604f5 --- /dev/null +++ b/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_existing_buildings_mekko.gql @@ -0,0 +1,2 @@ +- query = Q(number_of_buildings_present) +- unit = # diff --git a/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_new_buildings_mekko.gql b/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_new_buildings_mekko.gql new file mode 100644 index 0000000000..7d4c4e9a62 --- /dev/null +++ b/gqueries/output_elements/output_series/mekko_150_population_residences_overview/number_of_new_buildings_mekko.gql @@ -0,0 +1,2 @@ +- query = Q(number_of_buildings_future) +- unit = # diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad index b2c5f27b4a..ed5e738303 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -6,7 +6,7 @@ # - Building surface available for PV (combined effect total nr of buildings) # - Number of units of existing buildings # -# Priority set to 2 to go before insulation, heating behaviour, appliances efficiency and +# Priority set to 3 to go before insulation, weather_curve_set, heating behaviour, appliances efficiency and # development of demand sliders. - query = @@ -34,7 +34,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_buildings) - min_value = 0.0 - start_value = 0.0 diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad index d78ca51e37..6122ba1acf 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad @@ -6,7 +6,7 @@ # - Building surface available for PV (combined effect total nr of buildings) # - Number of units of new buildings # -# Priority set to 2 to go before insulation, heating behaviour, appliances efficiency and +# Priority set to 3 to go before insulation, weather_curve_set, heating behaviour, appliances efficiency and # development of demand sliders. - query = @@ -37,7 +37,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_buildings_future) ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_buildings) - min_value = 0.0 - start_value = 0.0 From 582f6af2451c3ee607a669b09ec954472b93b7d6 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Wed, 12 Aug 2026 13:36:33 +0200 Subject: [PATCH 04/28] Fix typo --- .../buildings_demand/buildings_useful_demand_appliances.ad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad index 228c1508ce..0df93e1dc1 100644 --- a/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad +++ b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad @@ -1,6 +1,6 @@ # The appliances efficiency and useful demand input set the same node # Updating the node sequentially would lead to incorrect results -# When the efficiency is not set, the node is update here +# When the efficiency is not set, the node is updated here # When the efficiency is set, this input does nothing and the net effect of both inputs is # set in the efficiency input From c072107ab4d0e289cb13e6337bcb4a7c2cd9e4a3 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Wed, 12 Aug 2026 13:46:31 +0200 Subject: [PATCH 05/28] Style changes to buildings inputs --- ...uildings_number_of_buildings_demolished.ad | 5 ++-- .../buildings_number_of_buildings_new.ad | 24 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad index ed5e738303..9aba62f5bb 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -3,7 +3,7 @@ # - Useful demand for cooling (combined effect total nr of buildings) # - Useful demand for lighting (combined effect total nr of buildings) # - Useful demand for appliances (combined effect total nr of buildings) -# - Building surface available for PV (combined effect total nr of buildings) +# - Roof surface of buildings available for PV (combined effect total nr of buildings) # - Number of units of existing buildings # # Priority set to 3 to go before insulation, weather_curve_set, heating behaviour, appliances efficiency and @@ -13,9 +13,7 @@ number_of_existing_buildings_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); number_of_buildings_demolished = USER_INPUT(); number_of_existing_buildings_future = number_of_existing_buildings_present - number_of_buildings_demolished; - number_of_new_buildings_future = INPUT_VALUE(buildings_number_of_buildings_new); - total_number_of_buildings_future = number_of_existing_buildings_future + number_of_new_buildings_future; relative_change_existing_buildings = DIVIDE(number_of_existing_buildings_future, number_of_existing_buildings_present); @@ -34,6 +32,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) ) + - priority = 3 - max_value_gql = present:AREA(present_number_of_buildings) - min_value = 0.0 diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad index 6122ba1acf..7f7052612e 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad @@ -3,31 +3,30 @@ # - Useful demand for cooling (combined effect total nr of buildings) # - Useful demand for lighting (combined effect total nr of buildings) # - Useful demand for appliances (combined effect total nr of buildings) -# - Building surface available for PV (combined effect total nr of buildings) +# - Roof surface of buildings available for PV (combined effect total nr of buildings) # - Number of units of new buildings # # Priority set to 3 to go before insulation, weather_curve_set, heating behaviour, appliances efficiency and # development of demand sliders. - query = - insulation_value_new_buildings = AREA(typical_useful_demand_for_space_heating_buildings_future); - typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); - heat_demand_per_unit = insulation_value_new_buildings * typical_surface_area_per_unit * MJ_PER_KWH; - number_of_existing_buildings_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); number_of_buildings_demolished = INPUT_VALUE(buildings_number_of_buildings_demolished); number_of_existing_buildings_future = number_of_existing_buildings_present - number_of_buildings_demolished; - number_of_new_buildings_future = USER_INPUT(); - total_number_of_buildings_future = number_of_existing_buildings_future + number_of_new_buildings_future; - relative_change = DIVIDE(total_number_of_buildings_future, number_of_existing_buildings_present); + + insulation_value_new_buildings = AREA(typical_useful_demand_for_space_heating_buildings_future); + typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); + heat_demand_per_unit = insulation_value_new_buildings * typical_surface_area_per_unit * MJ_PER_KWH; + + relative_change_total = DIVIDE(total_number_of_buildings_future, number_of_existing_buildings_present); useful_heat_demand_new_buildings_future = PRODUCT(number_of_new_buildings_future, heat_demand_per_unit); - useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)})); - useful_lighting_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)})); - useful_appliances_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)})); - roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)})); + useful_lighting_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)})); + useful_appliances_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)})); + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)})); EACH( UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_new_buildings_future), @@ -37,6 +36,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_buildings_future) ) + - priority = 3 - max_value_gql = present:AREA(present_number_of_buildings) - min_value = 0.0 From 197e8c5d55137a9e68082ef6ae17346995c2c006 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 14 Aug 2026 10:44:07 +0200 Subject: [PATCH 06/28] Insulation sliders from 0 to 100 instead of 0 to -100 --- .../buildings_insulation_existing_buildings.ad | 6 +++--- .../buildings_insulation_new_buildings.ad | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad index adfa90ee05..5dbd4c7e93 100644 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad @@ -6,15 +6,15 @@ # Priority is set to 1 to go after number of buildings but before behaviour sliders. - query = - relative_change = DIVIDE(100 + USER_INPUT(), 100); + relative_change = DIVIDE(100.0 - USER_INPUT(), 100.0); EACH( UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_present, relative_change), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad index e4d4a48d99..4dbac3bd48 100644 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad @@ -6,15 +6,15 @@ # Priority is set to 1 to go after number of buildings but before behaviour sliders. - query = - relative_change = DIVIDE(100 + USER_INPUT(), 100); + relative_change = DIVIDE(100.0 - USER_INPUT(), 100.0); EACH( UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change), UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_future, relative_change), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % From 295819fb695eda1e374aa716c7f3a96b6194e339 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Wed, 29 Jul 2026 17:08:11 +0200 Subject: [PATCH 07/28] New inputs for buildings In this push are 5 new input sliders: - New buildings (priority 2) - Demolished buildings (priority 2) - Insulation new buildings (priority 1) - Insulation existing buildings (priority 1) - Buildings heating behaviour (priority 0) The old input keys are still there and are untouched. --- .../buildings_heating_behaviour.ad | 20 +++++++++ ...buildings_insulation_existing_buildings.ad | 21 +++++++++ .../buildings_insulation_new_buildings.ad | 21 +++++++++ ...uildings_number_of_buildings_demolished.ad | 44 +++++++++++++++++++ .../buildings_number_of_new_buildings.ad | 43 ++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad create mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad create mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad create mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad create mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad diff --git a/inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad b/inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad new file mode 100644 index 0000000000..7a80b44dd1 --- /dev/null +++ b/inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad @@ -0,0 +1,20 @@ +# This input calculates the changed heat demand due to behavioural changes. +# It only updates the demand. +# Its priority is delibaretely set low (0) to make sure it happens after the typical demand is changed due to insulation. +# This input therefore does not udpate the typical_useful_demand_for_space_heating_buildings_present/future +# The typical demand is used in the queries costs_of_insulation_buildings_present and costs_of_insulation_buildings_future + +- query = + relative_change = (100 + USER_INPUT())/100; + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change) + ) +- priority = 0 +- max_value = 50.0 +- min_value = -50.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad new file mode 100644 index 0000000000..b5b02b972f --- /dev/null +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad @@ -0,0 +1,21 @@ +# This input lets you change the insulation of existing buildings by reducing it with a certain percentage +# This percentage is used update: +### The useful_demand +### The typical_useful_demand +### The investment costs for insulation + +- query = + relative_change = (100 + USER_INPUT())/100; + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_present, relative_change), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad new file mode 100644 index 0000000000..fae7a8d161 --- /dev/null +++ b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad @@ -0,0 +1,21 @@ +# This input lets you change the insulation of new buildings by reducing it with a certain percentage +# This percentage is used update: +### The preset_demand +### The typical_useful_demand +### The investment costs for insulation + +- query = + relative_change = (100 + USER_INPUT())/100; + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_future, relative_change), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad new file mode 100644 index 0000000000..d9b1bee8f4 --- /dev/null +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -0,0 +1,44 @@ +# This input lets you demolish existing buildings. +# After you have set your number of demolished buildings it updates the following: +### useful demand for space heating +### useful demand for cooling +### useful demand for lighting +### useful demand for appliances +### building surface available for PV +### number of units + +# This input does not update the investment costs for insulation. This is done in the insulation inputs +# To make this work, the priority of this input is higher than the insulation inputs + +- query = + insulation_value_existing_buildings_future = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_present) }); + typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); + heat_demand_per_unit = insulation_value_existing_buildings_future * typical_surface_area_per_unit * MJ_PER_KWH; + + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); + number_of_units_demolished = USER_INPUT(); + number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; + + number_of_new_units_future = INPUT_VALUE(buildings_number_of_new_buildings); + + total_number_of_units_future = number_of_existing_buildings_future + number_of_new_units_future; + + relative_change_existing = number_of_existing_buildings_future / total_number_of_units_present; + relative_change_total = total_number_of_units_future / total_number_of_units_present; + + EACH( + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change_existing), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_cooling), preset_demand, relative_change_total), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_light), preset_demand, relative_change_total), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_appliances), preset_demand, relative_change_total), + UPDATE_WITH_FACTOR(AREA(), buildings_roof_surface_available_for_pv,relative_change_total), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_buildings) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future +- update_type = mixed diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad new file mode 100644 index 0000000000..fbc3c425d2 --- /dev/null +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad @@ -0,0 +1,43 @@ +# This input lets you demolish existing buildings. +# After you have set your number of demolished buildings it updates the following: +### useful demand for space heating +### useful demand for cooling +### useful demand for lighting +### useful demand for appliances +### building surface available for PV +### number of units + +# This input does not update the investment costs for insulation. This is done in the insulation inputs +# To make this work, the priority of this input is higher than the insulation inputs + +- query = + insulation_value_future = AREA(typical_useful_demand_for_space_heating_buildings_future); + typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); + heat_demand_per_unit = insulation_value_future * typical_surface_area_per_unit * MJ_PER_KWH; + + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); + number_of_units_demolished = INPUT_VALUE(buildings_number_of_buildings_demolished); + number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = USER_INPUT(); + + total_number_of_units_future = number_of_existing_buildings_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + useful_heat_demand_new_buildings_future = number_of_new_units_future * heat_demand_per_unit; + + EACH( + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_new_buildings_future), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_cooling), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_light), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_appliances), preset_demand, relative_change), + UPDATE_WITH_FACTOR(AREA(), buildings_roof_surface_available_for_pv,relative_change), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_units_future), + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_buildings) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future +- update_type = mixed From ec218d105570fe9300f72cae52570337a893d5b0 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 30 Jul 2026 14:51:15 +0200 Subject: [PATCH 08/28] Omit unused insulation-related values from demolished input --- .../buildings_number_of_buildings_demolished.ad | 4 ---- 1 file changed, 4 deletions(-) diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad index d9b1bee8f4..d4e15574c4 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -11,10 +11,6 @@ # To make this work, the priority of this input is higher than the insulation inputs - query = - insulation_value_existing_buildings_future = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_buildings_present) }); - typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); - heat_demand_per_unit = insulation_value_existing_buildings_future * typical_surface_area_per_unit * MJ_PER_KWH; - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); number_of_units_demolished = USER_INPUT(); number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; From b6829fc40f34ee95d1ae3f7448279194eb352732 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Mon, 3 Aug 2026 12:00:56 +0200 Subject: [PATCH 09/28] Update input names --- .../buildings_space_heating_behaviour.ad} | 0 .../buildings_number_of_buildings_demolished.ad | 2 +- ...of_new_buildings.ad => buildings_number_of_buildings_new.ad} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename inputs/demand/buildings/{buildings_insulation/buildings_heating_behaviour.ad => buildings_behaviour/buildings_space_heating_behaviour.ad} (100%) rename inputs/demand/buildings/buildings_number/{buildings_number_of_new_buildings.ad => buildings_number_of_buildings_new.ad} (100%) diff --git a/inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad b/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad similarity index 100% rename from inputs/demand/buildings/buildings_insulation/buildings_heating_behaviour.ad rename to inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad index d4e15574c4..9d80a55e88 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -15,7 +15,7 @@ number_of_units_demolished = USER_INPUT(); number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(buildings_number_of_new_buildings); + number_of_new_units_future = INPUT_VALUE(buildings_number_of_buildings_new); total_number_of_units_future = number_of_existing_buildings_future + number_of_new_units_future; diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad similarity index 100% rename from inputs/demand/buildings/buildings_number/buildings_number_of_new_buildings.ad rename to inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad From 62013181fb0881f2c84eec657f5e9fe399011955 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Mon, 3 Aug 2026 15:16:47 +0200 Subject: [PATCH 10/28] New input keys for households --- ...dings_insulation_level_buildings_future.ad | 0 ...ings_insulation_level_buildings_present.ad | 0 .../buildings_number_of_buildings_future.ad | 0 .../buildings_number_of_buildings_present.ad | 0 ...uildings_number_of_buildings_demolished.ad | 13 +- .../buildings_number_of_buildings_new.ad | 18 +- .../households_heating_behaviour.ad | 51 ++++ ...s_insulation_level_apartments_1945_1964.ad | 0 ...s_insulation_level_apartments_1965_1984.ad | 0 ...s_insulation_level_apartments_1985_2004.ad | 0 ...nsulation_level_apartments_2005_present.ad | 0 ...insulation_level_apartments_before_1945.ad | 0 ...olds_insulation_level_apartments_future.ad | 0 ...ulation_level_detached_houses_1945_1964.ad | 0 ...ulation_level_detached_houses_1965_1984.ad | 0 ...ulation_level_detached_houses_1985_2004.ad | 0 ...tion_level_detached_houses_2005_present.ad | 0 ...ation_level_detached_houses_before_1945.ad | 0 ...insulation_level_detached_houses_future.ad | 0 ...on_level_semi_detached_houses_1945_1964.ad | 0 ...on_level_semi_detached_houses_1965_1984.ad | 0 ...on_level_semi_detached_houses_1985_2004.ad | 0 ...level_semi_detached_houses_2005_present.ad | 0 ..._level_semi_detached_houses_before_1945.ad | 0 ...ation_level_semi_detached_houses_future.ad | 0 ...ulation_level_terraced_houses_1945_1964.ad | 0 ...ulation_level_terraced_houses_1965_1984.ad | 0 ...ulation_level_terraced_houses_1985_2004.ad | 0 ...tion_level_terraced_houses_2005_present.ad | 0 ...ation_level_terraced_houses_before_1945.ad | 0 ...insulation_level_terraced_houses_future.ad | 0 .../households_insulation_1945_1964.ad | 41 +++ .../households_insulation_1965_1984.ad | 41 +++ .../households_insulation_1985_2004.ad | 41 +++ .../households_insulation_2005_present.ad | 41 +++ .../households_insulation_before_1945.ad | 41 +++ .../households_insulation_new_houses.ad | 41 +++ ...useholds_number_of_apartments_1945_1964.ad | 0 ...useholds_number_of_apartments_1965_1984.ad | 0 ...useholds_number_of_apartments_1985_2004.ad | 0 ...holds_number_of_apartments_2005_present.ad | 0 ...eholds_number_of_apartments_before_1945.ad | 0 .../households_number_of_apartments_future.ad | 0 ...lds_number_of_detached_houses_1945_1964.ad | 0 ...lds_number_of_detached_houses_1965_1984.ad | 0 ...lds_number_of_detached_houses_1985_2004.ad | 0 ..._number_of_detached_houses_2005_present.ad | 0 ...s_number_of_detached_houses_before_1945.ad | 0 ...eholds_number_of_detached_houses_future.ad | 0 .../households_number_of_inhabitants.ad | 0 ...umber_of_semi_detached_houses_1945_1964.ad | 0 ...umber_of_semi_detached_houses_1965_1984.ad | 0 ...umber_of_semi_detached_houses_1985_2004.ad | 0 ...er_of_semi_detached_houses_2005_present.ad | 0 ...ber_of_semi_detached_houses_before_1945.ad | 0 ...s_number_of_semi_detached_houses_future.ad | 0 ...lds_number_of_terraced_houses_1945_1964.ad | 0 ...lds_number_of_terraced_houses_1965_1984.ad | 0 ...lds_number_of_terraced_houses_1985_2004.ad | 0 ..._number_of_terraced_houses_2005_present.ad | 0 ...s_number_of_terraced_houses_before_1945.ad | 0 ...eholds_number_of_terraced_houses_future.ad | 0 .../households_demolished_1945_1964.ad | 14 + .../households_demolished_1965_1984.ad | 19 ++ .../households_demolished_1985_2004.ad | 19 ++ .../households_demolished_2005_present.ad | 19 ++ .../households_demolished_before_1945.ad | 19 ++ .../households_share_of_apartments.ad | 19 ++ .../households_share_of_detached.ad | 19 ++ .../households_share_of_semi_detached.ad | 19 ++ .../households_share_of_terraced.ad | 19 ++ .../number_of_residences_demolished.ad | 276 ++++++++++++++++++ .../number_of_residences_new.ad | 86 ++++++ 73 files changed, 845 insertions(+), 11 deletions(-) rename inputs/demand/buildings/buildings_insulation/{ => OLD_SLIDERS}/buildings_insulation_level_buildings_future.ad (100%) rename inputs/demand/buildings/buildings_insulation/{ => OLD_SLIDERS}/buildings_insulation_level_buildings_present.ad (100%) rename inputs/demand/buildings/buildings_number/{ => OLD_SLIDERS}/buildings_number_of_buildings_future.ad (100%) rename inputs/demand/buildings/buildings_number/{ => OLD_SLIDERS}/buildings_number_of_buildings_present.ad (100%) create mode 100644 inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_1945_1964.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_1965_1984.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_1985_2004.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_2005_present.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_before_1945.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_apartments_future.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_1945_1964.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_1965_1984.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_1985_2004.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_2005_present.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_before_1945.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_detached_houses_future.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_1945_1964.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_1965_1984.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_1985_2004.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_2005_present.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_before_1945.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_semi_detached_houses_future.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_1945_1964.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_1965_1984.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_1985_2004.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_2005_present.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_before_1945.ad (100%) rename inputs/demand/households/households_insulation/{ => OLD_SLIDERS}/households_insulation_level_terraced_houses_future.ad (100%) create mode 100644 inputs/demand/households/households_insulation/households_insulation_1945_1964.ad create mode 100644 inputs/demand/households/households_insulation/households_insulation_1965_1984.ad create mode 100644 inputs/demand/households/households_insulation/households_insulation_1985_2004.ad create mode 100644 inputs/demand/households/households_insulation/households_insulation_2005_present.ad create mode 100644 inputs/demand/households/households_insulation/households_insulation_before_1945.ad create mode 100644 inputs/demand/households/households_insulation/households_insulation_new_houses.ad rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_1945_1964.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_1965_1984.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_1985_2004.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_2005_present.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_before_1945.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_apartments_future.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_1945_1964.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_1965_1984.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_1985_2004.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_2005_present.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_before_1945.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_detached_houses_future.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_inhabitants.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_1945_1964.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_1965_1984.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_1985_2004.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_2005_present.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_before_1945.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_semi_detached_houses_future.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_1945_1964.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_1965_1984.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_1985_2004.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_2005_present.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_before_1945.ad (100%) rename inputs/demand/households/households_number/{ => OLD_SLIDERS}/households_number_of_terraced_houses_future.ad (100%) create mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad create mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad create mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad create mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad create mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad create mode 100644 inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad create mode 100644 inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad create mode 100644 inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad create mode 100644 inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad create mode 100644 inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad create mode 100644 inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad b/inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_future.ad similarity index 100% rename from inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad rename to inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_future.ad diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad b/inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_present.ad similarity index 100% rename from inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad rename to inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_present.ad diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad b/inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_future.ad similarity index 100% rename from inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad rename to inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_future.ad diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad b/inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_present.ad similarity index 100% rename from inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad rename to inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_present.ad diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad index 9d80a55e88..44876c0749 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -22,12 +22,17 @@ relative_change_existing = number_of_existing_buildings_future / total_number_of_units_present; relative_change_total = total_number_of_units_future / total_number_of_units_present; + useful_cooling_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); + useful_lighting_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); + useful_appliances_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); + roof_surface_for_pv_future = relative_change_total * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); + EACH( UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change_existing), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_cooling), preset_demand, relative_change_total), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_light), preset_demand, relative_change_total), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_appliances), preset_demand, relative_change_total), - UPDATE_WITH_FACTOR(AREA(), buildings_roof_surface_available_for_pv,relative_change_total), + UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), + UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), + UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), + UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) ) - priority = 2 diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad index fbc3c425d2..26305daa10 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad @@ -1,5 +1,5 @@ -# This input lets you demolish existing buildings. -# After you have set your number of demolished buildings it updates the following: +# This input lets you build new buildings +# After you have set your number of new buildings buildings it updates the following: ### useful demand for space heating ### useful demand for cooling ### useful demand for lighting @@ -24,14 +24,18 @@ relative_change = total_number_of_units_future / total_number_of_units_present; useful_heat_demand_new_buildings_future = number_of_new_units_future * heat_demand_per_unit; + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); + useful_lighting_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); + useful_appliances_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); EACH( UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_new_buildings_future), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_cooling), preset_demand, relative_change), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_light), preset_demand, relative_change), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_appliances), preset_demand, relative_change), - UPDATE_WITH_FACTOR(AREA(), buildings_roof_surface_available_for_pv,relative_change), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_units_future), + UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), + UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), + UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), + UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_units_future) ) - priority = 2 - max_value_gql = present:AREA(present_number_of_buildings) diff --git a/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad b/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad new file mode 100644 index 0000000000..0b5de4ce1f --- /dev/null +++ b/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad @@ -0,0 +1,51 @@ +# This input slider lets you reduce or increase the heat demand for households solely by the behaviour. +# Therefore it only affects the actual useful demand. +# Unlike insulation it does not affect the typical heat demand and the insulation costs. +# The priority is lower than the other heat demand input sliders. It therefore uses the demand that +# is already calculated in other sliders. It can therefore update with factor, instead of calculating +# everything here. + +# Every building type / construction period has to be updated individually. They are sorted by period. + +- query = + relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, relative_change) + ) +- priority = 0 +- max_value = 50.0 +- min_value = -50.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_1945_1964.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_1965_1984.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_1985_2004.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_2005_present.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_before_1945.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_apartments_future.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1945_1964.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1965_1984.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1985_2004.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_2005_present.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_before_1945.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_detached_houses_future.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1945_1964.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1965_1984.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1985_2004.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_2005_present.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_before_1945.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_future.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1945_1964.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1965_1984.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1985_2004.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_2005_present.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_before_1945.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad similarity index 100% rename from inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_future.ad rename to inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad new file mode 100644 index 0000000000..61e8e1a765 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for residences built between 1945 and 1964 due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1945_1964, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_1945_1964, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1945_1964, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1945_1964)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1945_1964)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1945_1964)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1945_1964)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad new file mode 100644 index 0000000000..0cc23844d2 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for residences built between 1965 and 1984 due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1965_1984, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_1965_1984, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1965_1984, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1965_1984)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1965_1984)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1965_1984)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1965_1984)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad new file mode 100644 index 0000000000..f08d8bec2b --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for residences built between 1985 and 2004 due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1985_2004, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_1985_2004, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1985_2004, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1985_2004)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1985_2004)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1985_2004)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1985_2004)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad new file mode 100644 index 0000000000..656bbab067 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for residences built from 2005 to present due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_2005_present, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_2005_present, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_2005_present, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_2005_present, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_2005_present)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_2005_present)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_2005_present)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_2005_present)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad new file mode 100644 index 0000000000..0acd155964 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for residences built before 1945 due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_before_1945, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_before_1945, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_before_1945, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_before_1945, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_before_1945)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_before_1945)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_before_1945)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_before_1945)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad new file mode 100644 index 0000000000..2cf0f9eeb7 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad @@ -0,0 +1,41 @@ +# This input lets you set the reduced heat demand for new residences due to insulation +# +# It works by calculating the relative change. This relative change is used to update the: +# - typical useful demand +# - preset_useful demand +# +# Finally the new values are used to calculate the initial investment costs for insulation in the +# respective queries. +# +# The priority of this input is lower thant the number of of new residences and the distribution amongst building types. +# In these sliders the total demand is calulated before insulation. +# Therefore it works to simply multiply by the relative change due to insulation here. + + +- query = + insulation_relative_change = (100 + USER_INPUT())/100; + + EACH( + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_future, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_detached_houses_future, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_future, insulation_relative_change), + UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_terraced_houses_future, insulation_relative_change), + + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, insulation_relative_change), + UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, insulation_relative_change), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_future)})), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_future)})), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_future)})), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_future)})) + ) +- priority = 1 +- max_value = 0.0 +- min_value = -100.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = % +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad diff --git a/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad diff --git a/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad diff --git a/inputs/demand/households/households_number/households_number_of_apartments_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_apartments_future.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_detached_houses_future.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad diff --git a/inputs/demand/households/households_number/households_number_of_inhabitants.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_inhabitants.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad similarity index 100% rename from inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad rename to inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad new file mode 100644 index 0000000000..e5b788012f --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad @@ -0,0 +1,14 @@ +# This input slider keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_demolished.ad, which +# reads this slider via INPUT_VALUE(households_demolished_1945_1964) - so the 20% +# default is always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_demolished +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 20.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad new file mode 100644 index 0000000000..2962ed3c83 --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_demolished_1965_1984.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 20% was silently ignored whenever a +# user only set the aggregate number_of_residences_demolished_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which +# reads this slider via INPUT_VALUE(households_demolished_1965_1984_v2) - so the 20% +# default is always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_demolished +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 20.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad new file mode 100644 index 0000000000..49e1a0131e --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_demolished_1985_2004.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 20% was silently ignored whenever a +# user only set the aggregate number_of_residences_demolished_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which +# reads this slider via INPUT_VALUE(households_demolished_1985_2004_v2) - so the 20% +# default is always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_demolished +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 20.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad new file mode 100644 index 0000000000..934447219b --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_demolished_2005_present.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 20% was silently ignored whenever a +# user only set the aggregate number_of_residences_demolished_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which +# reads this slider via INPUT_VALUE(households_demolished_2005_present_v2) - so the 20% +# default is always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_demolished +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 20.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad new file mode 100644 index 0000000000..f92eff92c6 --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_demolished_before_1945.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 20% was silently ignored whenever a +# user only set the aggregate number_of_residences_demolished_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which +# reads this slider via INPUT_VALUE(households_demolished_before_1945_v2) - so the 20% +# default is always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_demolished +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 20.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad new file mode 100644 index 0000000000..c7a8a3b698 --- /dev/null +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_share_of_apartments.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 25% was silently ignored whenever a +# user only set the aggregate number_of_residences_new_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads +# this slider via INPUT_VALUE(households_share_of_apartments_v2) - so the 25% default is +# always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_new_residences +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 25.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad new file mode 100644 index 0000000000..30066d12b9 --- /dev/null +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_share_of_detached.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 25% was silently ignored whenever a +# user only set the aggregate number_of_residences_new_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads +# this slider via INPUT_VALUE(households_share_of_detached_v2) - so the 25% default is +# always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_new_residences +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 25.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad new file mode 100644 index 0000000000..70660d2875 --- /dev/null +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_share_of_semi_detached.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 25% was silently ignored whenever a +# user only set the aggregate number_of_residences_new_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads +# this slider via INPUT_VALUE(households_share_of_semi_detached_v2) - so the 25% default is +# always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_new_residences +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 25.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad new file mode 100644 index 0000000000..fee28b8121 --- /dev/null +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad @@ -0,0 +1,19 @@ +# v2 - This is a simplified copy of households_share_of_terraced.ad. +# The original file's own EACH(UPDATE(...)) only ran when this specific slider was +# manually touched, so its start_value default of 25% was silently ignored whenever a +# user only set the aggregate number_of_residences_new_v2 slider. +# +# This v2 version keeps only the share value itself. The actual number-of-units and +# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads +# this slider via INPUT_VALUE(households_share_of_terraced_v2) - so the 25% default is +# always applied, whether or not this slider is touched directly. + +- query = UPDATE() +- share_group = households_new_residences +- priority = 3 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 25.0 +- step_value = 1.0 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad b/inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad new file mode 100644 index 0000000000..8569040a0c --- /dev/null +++ b/inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad @@ -0,0 +1,276 @@ +# v2 - This is number_of_residences_demolished.ad, extended so that the per-building-type +# and per-construction-period demolition breakdown (previously split across the +# households_demolished_[period].ad files) is always applied. +# +# Reason: each households_demolished_[period].ad file's own EACH(UPDATE(...)) only ran +# when that specific slider was manually touched. Setting only this slider (the total +# number of residences demolished) never triggered them, so the per-period 20% defaults +# were silently skipped. This version reads each period's share via +# INPUT_VALUE(households_demolished_[period]_v2) - which resolves to the user value or +# the 20% start_value regardless of whether that slider was touched - and performs the +# breakdown and updates directly here, in a file that is guaranteed to run whenever this +# slider has a value. +# +# The households_demolished_[period].ad files are now pure share sliders with no +# side effects of their own (see those files for details). + +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = USER_INPUT(); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = INPUT_VALUE(number_of_residences_new); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + + number_of_apartments_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_apartments_before_1945)}); + number_of_detached_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_before_1945)}); + number_of_semi_detached_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_before_1945)}); + number_of_terraced_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_before_1945)}); + + heat_demand_apartments_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_before_1945, preset_demand)}); + heat_demand_detached_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_before_1945, preset_demand)}); + heat_demand_semi_detached_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, preset_demand)}); + heat_demand_terraced_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_before_1945, preset_demand)}); + + total_units_before_1945 = ( + number_of_apartments_present_before_1945 + + number_of_detached_present_before_1945 + + number_of_semi_detached_present_before_1945 + + number_of_terraced_present_before_1945 + ); + + share_demolished_before_1945 = INPUT_VALUE(households_demolished_before_1945)/100; + total_demolished_before_1945 = number_of_units_demolished * share_demolished_before_1945; + + demolished_apartments_before_1945 = (number_of_apartments_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; + demolished_detached_before_1945 = (number_of_detached_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; + demolished_semi_detached_before_1945 = (number_of_semi_detached_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; + demolished_terraced_before_1945 = (number_of_terraced_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; + + number_of_apartments_future_before_1945 = number_of_apartments_present_before_1945 - demolished_apartments_before_1945; + number_of_detached_future_before_1945 = number_of_detached_present_before_1945 - demolished_detached_before_1945; + number_semi_detached_future_before_1945 = number_of_semi_detached_present_before_1945 - demolished_semi_detached_before_1945; + number_of_terraced_future_before_1945 = number_of_terraced_present_before_1945 - demolished_terraced_before_1945; + + heat_demand_apartments_future_before_1945 = heat_demand_apartments_present_before_1945 * (number_of_apartments_future_before_1945 / number_of_apartments_present_before_1945); + heat_demand_detached_future_before_1945 = heat_demand_detached_present_before_1945 * (number_of_detached_future_before_1945 / number_of_detached_present_before_1945); + heat_demand_semi_detached_future_before_1945 = heat_demand_semi_detached_present_before_1945 * (number_semi_detached_future_before_1945 / number_of_semi_detached_present_before_1945); + heat_demand_terraced_future_before_1945 = heat_demand_terraced_present_before_1945 * (number_of_terraced_future_before_1945 / number_of_terraced_present_before_1945); + + number_of_apartments_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1945_1964)}); + number_of_detached_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1945_1964)}); + number_of_semi_detached_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1945_1964)}); + number_of_terraced_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1945_1964)}); + + heat_demand_apartments_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1945_1964, preset_demand)}); + heat_demand_detached_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1945_1964, preset_demand)}); + heat_demand_semi_detached_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, preset_demand)}); + heat_demand_terraced_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1945_1964, preset_demand)}); + + total_units_1945_1964 = ( + number_of_apartments_present_1945_1964 + + number_of_detached_present_1945_1964 + + number_of_semi_detached_present_1945_1964 + + number_of_terraced_present_1945_1964 + ); + + share_demolished_1945_1964 = INPUT_VALUE(households_demolished_1945_1964)/100; + total_demolished_1945_1964 = number_of_units_demolished * share_demolished_1945_1964; + + demolished_apartments_1945_1964 = (number_of_apartments_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; + demolished_detached_1945_1964 = (number_of_detached_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; + demolished_semi_detached_1945_1964 = (number_of_semi_detached_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; + demolished_terraced_1945_1964 = (number_of_terraced_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; + + number_of_apartments_future_1945_1964 = number_of_apartments_present_1945_1964 - demolished_apartments_1945_1964; + number_of_detached_future_1945_1964 = number_of_detached_present_1945_1964 - demolished_detached_1945_1964; + number_semi_detached_future_1945_1964 = number_of_semi_detached_present_1945_1964 - demolished_semi_detached_1945_1964; + number_of_terraced_future_1945_1964 = number_of_terraced_present_1945_1964 - demolished_terraced_1945_1964; + + heat_demand_apartments_future_1945_1964 = heat_demand_apartments_present_1945_1964 * (number_of_apartments_future_1945_1964 / number_of_apartments_present_1945_1964); + heat_demand_detached_future_1945_1964 = heat_demand_detached_present_1945_1964 * (number_of_detached_future_1945_1964 / number_of_detached_present_1945_1964); + heat_demand_semi_detached_future_1945_1964 = heat_demand_semi_detached_present_1945_1964 * (number_semi_detached_future_1945_1964 / number_of_semi_detached_present_1945_1964); + heat_demand_terraced_future_1945_1964 = heat_demand_terraced_present_1945_1964 * (number_of_terraced_future_1945_1964 / number_of_terraced_present_1945_1964); + + number_of_apartments_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1965_1984)}); + number_of_detached_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1965_1984)}); + number_of_semi_detached_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1965_1984)}); + number_of_terraced_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1965_1984)}); + + heat_demand_apartments_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1965_1984, preset_demand)}); + heat_demand_detached_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1965_1984, preset_demand)}); + heat_demand_semi_detached_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, preset_demand)}); + heat_demand_terraced_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1965_1984, preset_demand)}); + + total_units_1965_1984 = ( + number_of_apartments_present_1965_1984 + + number_of_detached_present_1965_1984 + + number_of_semi_detached_present_1965_1984 + + number_of_terraced_present_1965_1984 + ); + + share_demolished_1965_1984 = INPUT_VALUE(households_demolished_1965_1984)/100; + total_demolished_1965_1984 = number_of_units_demolished * share_demolished_1965_1984; + + demolished_apartments_1965_1984 = (number_of_apartments_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; + demolished_detached_1965_1984 = (number_of_detached_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; + demolished_semi_detached_1965_1984 = (number_of_semi_detached_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; + demolished_terraced_1965_1984 = (number_of_terraced_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; + + number_of_apartments_future_1965_1984 = number_of_apartments_present_1965_1984 - demolished_apartments_1965_1984; + number_of_detached_future_1965_1984 = number_of_detached_present_1965_1984 - demolished_detached_1965_1984; + number_semi_detached_future_1965_1984 = number_of_semi_detached_present_1965_1984 - demolished_semi_detached_1965_1984; + number_of_terraced_future_1965_1984 = number_of_terraced_present_1965_1984 - demolished_terraced_1965_1984; + + heat_demand_apartments_future_1965_1984 = heat_demand_apartments_present_1965_1984 * (number_of_apartments_future_1965_1984 / number_of_apartments_present_1965_1984); + heat_demand_detached_future_1965_1984 = heat_demand_detached_present_1965_1984 * (number_of_detached_future_1965_1984 / number_of_detached_present_1965_1984); + heat_demand_semi_detached_future_1965_1984 = heat_demand_semi_detached_present_1965_1984 * (number_semi_detached_future_1965_1984 / number_of_semi_detached_present_1965_1984); + heat_demand_terraced_future_1965_1984 = heat_demand_terraced_present_1965_1984 * (number_of_terraced_future_1965_1984 / number_of_terraced_present_1965_1984); + + number_of_apartments_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1985_2004)}); + number_of_detached_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1985_2004)}); + number_of_semi_detached_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1985_2004)}); + number_of_terraced_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1985_2004)}); + + heat_demand_apartments_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1985_2004, preset_demand)}); + heat_demand_detached_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1985_2004, preset_demand)}); + heat_demand_semi_detached_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, preset_demand)}); + heat_demand_terraced_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1985_2004, preset_demand)}); + + total_units_1985_2004 = ( + number_of_apartments_present_1985_2004 + + number_of_detached_present_1985_2004 + + number_of_semi_detached_present_1985_2004 + + number_of_terraced_present_1985_2004 + ); + + share_demolished_1985_2004 = INPUT_VALUE(households_demolished_1985_2004)/100; + total_demolished_1985_2004 = number_of_units_demolished * share_demolished_1985_2004; + + demolished_apartments_1985_2004 = (number_of_apartments_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; + demolished_detached_1985_2004 = (number_of_detached_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; + demolished_semi_detached_1985_2004 = (number_of_semi_detached_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; + demolished_terraced_1985_2004 = (number_of_terraced_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; + + number_of_apartments_future_1985_2004 = number_of_apartments_present_1985_2004 - demolished_apartments_1985_2004; + number_of_detached_future_1985_2004 = number_of_detached_present_1985_2004 - demolished_detached_1985_2004; + number_semi_detached_future_1985_2004 = number_of_semi_detached_present_1985_2004 - demolished_semi_detached_1985_2004; + number_of_terraced_future_1985_2004 = number_of_terraced_present_1985_2004 - demolished_terraced_1985_2004; + + heat_demand_apartments_future_1985_2004 = heat_demand_apartments_present_1985_2004 * (number_of_apartments_future_1985_2004 / number_of_apartments_present_1985_2004); + heat_demand_detached_future_1985_2004 = heat_demand_detached_present_1985_2004 * (number_of_detached_future_1985_2004 / number_of_detached_present_1985_2004); + heat_demand_semi_detached_future_1985_2004 = heat_demand_semi_detached_present_1985_2004 * (number_semi_detached_future_1985_2004 / number_of_semi_detached_present_1985_2004); + heat_demand_terraced_future_1985_2004 = heat_demand_terraced_present_1985_2004 * (number_of_terraced_future_1985_2004 / number_of_terraced_present_1985_2004); + + number_of_apartments_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_apartments_2005_present)}); + number_of_detached_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_2005_present)}); + number_of_semi_detached_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_2005_present)}); + number_of_terraced_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_2005_present)}); + + heat_demand_apartments_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_2005_present, preset_demand)}); + heat_demand_detached_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_2005_present, preset_demand)}); + heat_demand_semi_detached_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, preset_demand)}); + heat_demand_terraced_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_2005_present, preset_demand)}); + + total_units_2005_present = ( + number_of_apartments_present_2005_present + + number_of_detached_present_2005_present + + number_of_semi_detached_present_2005_present + + number_of_terraced_present_2005_present + ); + + share_demolished_2005_present = INPUT_VALUE(households_demolished_2005_present)/100; + total_demolished_2005_present = number_of_units_demolished * share_demolished_2005_present; + + demolished_apartments_2005_present = (number_of_apartments_present_2005_present / total_units_2005_present) * total_demolished_2005_present; + demolished_detached_2005_present = (number_of_detached_present_2005_present / total_units_2005_present) * total_demolished_2005_present; + demolished_semi_detached_2005_present = (number_of_semi_detached_present_2005_present / total_units_2005_present) * total_demolished_2005_present; + demolished_terraced_2005_present = (number_of_terraced_present_2005_present / total_units_2005_present) * total_demolished_2005_present; + + number_of_apartments_future_2005_present = number_of_apartments_present_2005_present - demolished_apartments_2005_present; + number_of_detached_future_2005_present = number_of_detached_present_2005_present - demolished_detached_2005_present; + number_semi_detached_future_2005_present = number_of_semi_detached_present_2005_present - demolished_semi_detached_2005_present; + number_of_terraced_future_2005_present = number_of_terraced_present_2005_present - demolished_terraced_2005_present; + + heat_demand_apartments_future_2005_present = heat_demand_apartments_present_2005_present * (number_of_apartments_future_2005_present / number_of_apartments_present_2005_present); + heat_demand_detached_future_2005_present = heat_demand_detached_present_2005_present * (number_of_detached_future_2005_present / number_of_detached_present_2005_present); + heat_demand_semi_detached_future_2005_present = heat_demand_semi_detached_present_2005_present * (number_semi_detached_future_2005_present / number_of_semi_detached_present_2005_present); + heat_demand_terraced_future_2005_present = heat_demand_terraced_present_2005_present * (number_of_terraced_future_2005_present / number_of_terraced_present_2005_present); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, heat_demand_apartments_future_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, number_of_apartments_future_before_1945), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, heat_demand_detached_future_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, number_of_detached_future_before_1945), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, heat_demand_semi_detached_future_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, number_semi_detached_future_before_1945), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, heat_demand_terraced_future_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, number_of_terraced_future_before_1945), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, heat_demand_apartments_future_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, number_of_apartments_future_1945_1964), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, heat_demand_detached_future_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, number_of_detached_future_1945_1964), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, heat_demand_semi_detached_future_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, number_semi_detached_future_1945_1964), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, heat_demand_terraced_future_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, number_of_terraced_future_1945_1964), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, heat_demand_apartments_future_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, number_of_apartments_future_1965_1984), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, heat_demand_detached_future_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, number_of_detached_future_1965_1984), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, heat_demand_semi_detached_future_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, number_semi_detached_future_1965_1984), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, heat_demand_terraced_future_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, number_of_terraced_future_1965_1984), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, heat_demand_apartments_future_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, number_of_apartments_future_1985_2004), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, heat_demand_detached_future_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, number_of_detached_future_1985_2004), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, heat_demand_semi_detached_future_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, number_semi_detached_future_1985_2004), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, heat_demand_terraced_future_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, number_of_terraced_future_1985_2004), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, heat_demand_apartments_future_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, number_of_apartments_future_2005_present), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, heat_demand_detached_future_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, number_of_detached_future_2005_present), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, heat_demand_semi_detached_future_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, number_semi_detached_future_2005_present), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, heat_demand_terraced_future_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, number_of_terraced_future_2005_present) + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future +- update_type = mixed diff --git a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad b/inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad new file mode 100644 index 0000000000..931d1045a5 --- /dev/null +++ b/inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad @@ -0,0 +1,86 @@ +# v2 - This is number_of_residences_new.ad, extended so that the per-building-type +# breakdown of new construction (previously split across the +# households_share_of_[type].ad files) is always applied. +# +# Reason: each households_share_of_[type].ad file's own EACH(UPDATE(...)) only ran when +# that specific slider was manually touched. Setting only this slider (the total number +# of new residences) never triggered them, so the per-type 25% defaults were silently +# skipped. This version reads each type's share via +# INPUT_VALUE(households_share_of_[type]_v2) - which resolves to the user value or the +# 25% start_value regardless of whether that slider was touched - and performs the +# breakdown and updates directly here, in a file that is guaranteed to run whenever this +# slider has a value. +# +# The households_share_of_[type]_v2.ad files are now pure share sliders with no side +# effects of their own (see those files for details). +### The update of insulation costs can potentially be deleted and only added in the insulation inputs + +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = INPUT_VALUE(number_of_residences_demolished); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = USER_INPUT(); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + + share_new_apartments = INPUT_VALUE(households_share_of_apartments) / 100; + number_new_apartments = share_new_apartments * number_of_new_units_future; + + typical_heat_new_apartments_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_apartments_future)}); + typical_surface_area_per_unit_apartments = 84.0916691776263; + typical_heat_demand_per_unit_apartments = typical_heat_new_apartments_future * typical_surface_area_per_unit_apartments; + total_heat_demand_apartments_new = number_new_apartments * typical_heat_demand_per_unit_apartments * MJ_PER_KWH; + + share_new_detached = INPUT_VALUE(households_share_of_detached) / 100; + number_new_detached = share_new_detached * number_of_new_units_future; + + typical_heat_new_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future)}); + typical_surface_area_per_unit_detached = 224.001485938283; + typical_heat_demand_per_unit_detached = typical_heat_new_detached_future * typical_surface_area_per_unit_detached; + total_heat_demand_detached_new = number_new_detached * typical_heat_demand_per_unit_detached * MJ_PER_KWH; + + share_new_semi_detached = INPUT_VALUE(households_share_of_semi_detached) / 100; + number_new_semi_detached = share_new_semi_detached * number_of_new_units_future; + + typical_heat_new_semi_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future)}); + typical_surface_area_per_unit_semi_detached = 147.709471392282; + typical_heat_demand_per_unit_semi_detached = typical_heat_new_semi_detached_future * typical_surface_area_per_unit_semi_detached; + total_heat_demand_semi_detached_new = number_new_semi_detached * typical_heat_demand_per_unit_semi_detached * MJ_PER_KWH; + + share_new_terraced = INPUT_VALUE(households_share_of_terraced) / 100; + number_new_terraced = share_new_terraced * number_of_new_units_future; + + typical_heat_new_terraced_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future)}); + typical_surface_area_per_unit_terraced = 130.419159051538; + typical_heat_demand_per_unit_terraced = typical_heat_new_terraced_future * typical_surface_area_per_unit_terraced; + total_heat_demand_terraced_new = number_new_terraced * typical_heat_demand_per_unit_terraced * MJ_PER_KWH; + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, total_heat_demand_apartments_new), + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, number_new_apartments), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, total_heat_demand_detached_new), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), number_of_units, number_new_detached), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, total_heat_demand_semi_detached_new), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), number_of_units, number_new_semi_detached), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, total_heat_demand_terraced_new), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, number_new_terraced), + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future +- update_type = mixed From de8a9853f7fb78709cd10c2cbcd9874d01ad54b3 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Wed, 5 Aug 2026 10:52:48 +0200 Subject: [PATCH 11/28] Changed names of household_number demolished and new inputs --- ...olished.ad => households_number_of_residences_demolished.ad} | 2 +- ...residences_new.ad => households_number_of_residences_new.ad} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename inputs/demand/households/households_number/households_total_numbers/{number_of_residences_demolished.ad => households_number_of_residences_demolished.ad} (99%) rename inputs/demand/households/households_number/households_total_numbers/{number_of_residences_new.ad => households_number_of_residences_new.ad} (98%) diff --git a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad similarity index 99% rename from inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad rename to inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad index 8569040a0c..1e3cc265fa 100644 --- a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_demolished.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad @@ -18,7 +18,7 @@ total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); number_of_units_demolished = USER_INPUT(); number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(number_of_residences_new); + number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; relative_change = total_number_of_units_future / total_number_of_units_present; diff --git a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad similarity index 98% rename from inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad rename to inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad index 931d1045a5..a0fc607194 100644 --- a/inputs/demand/households/households_number/households_total_numbers/number_of_residences_new.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad @@ -17,7 +17,7 @@ - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = INPUT_VALUE(number_of_residences_demolished); + number_of_units_demolished = INPUT_VALUE(households_number_of_residences_demolished); number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; number_of_new_units_future = USER_INPUT(); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; From 55d83204a457f3f49d4f11f4f1f5ddb8db3312b1 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 5 Aug 2026 16:32:58 +0200 Subject: [PATCH 12/28] Add two alternative approaches to demolished residences --- ...olds_number_of_residences_demolished_v2.ad | 59 +++++++++++++++++++ ...olds_number_of_residences_demolished_v3.ad | 46 +++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad create mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad new file mode 100644 index 0000000000..a9cd3d5f8f --- /dev/null +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad @@ -0,0 +1,59 @@ +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = USER_INPUT(); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + + units_present_before_1945 = QUERY_PRESENT(-> {SUM(V(G(households_before_1945), number_of_units))}); + demolished_before_1945 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0); + remaining_share_before_1945 = 1.0 - (demolished_before_1945 / units_present_before_1945); + + units_present_1945_1964 = QUERY_PRESENT(-> {SUM(V(G(households_1945_1964), number_of_units))}); + demolished_1945_1964 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0); + remaining_share_1945_1964 = 1.0 - (demolished_1945_1964 / units_present_1945_1964); + + units_present_1965_1984 = QUERY_PRESENT(-> {SUM(V(G(households_1965_1984), number_of_units))}); + demolished_1965_1984 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0); + remaining_share_1965_1984 = 1.0 - (demolished_1965_1984 / units_present_1965_1984); + + units_present_1985_2004 = QUERY_PRESENT(-> {SUM(V(G(households_1985_2004), number_of_units))}); + demolished_1985_2004 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0); + remaining_share_1985_2004 = 1.0 - (demolished_1985_2004 / units_present_1985_2004); + + units_present_2005_present = QUERY_PRESENT(-> {SUM(V(G(households_2005_present), number_of_units))}); + demolished_2005_present = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0); + remaining_share_2005_present = 1.0 - (demolished_2005_present / units_present_2005_present); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_before_1945)), number_of_units, remaining_share_before_1945), + UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, remaining_share_before_1945), + + UPDATE_WITH_FACTOR(V(G(households_1945_1964)), number_of_units, remaining_share_1945_1964), + UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, remaining_share_1945_1964), + + UPDATE_WITH_FACTOR(V(G(households_1965_1984)), number_of_units, remaining_share_1965_1984), + UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, remaining_share_1965_1984), + + UPDATE_WITH_FACTOR(V(G(households_1985_2004)), number_of_units, remaining_share_1985_2004), + UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, remaining_share_1985_2004), + + UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, remaining_share_2005_present), + UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, remaining_share_2005_present) + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad new file mode 100644 index 0000000000..b8dee08f94 --- /dev/null +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad @@ -0,0 +1,46 @@ +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = USER_INPUT(); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + + building_types = ["apartments", "detached_houses", "semi_detached_houses", "terraced_houses"]; + construction_periods = ["before_1945", "1945_1964", "1965_1984", "1985_2004", "2005_present"]; + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + *construction_periods.flat_map{|period| + units_present = building_types.map{|type| + QUERY_PRESENT(->{AREA("present_number_of_#{type}_#{period}")}) + }; + total_units_present = units_present.sum; + total_demolished = number_of_units_demolished * (INPUT_VALUE("households_demolished_#{period}") / 100); + + building_types.each_with_index.flat_map{|type, index| + node_key = "households_useful_demand_for_space_heating_#{type}_#{period}"; + present_units = units_present[index]; + future_units = present_units - ((present_units / total_units_present) * total_demolished); + present_heat = QUERY_PRESENT(->{V(node_key, preset_demand)}); + [ + UPDATE(V(node_key), preset_demand, present_heat * (future_units / present_units)), + UPDATE(V(node_key), number_of_units, future_units) + ] + } + } + ) +- priority = 2 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future From 2fa069c8cc82ae820c8639005b20a185a45aca89 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Thu, 6 Aug 2026 16:43:15 +0200 Subject: [PATCH 13/28] Some small changes: Added a start value to share of new buildings per building type based on existing stock: Created seperate queries in which the starting values are calculated Changed the step value to 0.1 instead of 1 for: Shares of new buildings Shares of demolished buildings Wrote descriptions for following inputs: Shares of new buildings Shares of demolished buildings Chaned priorities: Total_numbers 2 to 3 Shares of new/demolished 3 to 4 Wrote a demolished V2a, which is longer than V2 but it rounds number_of_units to integers. Also made sure to round to integers in V3 --- .../households_share_of_apartments.gql | 2 + .../households_share_of_detached.gql | 2 + .../households_share_of_semi_detached.gql | 2 + .../households_share_of_terraced.gql | 2 + .../households_demolished_1945_1964.ad | 8 +- .../households_demolished_1965_1984.ad | 15 +-- .../households_demolished_1985_2004.ad | 15 +-- .../households_demolished_2005_present.ad | 15 +-- .../households_demolished_before_1945.ad | 15 +-- .../households_share_of_apartments.ad | 18 ++-- .../households_share_of_detached.ad | 18 ++-- .../households_share_of_semi_detached.ad | 18 ++-- .../households_share_of_terraced.ad | 18 ++-- ...seholds_number_of_residences_demolished.ad | 2 +- ...olds_number_of_residences_demolished_v2.ad | 28 +++--- ...lds_number_of_residences_demolished_v2a.ad | 92 +++++++++++++++++++ ...olds_number_of_residences_demolished_v3.ad | 8 +- .../households_number_of_residences_new.ad | 2 +- 18 files changed, 163 insertions(+), 117 deletions(-) create mode 100644 gqueries/input_elements/start_value/households_share_of_apartments.gql create mode 100644 gqueries/input_elements/start_value/households_share_of_detached.gql create mode 100644 gqueries/input_elements/start_value/households_share_of_semi_detached.gql create mode 100644 gqueries/input_elements/start_value/households_share_of_terraced.gql create mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad diff --git a/gqueries/input_elements/start_value/households_share_of_apartments.gql b/gqueries/input_elements/start_value/households_share_of_apartments.gql new file mode 100644 index 0000000000..17d9a2052f --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_apartments.gql @@ -0,0 +1,2 @@ +- query = ROUND(PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)),100),1) +- unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_detached.gql b/gqueries/input_elements/start_value/households_share_of_detached.gql new file mode 100644 index 0000000000..0c5a4679ca --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_detached.gql @@ -0,0 +1,2 @@ +- query = ROUND(PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)),100),1) +- unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql new file mode 100644 index 0000000000..4782bda430 --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql @@ -0,0 +1,2 @@ +- query = ROUND(PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)),100),1) +- unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_terraced.gql b/gqueries/input_elements/start_value/households_share_of_terraced.gql new file mode 100644 index 0000000000..a34e1f9dcd --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_terraced.gql @@ -0,0 +1,2 @@ +- query = ROUND(PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)),100),1) +- unit = factor diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad index e5b788012f..8a9b3e2bbe 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad @@ -1,14 +1,12 @@ # This input slider keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_demolished.ad, which -# reads this slider via INPUT_VALUE(households_demolished_1945_1964) - so the 20% -# default is always applied, whether or not this slider is touched directly. +# demand updates happen centrally in number_of_residences_demolished.ad. - query = UPDATE() - share_group = households_demolished -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 - start_value = 20.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad index 2962ed3c83..8a9b3e2bbe 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad @@ -1,19 +1,12 @@ -# v2 - This is a simplified copy of households_demolished_1965_1984.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 20% was silently ignored whenever a -# user only set the aggregate number_of_residences_demolished_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which -# reads this slider via INPUT_VALUE(households_demolished_1965_1984_v2) - so the 20% -# default is always applied, whether or not this slider is touched directly. +# This input slider keeps only the share value itself. The actual number-of-units and +# demand updates happen centrally in number_of_residences_demolished.ad. - query = UPDATE() - share_group = households_demolished -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 - start_value = 20.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad index 49e1a0131e..8a9b3e2bbe 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad @@ -1,19 +1,12 @@ -# v2 - This is a simplified copy of households_demolished_1985_2004.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 20% was silently ignored whenever a -# user only set the aggregate number_of_residences_demolished_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which -# reads this slider via INPUT_VALUE(households_demolished_1985_2004_v2) - so the 20% -# default is always applied, whether or not this slider is touched directly. +# This input slider keeps only the share value itself. The actual number-of-units and +# demand updates happen centrally in number_of_residences_demolished.ad. - query = UPDATE() - share_group = households_demolished -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 - start_value = 20.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad index 934447219b..8a9b3e2bbe 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad @@ -1,19 +1,12 @@ -# v2 - This is a simplified copy of households_demolished_2005_present.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 20% was silently ignored whenever a -# user only set the aggregate number_of_residences_demolished_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which -# reads this slider via INPUT_VALUE(households_demolished_2005_present_v2) - so the 20% -# default is always applied, whether or not this slider is touched directly. +# This input slider keeps only the share value itself. The actual number-of-units and +# demand updates happen centrally in number_of_residences_demolished.ad. - query = UPDATE() - share_group = households_demolished -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 - start_value = 20.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad index f92eff92c6..8a9b3e2bbe 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad @@ -1,19 +1,12 @@ -# v2 - This is a simplified copy of households_demolished_before_1945.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 20% was silently ignored whenever a -# user only set the aggregate number_of_residences_demolished_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_demolished_v2.ad, which -# reads this slider via INPUT_VALUE(households_demolished_before_1945_v2) - so the 20% -# default is always applied, whether or not this slider is touched directly. +# This input slider keeps only the share value itself. The actual number-of-units and +# demand updates happen centrally in number_of_residences_demolished.ad. - query = UPDATE() - share_group = households_demolished -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 - start_value = 20.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad index c7a8a3b698..59cba9b7d2 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad @@ -1,19 +1,13 @@ -# v2 - This is a simplified copy of households_share_of_apartments.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 25% was silently ignored whenever a -# user only set the aggregate number_of_residences_new_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads -# this slider via INPUT_VALUE(households_share_of_apartments_v2) - so the 25% default is -# always applied, whether or not this slider is touched directly. +# This input lets you decide what part of the new buildings will be apartments. +# The total number of new buildings is set in total_number_of_residences_new.ad +# The start value is based on the share of apartments in the exisiting building stock. - query = UPDATE() - share_group = households_new_residences -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 -- start_value = 25.0 -- step_value = 1.0 +- start_value_gql = present:Q(households_share_of_apartments) +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad index 30066d12b9..ce722959a4 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad @@ -1,19 +1,13 @@ -# v2 - This is a simplified copy of households_share_of_detached.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 25% was silently ignored whenever a -# user only set the aggregate number_of_residences_new_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads -# this slider via INPUT_VALUE(households_share_of_detached_v2) - so the 25% default is -# always applied, whether or not this slider is touched directly. +# This input lets you decide what part of the new buildings will be detached houses. +# The total number of new buildings is set in total_number_of_residences_new.ad +# The start value is based on the share of detached houses in the exisiting building stock. - query = UPDATE() - share_group = households_new_residences -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 -- start_value = 25.0 -- step_value = 1.0 +- start_value_gql = present:Q(households_share_of_detached) +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad index 70660d2875..2260cf0bc5 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad @@ -1,19 +1,13 @@ -# v2 - This is a simplified copy of households_share_of_semi_detached.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 25% was silently ignored whenever a -# user only set the aggregate number_of_residences_new_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads -# this slider via INPUT_VALUE(households_share_of_semi_detached_v2) - so the 25% default is -# always applied, whether or not this slider is touched directly. +# This input lets you decide what part of the new buildings will be semi detached houses. +# The total number of new buildings is set in total_number_of_residences_new.ad +# The start value is based on the share of semi detached houses in the exisiting building stock. - query = UPDATE() - share_group = households_new_residences -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 -- start_value = 25.0 -- step_value = 1.0 +- start_value_gql = present:Q(households_share_of_semi_detached) +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad index fee28b8121..378c9883cc 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad @@ -1,19 +1,13 @@ -# v2 - This is a simplified copy of households_share_of_terraced.ad. -# The original file's own EACH(UPDATE(...)) only ran when this specific slider was -# manually touched, so its start_value default of 25% was silently ignored whenever a -# user only set the aggregate number_of_residences_new_v2 slider. -# -# This v2 version keeps only the share value itself. The actual number-of-units and -# demand updates now happen centrally in number_of_residences_new_v2.ad, which reads -# this slider via INPUT_VALUE(households_share_of_terraced_v2) - so the 25% default is -# always applied, whether or not this slider is touched directly. +# This input lets you decide what part of the new buildings will be terraced houses. +# The total number of new buildings is set in total_number_of_residences_new.ad +# The start value is based on the share of terraced houses in the exisiting building stock. - query = UPDATE() - share_group = households_new_residences -- priority = 3 +- priority = 4 - max_value = 100.0 - min_value = 0.0 -- start_value = 25.0 -- step_value = 1.0 +- start_value_gql = present:Q(households_share_of_terraced) +- step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad index 1e3cc265fa..955ac73796 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad @@ -266,7 +266,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, heat_demand_terraced_future_2005_present), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, number_of_terraced_future_2005_present) ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_residences) - min_value = 0.0 - start_value = 0.0 diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad index a9cd3d5f8f..36db07b13c 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad @@ -4,30 +4,30 @@ number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; + relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); units_present_before_1945 = QUERY_PRESENT(-> {SUM(V(G(households_before_1945), number_of_units))}); - demolished_before_1945 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0); - remaining_share_before_1945 = 1.0 - (demolished_before_1945 / units_present_before_1945); + demolished_before_1945 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0)); + remaining_share_before_1945 = 1.0 - DIVIDE(demolished_before_1945, units_present_before_1945); units_present_1945_1964 = QUERY_PRESENT(-> {SUM(V(G(households_1945_1964), number_of_units))}); - demolished_1945_1964 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0); - remaining_share_1945_1964 = 1.0 - (demolished_1945_1964 / units_present_1945_1964); + demolished_1945_1964 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0)); + remaining_share_1945_1964 = 1.0 - DIVIDE(demolished_1945_1964, units_present_1945_1964); units_present_1965_1984 = QUERY_PRESENT(-> {SUM(V(G(households_1965_1984), number_of_units))}); - demolished_1965_1984 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0); - remaining_share_1965_1984 = 1.0 - (demolished_1965_1984 / units_present_1965_1984); + demolished_1965_1984 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0)); + remaining_share_1965_1984 = 1.0 - DIVIDE(demolished_1965_1984, units_present_1965_1984); units_present_1985_2004 = QUERY_PRESENT(-> {SUM(V(G(households_1985_2004), number_of_units))}); - demolished_1985_2004 = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0); - remaining_share_1985_2004 = 1.0 - (demolished_1985_2004 / units_present_1985_2004); + demolished_1985_2004 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0)); + remaining_share_1985_2004 = 1.0 - DIVIDE(demolished_1985_2004, units_present_1985_2004); units_present_2005_present = QUERY_PRESENT(-> {SUM(V(G(households_2005_present), number_of_units))}); - demolished_2005_present = number_of_units_demolished * DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0); - remaining_share_2005_present = 1.0 - (demolished_2005_present / units_present_2005_present); + demolished_2005_present = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0)); + remaining_share_2005_present = 1.0 - DIVIDE(demolished_2005_present, units_present_2005_present); EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), @@ -50,7 +50,7 @@ UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, remaining_share_2005_present), UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, remaining_share_2005_present) ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_residences) - min_value = 0.0 - start_value = 0.0 diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad new file mode 100644 index 0000000000..a1627aa487 --- /dev/null +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad @@ -0,0 +1,92 @@ +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = USER_INPUT(); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); + + roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + units_present_before_1945 = QUERY_PRESENT(-> {SUM(V(G(households_before_1945), number_of_units))}); + demolished_before_1945 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0)); + remaining_share_before_1945 = 1.0 - DIVIDE(demolished_before_1945, units_present_before_1945); + + units_present_1945_1964 = QUERY_PRESENT(-> {SUM(V(G(households_1945_1964), number_of_units))}); + demolished_1945_1964 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0)); + remaining_share_1945_1964 = 1.0 - DIVIDE(demolished_1945_1964, units_present_1945_1964); + + units_present_1965_1984 = QUERY_PRESENT(-> {SUM(V(G(households_1965_1984), number_of_units))}); + demolished_1965_1984 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0)); + remaining_share_1965_1984 = 1.0 - DIVIDE(demolished_1965_1984, units_present_1965_1984); + + units_present_1985_2004 = QUERY_PRESENT(-> {SUM(V(G(households_1985_2004), number_of_units))}); + demolished_1985_2004 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0)); + remaining_share_1985_2004 = 1.0 - DIVIDE(demolished_1985_2004, units_present_1985_2004); + + units_present_2005_present = QUERY_PRESENT(-> {SUM(V(G(households_2005_present), number_of_units))}); + demolished_2005_present = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0)); + remaining_share_2005_present = 1.0 - DIVIDE(demolished_2005_present, units_present_2005_present); + + nuo_apartments_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_before_1945)}), remaining_share_before_1945), 0); + nuo_detached_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_before_1945)}), remaining_share_before_1945), 0); + nuo_semi_detached_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_before_1945)}), remaining_share_before_1945), 0); + nuo_terraced_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_before_1945)}), remaining_share_before_1945), 0); + nuo_apartments_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1945_1964)}), remaining_share_1945_1964), 0); + nuo_detached_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1945_1964)}), remaining_share_1945_1964), 0); + nuo_semi_detached_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1945_1964)}), remaining_share_1945_1964), 0); + nuo_terraced_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1945_1964)}), remaining_share_1945_1964), 0); + nuo_apartments_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1965_1984)}), remaining_share_1965_1984), 0); + nuo_detached_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1965_1984)}), remaining_share_1965_1984), 0); + nuo_semi_detached_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1965_1984)}), remaining_share_1965_1984), 0); + nuo_terraced_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1965_1984)}), remaining_share_1965_1984), 0); + nuo_apartments_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1985_2004)}), remaining_share_1985_2004), 0); + nuo_detached_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1985_2004)}), remaining_share_1985_2004), 0); + nuo_semi_detached_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1985_2004)}), remaining_share_1985_2004), 0); + nuo_terraced_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1985_2004)}), remaining_share_1985_2004), 0); + nuo_apartments_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_2005_present)}), remaining_share_2005_present), 0); + nuo_detached_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_2005_present)}), remaining_share_2005_present), 0); + nuo_semi_detached_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_2005_present)}), remaining_share_2005_present), 0); + nuo_terraced_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_2005_present)}), remaining_share_2005_present), 0); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, remaining_share_before_1945), + UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, remaining_share_1945_1964), + UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, remaining_share_1965_1984), + UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, remaining_share_1985_2004), + UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, remaining_share_2005_present), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, nuo_apartments_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, nuo_detached_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, nuo_semi_detached_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, nuo_terraced_before_1945), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, nuo_apartments_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, nuo_detached_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, nuo_semi_detached_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, nuo_terraced_1945_1964), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, nuo_apartments_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, nuo_detached_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, nuo_semi_detached_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, nuo_terraced_1965_1984), + UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, nuo_apartments_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, nuo_detached_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, nuo_semi_detached_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, nuo_terraced_1985_2004), + UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, nuo_apartments_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, nuo_detached_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, nuo_semi_detached_2005_present), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, nuo_terraced_2005_present) + ) +- priority = 3 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad index b8dee08f94..14c406784f 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad @@ -23,21 +23,21 @@ QUERY_PRESENT(->{AREA("present_number_of_#{type}_#{period}")}) }; total_units_present = units_present.sum; - total_demolished = number_of_units_demolished * (INPUT_VALUE("households_demolished_#{period}") / 100); + total_demolished = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE("households_demolished_#{period}"),100)); building_types.each_with_index.flat_map{|type, index| node_key = "households_useful_demand_for_space_heating_#{type}_#{period}"; present_units = units_present[index]; - future_units = present_units - ((present_units / total_units_present) * total_demolished); + future_units = ROUND(present_units - PRODUCT(DIVIDE(present_units, total_units_present), total_demolished), 0); present_heat = QUERY_PRESENT(->{V(node_key, preset_demand)}); [ - UPDATE(V(node_key), preset_demand, present_heat * (future_units / present_units)), + UPDATE(V(node_key), preset_demand, PRODUCT(present_heat, DIVIDE(future_units, present_units))), UPDATE(V(node_key), number_of_units, future_units) ] } } ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_residences) - min_value = 0.0 - start_value = 0.0 diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad index a0fc607194..2916574c41 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad @@ -76,7 +76,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, total_heat_demand_terraced_new), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, number_new_terraced), ) -- priority = 2 +- priority = 3 - max_value_gql = present:AREA(present_number_of_residences) - min_value = 0.0 - start_value = 0.0 From cd852409ea409f1cd6ae82384c9780f531e52d56 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Mon, 10 Aug 2026 16:23:34 +0200 Subject: [PATCH 14/28] Updated descriptions --- .../households_heating_behaviour.ad | 7 ++++ .../households_insulation_1945_1964.ad | 7 +++- .../households_insulation_1965_1984.ad | 7 +++- .../households_insulation_1985_2004.ad | 6 ++++ .../households_insulation_2005_present.ad | 6 ++++ .../households_insulation_before_1945.ad | 6 ++++ .../households_insulation_new_houses.ad | 10 ++++-- .../households_demolished_1945_1964.ad | 6 ++++ .../households_demolished_1965_1984.ad | 6 ++++ .../households_demolished_1985_2004.ad | 6 ++++ .../households_demolished_2005_present.ad | 6 ++++ .../households_demolished_before_1945.ad | 6 ++++ .../households_share_of_apartments.ad | 6 ++++ .../households_share_of_detached.ad | 6 ++++ .../households_share_of_semi_detached.ad | 6 ++++ .../households_share_of_terraced.ad | 6 ++++ ...lds_number_of_residences_demolished_v1.ad} | 30 ++++++++--------- ...olds_number_of_residences_demolished_v2.ad | 16 ++++++++++ ...lds_number_of_residences_demolished_v2a.ad | 16 ++++++++++ ...olds_number_of_residences_demolished_v3.ad | 16 ++++++++++ .../households_number_of_residences_new.ad | 32 +++++++++---------- 21 files changed, 177 insertions(+), 36 deletions(-) rename inputs/demand/households/households_number/households_total_numbers/{households_number_of_residences_demolished.ad => households_number_of_residences_demolished_v1.ad} (95%) diff --git a/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad b/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad index 0b5de4ce1f..bd7039a0dc 100644 --- a/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad +++ b/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad @@ -5,6 +5,13 @@ # is already calculated in other sliders. It can therefore update with factor, instead of calculating # everything here. +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature + # Every building type / construction period has to be updated individually. They are sorted by period. - query = diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad index 61e8e1a765..51d277b6eb 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -7,11 +7,16 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature # The priority of this input is lower than the demolition of houses from this construction period. # In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. - - query = insulation_relative_change = (100 + USER_INPUT())/100; diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad index 0cc23844d2..30b09303cd 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -7,11 +7,16 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature # The priority of this input is lower than the demolition of houses from this construction period. # In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. - - query = insulation_relative_change = (100 + USER_INPUT())/100; diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad index f08d8bec2b..36d3af023c 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -7,6 +7,12 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature # The priority of this input is lower than the demolition of houses from this construction period. # In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad index 656bbab067..edea33cf7a 100644 --- a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -7,6 +7,12 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature # The priority of this input is lower than the demolition of houses from this construction period. # In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad index 0acd155964..4b913a87c5 100644 --- a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -7,6 +7,12 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature # The priority of this input is lower than the demolition of houses from this construction period. # In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. diff --git a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad index 2cf0f9eeb7..d4d4dc7760 100644 --- a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad +++ b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad @@ -7,8 +7,14 @@ # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # -# The priority of this input is lower thant the number of of new residences and the distribution amongst building types. -# In these sliders the total demand is calulated before insulation. +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature +# The priority of this input is lower than the demolition of houses from this construction period. +# In these sliders the total demand is calculated before insulation. # Therefore it works to simply multiply by the relative change due to insulation here. diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad index 8a9b3e2bbe..3f6dfe073b 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad @@ -1,5 +1,11 @@ # This input slider keeps only the share value itself. The actual number-of-units and # demand updates happen centrally in number_of_residences_demolished.ad. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_demolished diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad index 8a9b3e2bbe..3f6dfe073b 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad @@ -1,5 +1,11 @@ # This input slider keeps only the share value itself. The actual number-of-units and # demand updates happen centrally in number_of_residences_demolished.ad. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_demolished diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad index 8a9b3e2bbe..3f6dfe073b 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad @@ -1,5 +1,11 @@ # This input slider keeps only the share value itself. The actual number-of-units and # demand updates happen centrally in number_of_residences_demolished.ad. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_demolished diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad index 8a9b3e2bbe..3f6dfe073b 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad @@ -1,5 +1,11 @@ # This input slider keeps only the share value itself. The actual number-of-units and # demand updates happen centrally in number_of_residences_demolished.ad. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_demolished diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad index 8a9b3e2bbe..3f6dfe073b 100644 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad +++ b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad @@ -1,5 +1,11 @@ # This input slider keeps only the share value itself. The actual number-of-units and # demand updates happen centrally in number_of_residences_demolished.ad. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_demolished diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad index 59cba9b7d2..cfac37c298 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad @@ -1,6 +1,12 @@ # This input lets you decide what part of the new buildings will be apartments. # The total number of new buildings is set in total_number_of_residences_new.ad # The start value is based on the share of apartments in the exisiting building stock. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_new_residences diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad index ce722959a4..66fe091079 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad @@ -1,6 +1,12 @@ # This input lets you decide what part of the new buildings will be detached houses. # The total number of new buildings is set in total_number_of_residences_new.ad # The start value is based on the share of detached houses in the exisiting building stock. +# Related priorities are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_new_residences diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad index 2260cf0bc5..361781729d 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad @@ -1,6 +1,12 @@ # This input lets you decide what part of the new buildings will be semi detached houses. # The total number of new buildings is set in total_number_of_residences_new.ad # The start value is based on the share of semi detached houses in the exisiting building stock. +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_new_residences diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad index 378c9883cc..02c9adea1d 100644 --- a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad +++ b/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad @@ -1,6 +1,12 @@ # This input lets you decide what part of the new buildings will be terraced houses. # The total number of new buildings is set in total_number_of_residences_new.ad # The start value is based on the share of terraced houses in the exisiting building stock. +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = UPDATE() - share_group = households_new_residences diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad similarity index 95% rename from inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad rename to inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad index 955ac73796..7ec773b428 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad @@ -1,18 +1,18 @@ -# v2 - This is number_of_residences_demolished.ad, extended so that the per-building-type -# and per-construction-period demolition breakdown (previously split across the -# households_demolished_[period].ad files) is always applied. -# -# Reason: each households_demolished_[period].ad file's own EACH(UPDATE(...)) only ran -# when that specific slider was manually touched. Setting only this slider (the total -# number of residences demolished) never triggered them, so the per-period 20% defaults -# were silently skipped. This version reads each period's share via -# INPUT_VALUE(households_demolished_[period]_v2) - which resolves to the user value or -# the 20% start_value regardless of whether that slider was touched - and performs the -# breakdown and updates directly here, in a file that is guaranteed to run whenever this -# slider has a value. -# -# The households_demolished_[period].ad files are now pure share sliders with no -# side effects of their own (see those files for details). +# In this input, the number of demolished households is set. +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated purely based on the new total number of households. +# Once the number of demolished households is set the demolished buildigns are +# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). +# This is done based on the slider settings in households_demolished_share_per_construction_period +# and the current share of buildings per type in each construction period. +# Finally the total number of units and useful heat demand are updated for all 20 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad index 36db07b13c..d69d060ccc 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad @@ -1,3 +1,19 @@ +# In this input, the number of demolished households is set. +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated purely based on the new total number of households. +# Once the number of demolished households is set the demolished buildigns are +# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). +# This is done based on the slider settings in households_demolished_share_per_construction_period +# and the current share of buildings per type in each construction period. +# Finally the total number of units and useful heat demand are updated for all 20 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature + - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); number_of_units_demolished = USER_INPUT(); diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad index a1627aa487..103e1cc8a5 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad @@ -1,3 +1,19 @@ +# In this input, the number of demolished households is set. +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated purely based on the new total number of households. +# Once the number of demolished households is set the demolished buildigns are +# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). +# This is done based on the slider settings in households_demolished_share_per_construction_period +# and the current share of buildings per type in each construction period. +# Finally the total number of units and useful heat demand are updated for all 20 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature + - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); number_of_units_demolished = USER_INPUT(); diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad index 14c406784f..cc091cd0f6 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad @@ -1,3 +1,19 @@ +# In this input, the number of demolished households is set. +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated purely based on the new total number of households. +# Once the number of demolished households is set the demolished buildigns are +# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). +# This is done based on the slider settings in households_demolished_share_per_construction_period +# and the current share of buildings per type in each construction period. +# Finally the total number of units and useful heat demand are updated for all 20 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature + - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); number_of_units_demolished = USER_INPUT(); diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad index 2916574c41..b1677f745e 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad @@ -1,23 +1,21 @@ -# v2 - This is number_of_residences_new.ad, extended so that the per-building-type -# breakdown of new construction (previously split across the -# households_share_of_[type].ad files) is always applied. -# -# Reason: each households_share_of_[type].ad file's own EACH(UPDATE(...)) only ran when -# that specific slider was manually touched. Setting only this slider (the total number -# of new residences) never triggered them, so the per-type 25% defaults were silently -# skipped. This version reads each type's share via -# INPUT_VALUE(households_share_of_[type]_v2) - which resolves to the user value or the -# 25% start_value regardless of whether that slider was touched - and performs the -# breakdown and updates directly here, in a file that is guaranteed to run whenever this -# slider has a value. -# -# The households_share_of_[type]_v2.ad files are now pure share sliders with no side -# effects of their own (see those files for details). -### The update of insulation costs can potentially be deleted and only added in the insulation inputs +# In this input, the number of new households is set. +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated purely based on the new total number of households. +# Once the number of new households is set the new buildigns are +# divided amongst the 4 buildings types. +# This is done based on the slider settings in households_new_buildings_share_per_type +# Finally the total number of units and useful heat demand are updated for all 4 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new buildings & shares of buildings demolished +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = INPUT_VALUE(households_number_of_residences_demolished); + number_of_units_demolished = INPUT_VALUE(households_number_of_residences_demolished_v2a); number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; number_of_new_units_future = USER_INPUT(); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; From 6682d9a8ebf6ece359c099fdf646d2d32b4bc876 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Tue, 11 Aug 2026 17:12:08 +0200 Subject: [PATCH 15/28] Changed inputs for demolished to absolute numbers Also deleted the old input keys --- .../number_of_demolished_residences.gql | 8 + .../households_share_of_apartments.gql | 2 +- .../households_share_of_detached.gql | 2 +- .../households_share_of_semi_detached.gql | 2 +- .../households_share_of_terraced.gql | 2 +- ...s_insulation_level_apartments_1945_1964.ad | 31 -- ...s_insulation_level_apartments_1965_1984.ad | 31 -- ...s_insulation_level_apartments_1985_2004.ad | 31 -- ...nsulation_level_apartments_2005_present.ad | 31 -- ...insulation_level_apartments_before_1945.ad | 31 -- ...olds_insulation_level_apartments_future.ad | 27 -- ...ulation_level_detached_houses_1945_1964.ad | 31 -- ...ulation_level_detached_houses_1965_1984.ad | 31 -- ...ulation_level_detached_houses_1985_2004.ad | 31 -- ...tion_level_detached_houses_2005_present.ad | 31 -- ...ation_level_detached_houses_before_1945.ad | 31 -- ...insulation_level_detached_houses_future.ad | 27 -- ...on_level_semi_detached_houses_1945_1964.ad | 31 -- ...on_level_semi_detached_houses_1965_1984.ad | 31 -- ...on_level_semi_detached_houses_1985_2004.ad | 31 -- ...level_semi_detached_houses_2005_present.ad | 31 -- ..._level_semi_detached_houses_before_1945.ad | 31 -- ...ation_level_semi_detached_houses_future.ad | 27 -- ...ulation_level_terraced_houses_1945_1964.ad | 31 -- ...ulation_level_terraced_houses_1965_1984.ad | 31 -- ...ulation_level_terraced_houses_1985_2004.ad | 31 -- ...tion_level_terraced_houses_2005_present.ad | 31 -- ...ation_level_terraced_houses_before_1945.ad | 31 -- ...insulation_level_terraced_houses_future.ad | 27 -- ...useholds_number_of_apartments_1945_1964.ad | 71 ----- ...useholds_number_of_apartments_1965_1984.ad | 71 ----- ...useholds_number_of_apartments_1985_2004.ad | 71 ----- ...holds_number_of_apartments_2005_present.ad | 71 ----- ...eholds_number_of_apartments_before_1945.ad | 71 ----- .../households_number_of_apartments_future.ad | 67 ----- ...lds_number_of_detached_houses_1945_1964.ad | 71 ----- ...lds_number_of_detached_houses_1965_1984.ad | 71 ----- ...lds_number_of_detached_houses_1985_2004.ad | 71 ----- ..._number_of_detached_houses_2005_present.ad | 71 ----- ...s_number_of_detached_houses_before_1945.ad | 71 ----- ...eholds_number_of_detached_houses_future.ad | 67 ----- .../households_number_of_inhabitants.ad | 26 -- ...umber_of_semi_detached_houses_1945_1964.ad | 71 ----- ...umber_of_semi_detached_houses_1965_1984.ad | 71 ----- ...umber_of_semi_detached_houses_1985_2004.ad | 71 ----- ...er_of_semi_detached_houses_2005_present.ad | 71 ----- ...ber_of_semi_detached_houses_before_1945.ad | 71 ----- ...s_number_of_semi_detached_houses_future.ad | 67 ----- ...lds_number_of_terraced_houses_1945_1964.ad | 71 ----- ...lds_number_of_terraced_houses_1965_1984.ad | 71 ----- ...lds_number_of_terraced_houses_1985_2004.ad | 71 ----- ..._number_of_terraced_houses_2005_present.ad | 71 ----- ...s_number_of_terraced_houses_before_1945.ad | 71 ----- ...eholds_number_of_terraced_houses_future.ad | 67 ----- .../households_demolished_1945_1964.ad | 45 +++ .../households_demolished_1965_1984.ad | 45 +++ .../households_demolished_1985_2004.ad | 45 +++ .../households_demolished_2005_present.ad | 45 +++ .../households_demolished_before_1945.ad | 45 +++ .../households_demolished_1945_1964.ad | 18 -- .../households_demolished_1965_1984.ad | 18 -- .../households_demolished_1985_2004.ad | 18 -- .../households_demolished_2005_present.ad | 18 -- .../households_demolished_before_1945.ad | 18 -- .../households_share_of_apartments.ad | 0 .../households_share_of_detached.ad | 0 .../households_share_of_semi_detached.ad | 0 .../households_share_of_terraced.ad | 0 .../households_number_of_residences_new.ad | 8 +- ...olds_number_of_residences_demolished_v1.ad | 276 ------------------ ...olds_number_of_residences_demolished_v2.ad | 75 ----- ...lds_number_of_residences_demolished_v2a.ad | 108 ------- ...olds_number_of_residences_demolished_v3.ad | 62 ---- 73 files changed, 241 insertions(+), 3061 deletions(-) create mode 100644 gqueries/general/number_of_units/number_of_demolished_residences.gql delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad delete mode 100644 inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad create mode 100644 inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad create mode 100644 inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad create mode 100644 inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad create mode 100644 inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad create mode 100644 inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad delete mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad delete mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad delete mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad delete mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad delete mode 100644 inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad rename inputs/demand/households/households_number/{households_new_buildings_share_per_type => households_new_residences_share_per_type}/households_share_of_apartments.ad (100%) rename inputs/demand/households/households_number/{households_new_buildings_share_per_type => households_new_residences_share_per_type}/households_share_of_detached.ad (100%) rename inputs/demand/households/households_number/{households_new_buildings_share_per_type => households_new_residences_share_per_type}/households_share_of_semi_detached.ad (100%) rename inputs/demand/households/households_number/{households_new_buildings_share_per_type => households_new_residences_share_per_type}/households_share_of_terraced.ad (100%) rename inputs/demand/households/households_number/{households_total_numbers => households_new_residences_total}/households_number_of_residences_new.ad (92%) delete mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad delete mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad delete mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad delete mode 100644 inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad diff --git a/gqueries/general/number_of_units/number_of_demolished_residences.gql b/gqueries/general/number_of_units/number_of_demolished_residences.gql new file mode 100644 index 0000000000..b0fa38e258 --- /dev/null +++ b/gqueries/general/number_of_units/number_of_demolished_residences.gql @@ -0,0 +1,8 @@ +- query = + SUM( + INPUT_VALUE(households_demolished_before_1945), + INPUT_VALUE(households_demolished_1945_1964), + INPUT_VALUE(households_demolished_1965_1984), + INPUT_VALUE(households_demolished_1985_2004), + INPUT_VALUE(households_demolished_2005_present)) +- unit = # diff --git a/gqueries/input_elements/start_value/households_share_of_apartments.gql b/gqueries/input_elements/start_value/households_share_of_apartments.gql index 17d9a2052f..dfd175691f 100644 --- a/gqueries/input_elements/start_value/households_share_of_apartments.gql +++ b/gqueries/input_elements/start_value/households_share_of_apartments.gql @@ -1,2 +1,2 @@ -- query = ROUND(PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)),100),1) +- query = PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)),100) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_detached.gql b/gqueries/input_elements/start_value/households_share_of_detached.gql index 0c5a4679ca..5c22a8a4cd 100644 --- a/gqueries/input_elements/start_value/households_share_of_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_detached.gql @@ -1,2 +1,2 @@ -- query = ROUND(PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)),100),1) +- query = PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)),100) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql index 4782bda430..57efc431d4 100644 --- a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql @@ -1,2 +1,2 @@ -- query = ROUND(PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)),100),1) +- query = PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)),100) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_terraced.gql b/gqueries/input_elements/start_value/households_share_of_terraced.gql index a34e1f9dcd..52e1eb6730 100644 --- a/gqueries/input_elements/start_value/households_share_of_terraced.gql +++ b/gqueries/input_elements/start_value/households_share_of_terraced.gql @@ -1,2 +1,2 @@ -- query = ROUND(PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)),100),1) +- query = PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)),100) - unit = factor diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad deleted file mode 100644 index 1915bc3424..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1945_1964.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1945_1964) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1945_1964) }); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_1945_1964); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1945_1964, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_1945_1964, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1945_1964)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_1945_1964),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_1945_1964),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_1945_1964) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad deleted file mode 100644 index b2f1999d1c..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1965_1984.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1965_1984) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1965_1984) }); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_1965_1984); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1965_1984, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_1965_1984, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1965_1984)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_1965_1984),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_1965_1984),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_1965_1984) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad deleted file mode 100644 index 19d352fc7d..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_1985_2004.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1985_2004) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1985_2004) }); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_1985_2004); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1985_2004, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_1985_2004, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1985_2004)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_1985_2004),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_1985_2004),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_1985_2004) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad deleted file mode 100644 index 953c96fb46..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_2005_present.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_2005_present) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_2005_present) }); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_2005_present); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_2005_present, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_2005_present, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_2005_present)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_2005_present),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_2005_present),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_2005_present) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad deleted file mode 100644 index 438c23b266..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_before_1945.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_before_1945) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_before_1945) }); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_before_1945); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_before_1945, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_before_1945, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_before_1945)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_before_1945),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_before_1945),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_before_1945) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad deleted file mode 100644 index d3843f04d3..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_apartments_future.ad +++ /dev/null @@ -1,27 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the insulation value -# - updates the insulation costs -# Typical surface area per buildings is based on nl2019 value for apartments from 2005 to present - -- query = - insulation_value_future = USER_INPUT(); - number_of_units_future = INPUT_VALUE(households_number_of_apartments_future); - typical_surface_area_per_unit = 84.0916691776263; - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_apartments_future, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_future)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_apartments_future),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_apartments_future),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_apartments_future) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad deleted file mode 100644 index be21d381c6..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1945_1964.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1945_1964) }); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_1945_1964); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1945_1964, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_1945_1964, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1945_1964)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad deleted file mode 100644 index da684d2ac4..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1965_1984.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1965_1984) }); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_1965_1984); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1965_1984, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_1965_1984, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1965_1984)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad deleted file mode 100644 index 2c1a3db895..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_1985_2004.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1985_2004) }); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_1985_2004); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1985_2004, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_1985_2004, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1985_2004)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad deleted file mode 100644 index 2bb5114a89..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_2005_present.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_2005_present) }); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_2005_present); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_2005_present, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_2005_present, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_2005_present)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad deleted file mode 100644 index ca0b61241b..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_before_1945.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_before_1945) }); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_before_1945); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_before_1945, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_before_1945, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_before_1945)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad deleted file mode 100644 index aa1d2d0950..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_detached_houses_future.ad +++ /dev/null @@ -1,27 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the insulation value -# - updates the insulation costs -# Typical surface area per buildings is based on nl2019 value for detached houses from 2005 to present - -- query = - insulation_value_future = USER_INPUT(); - number_of_units_future = INPUT_VALUE(households_number_of_detached_houses_future); - typical_surface_area_per_unit = 224.001485938283; - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_detached_houses_future, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_future)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_detached_houses_future),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_detached_houses_future),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_detached_houses_future) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad deleted file mode 100644 index 4640e0a07c..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1945_1964.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1945_1964) }); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1945_1964)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad deleted file mode 100644 index 6f6b4a8b32..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1965_1984.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1965_1984) }); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1965_1984)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad deleted file mode 100644 index b5a376219f..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_1985_2004.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1985_2004) }); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1985_2004)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad deleted file mode 100644 index 3d4e3868e7..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_2005_present.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_2005_present) }); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_2005_present); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_2005_present, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_2005_present)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad deleted file mode 100644 index cb5620013f..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_before_1945.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_before_1945) }); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_before_1945); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_before_1945, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_before_1945)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad deleted file mode 100644 index f61e21252f..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_semi_detached_houses_future.ad +++ /dev/null @@ -1,27 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the insulation value -# - updates the insulation costs -# Typical surface area per buildings is based on nl2019 value for semi detached houses from 2005 to present - -- query = - insulation_value_future = USER_INPUT(); - number_of_units_future = INPUT_VALUE(households_number_of_semi_detached_houses_future); - typical_surface_area_per_unit = 147.709471392282; - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_semi_detached_houses_future, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_future)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad deleted file mode 100644 index 52def98014..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1945_1964.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1945_1964) }); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_1945_1964); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1945_1964, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1945_1964, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1945_1964)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad deleted file mode 100644 index 5ebe7337d1..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1965_1984.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1965_1984) }); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_1965_1984); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1965_1984, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1965_1984, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1965_1984)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad deleted file mode 100644 index 0ccc6b2297..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_1985_2004.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1985_2004) }); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_1985_2004); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1985_2004, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_1985_2004, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1985_2004)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad deleted file mode 100644 index fc9c776d2f..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_2005_present.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_2005_present) }); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_2005_present); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_2005_present, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_2005_present, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_2005_present)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad deleted file mode 100644 index 03eaf21214..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_before_1945.ad +++ /dev/null @@ -1,31 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the insulation value -# - updates the insulation costs - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945) }); - insulation_value_future = USER_INPUT(); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_before_1945) }); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_before_1945); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_before_1945, preset_demand)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_before_1945, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_before_1945)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad b/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad deleted file mode 100644 index 6320c8591b..0000000000 --- a/inputs/demand/households/households_insulation/OLD_SLIDERS/households_insulation_level_terraced_houses_future.ad +++ /dev/null @@ -1,27 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the insulation value -# - updates the insulation costs -# Typical surface area per buildings is based on nl2019 value for terraced houses from 2005 to present - -- query = - insulation_value_future = USER_INPUT(); - number_of_units_future = INPUT_VALUE(households_number_of_terraced_houses_future); - typical_surface_area_per_unit = 130.419159051538; - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(AREA(), typical_useful_demand_for_space_heating_terraced_houses_future, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_future)})) - ) -- priority = 1 -- max_value_gql = present:MAX(AREA(typical_useful_demand_for_space_heating_terraced_houses_future),500.0) -- min_value_gql = present:MIN(AREA(typical_useful_demand_for_space_heating_terraced_houses_future),1.0) -- start_value_gql = present:AREA(typical_useful_demand_for_space_heating_terraced_houses_future) -- step_value = 0.1 -- unit = kWh/m2 -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad deleted file mode 100644 index 06d4b94cca..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1945_1964.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of apartments_1945_1964 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1945_1964) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_1945_1964); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1945_1964) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - USER_INPUT() + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1945_1964, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1945_1964)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_apartments_1945_1964) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_apartments_1945_1964) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad deleted file mode 100644 index 8e5140d7d9..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1965_1984.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of apartments_1965_1984 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1965_1984) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_1965_1984); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1965_1984) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - USER_INPUT() + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1965_1984, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1965_1984)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_apartments_1965_1984) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_apartments_1965_1984) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad deleted file mode 100644 index e1b064202c..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_1985_2004.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of apartments_1985_2004 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_1985_2004) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_1985_2004); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_1985_2004) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - USER_INPUT() + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1985_2004, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1985_2004)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_apartments_1985_2004) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_apartments_1985_2004) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad deleted file mode 100644 index 858ea284c5..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_2005_present.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of apartments_2005_present -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_2005_present) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_2005_present); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_2005_present) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - USER_INPUT() + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_2005_present, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_2005_present)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_apartments_2005_present) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_apartments_2005_present) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad deleted file mode 100644 index b5d45df19c..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_before_1945.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of apartments_before_1945 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_apartments_before_1945) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_before_1945); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_apartments_before_1945) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - USER_INPUT() + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_before_1945, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_before_1945)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_apartments_before_1945) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_apartments_before_1945) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad deleted file mode 100644 index af9db9e35a..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_apartments_future.ad +++ /dev/null @@ -1,67 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the number of apartments_future -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential -# Typical surface area per buildings is based on nl2019 value for apartments from 2005 to present - -- query = - insulation_value_future = INPUT_VALUE(households_insulation_level_apartments_future); - number_of_units_future = USER_INPUT(); - typical_surface_area_per_unit = 84.0916691776263; - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_future)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad deleted file mode 100644 index 69a5f76317..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1945_1964.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of detached_houses_1945_1964 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1945_1964) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_1945_1964); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1945_1964) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1945_1964, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1945_1964)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_detached_houses_1945_1964) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_detached_houses_1945_1964) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad deleted file mode 100644 index c4abb3d540..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1965_1984.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of detached_houses_1965_1984 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1965_1984) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_1965_1984); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1965_1984) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1965_1984, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1965_1984)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_detached_houses_1965_1984) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_detached_houses_1965_1984) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad deleted file mode 100644 index f9e5d8775a..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_1985_2004.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of detached_houses_1985_2004 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_1985_2004) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_1985_2004); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_1985_2004) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1985_2004, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1985_2004)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_detached_houses_1985_2004) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_detached_houses_1985_2004) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad deleted file mode 100644 index 5b7505ac04..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_2005_present.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of detached_houses_2005_present -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_2005_present) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_2005_present); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_2005_present) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_2005_present, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_2005_present)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_detached_houses_2005_present) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_detached_houses_2005_present) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad deleted file mode 100644 index 22d1fd7f8d..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_before_1945.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of detached_houses_before_1945 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_before_1945) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_before_1945); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_detached_houses_before_1945) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - USER_INPUT() + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_before_1945, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_before_1945)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_detached_houses_before_1945) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_detached_houses_before_1945) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad deleted file mode 100644 index aa710c1519..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_detached_houses_future.ad +++ /dev/null @@ -1,67 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the number of detached_houses_future -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential -# Typical surface area per buildings is based on nl2019 value for detached houses from 2005 to present - -- query = - insulation_value_future = INPUT_VALUE(households_insulation_level_detached_houses_future); - number_of_units_future = USER_INPUT(); - typical_surface_area_per_unit = 224.001485938283; - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_future)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad deleted file mode 100644 index 28e6f379b1..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_inhabitants.ad +++ /dev/null @@ -1,26 +0,0 @@ -- query = - EACH( - UPDATE(AREA(), number_of_inhabitants, USER_INPUT() * MILLIONS), - UPDATE_WITH_FACTOR( - V(households_useful_demand_light, - households_useful_demand_cooking_useable_heat, - households_appliances_dishwasher_electricity, - households_appliances_fridge_freezer_electricity, - households_appliances_vacuum_cleaner_electricity, - households_appliances_washing_machine_electricity, - households_appliances_clothes_dryer_electricity, - households_appliances_television_electricity, - households_appliances_computer_media_electricity, - households_appliances_other_electricity, - households_useful_demand_hot_water - ), preset_demand, USER_INPUT() * MILLIONS / QUERY_PRESENT(-> { AREA(number_of_inhabitants) }) - ) - ) -- priority = 0 -- max_value_gql = present:AREA(number_of_inhabitants) / MILLIONS * 2 -- min_value_gql = present:AREA(number_of_inhabitants) / MILLIONS * 0.5 -- start_value_gql = present:AREA(number_of_inhabitants) / MILLIONS -- step_value = 0.1 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad deleted file mode 100644 index f0e2537565..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1945_1964.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of semi_detached_houses_1945_1964 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_1945_1964); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1945_1964) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1945_1964)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_semi_detached_houses_1945_1964) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_semi_detached_houses_1945_1964) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad deleted file mode 100644 index 6fbd47da6e..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1965_1984.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of semi_detached_houses_1965_1984 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_1965_1984); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1965_1984) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1965_1984)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_semi_detached_houses_1965_1984) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_semi_detached_houses_1965_1984) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad deleted file mode 100644 index aa31ac7c34..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_1985_2004.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of semi_detached_houses_1985_2004 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_1985_2004); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_1985_2004) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1985_2004)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_semi_detached_houses_1985_2004) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_semi_detached_houses_1985_2004) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad deleted file mode 100644 index cc7edce138..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_2005_present.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of semi_detached_houses_2005_present -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_2005_present) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_2005_present); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_2005_present) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_2005_present)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_semi_detached_houses_2005_present) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_semi_detached_houses_2005_present) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad deleted file mode 100644 index 7465347777..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_before_1945.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of semi_detached_houses_before_1945 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_before_1945) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_before_1945); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_semi_detached_houses_before_1945) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - USER_INPUT() + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_before_1945)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_semi_detached_houses_before_1945) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_semi_detached_houses_before_1945) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad deleted file mode 100644 index 2e01e4e102..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_semi_detached_houses_future.ad +++ /dev/null @@ -1,67 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the number of semi_detached_houses_future -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential -# Typical surface area per buildings is based on nl2019 value for semi detached houses from 2005 to present - -- query = - insulation_value_future = INPUT_VALUE(households_insulation_level_semi_detached_houses_future); - number_of_units_future = USER_INPUT(); - typical_surface_area_per_unit = 147.709471392282; - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_future)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad deleted file mode 100644 index bb62e269bc..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1945_1964.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of terraced_houses_1945_1964 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1945_1964) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_1945_1964); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1945_1964) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1945_1964, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1945_1964)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_terraced_houses_1945_1964) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_terraced_houses_1945_1964) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad deleted file mode 100644 index 5e9f1a4fd8..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1965_1984.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of terraced_houses_1965_1984 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1965_1984) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_1965_1984); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1965_1984) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1965_1984, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1965_1984)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_terraced_houses_1965_1984) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_terraced_houses_1965_1984) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad deleted file mode 100644 index cf384adfb5..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_1985_2004.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of terraced_houses_1985_2004 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_1985_2004) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_1985_2004); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_1985_2004) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1985_2004, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1985_2004)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_terraced_houses_1985_2004) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_terraced_houses_1985_2004) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad deleted file mode 100644 index c426069682..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_2005_present.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of terraced_houses_2005_present -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_2005_present) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_2005_present); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_2005_present) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_2005_present, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_2005_present)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_terraced_houses_2005_present) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_terraced_houses_2005_present) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad deleted file mode 100644 index 8708ec0bb3..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_before_1945.ad +++ /dev/null @@ -1,71 +0,0 @@ -# This input: -# - calculates the relative decrease in demand through insulation -# - calculates the relative decrease in demand through demolition -# - updates the demand using the combined relative change in demand -# - updates the number of terraced_houses_before_1945 -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential - -- query = - insulation_value_present = QUERY_PRESENT(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_before_1945) }); - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_before_1945); - insulation_relative_change = DIVIDE(insulation_value_future,insulation_value_present); - - number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_terraced_houses_before_1945) }); - number_of_units_future = USER_INPUT(); - number_of_units_relative_change = DIVIDE(number_of_units_future,number_of_units_present); - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - USER_INPUT() + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - INPUT_VALUE(households_number_of_terraced_houses_future); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_relative_change * number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_before_1945, preset_demand)}); - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_before_1945)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_terraced_houses_before_1945) -- min_value = 0.0 -- start_value_gql = present:AREA(present_number_of_terraced_houses_before_1945) -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad b/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad deleted file mode 100644 index ed53c30307..0000000000 --- a/inputs/demand/households/households_number/OLD_SLIDERS/households_number_of_terraced_houses_future.ad +++ /dev/null @@ -1,67 +0,0 @@ -# This input: -# - calculates the total future demand through changes in insulation and construction -# - updates the demand using the total future demand -# - updates the number of terraced_houses_future -# - updates the insulation costs -# - updates the number of units of P2P based on the total number of residences -# - updates the number of residences for hot water demand -# - the roof surface available for solar PV on houses based on the changed total number of residences -# - the total useful demand for cooling based on the changed total number of residences -# - the electricity production of households solar PV, because user sets a share of the potential -# Typical surface area per buildings is based on nl2019 value for terraced houses from 2005 to present - -- query = - insulation_value_future = INPUT_VALUE(households_insulation_level_terraced_houses_future); - number_of_units_future = USER_INPUT(); - typical_surface_area_per_unit = 130.419159051538; - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - total_number_of_units_future = - INPUT_VALUE(households_number_of_apartments_before_1945) + - INPUT_VALUE(households_number_of_apartments_1945_1964) + - INPUT_VALUE(households_number_of_apartments_1965_1984) + - INPUT_VALUE(households_number_of_apartments_1985_2004) + - INPUT_VALUE(households_number_of_apartments_2005_present) + - INPUT_VALUE(households_number_of_apartments_future) + - INPUT_VALUE(households_number_of_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_detached_houses_future) + - INPUT_VALUE(households_number_of_semi_detached_houses_before_1945) + - INPUT_VALUE(households_number_of_semi_detached_houses_1945_1964) + - INPUT_VALUE(households_number_of_semi_detached_houses_1965_1984) + - INPUT_VALUE(households_number_of_semi_detached_houses_1985_2004) + - INPUT_VALUE(households_number_of_semi_detached_houses_2005_present) + - INPUT_VALUE(households_number_of_semi_detached_houses_future) + - INPUT_VALUE(households_number_of_terraced_houses_before_1945) + - INPUT_VALUE(households_number_of_terraced_houses_1945_1964) + - INPUT_VALUE(households_number_of_terraced_houses_1965_1984) + - INPUT_VALUE(households_number_of_terraced_houses_1985_2004) + - INPUT_VALUE(households_number_of_terraced_houses_2005_present) + - USER_INPUT(); - total_number_of_units_relative_change = DIVIDE(total_number_of_units_future,total_number_of_units_present); - - useful_heat_demand_future = insulation_value_future * number_of_units_future * typical_surface_area_per_unit * MJ_PER_KWH; - useful_cooling_demand_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - roof_surface_for_pv_future = total_number_of_units_relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, useful_heat_demand_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, USER_INPUT()), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_future)})), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) - ) -- priority = 1 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad new file mode 100644 index 0000000000..ec6b950e1f --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad @@ -0,0 +1,45 @@ +# This input slider sets the demolished buildings for one construction peroid. +# It updates the total number of residences, total roof surface for pv, total cooling demand. +# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# Related priorities are set as follows: +# - 4: shares of new buildings +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad + +- query = + total_number_of_residences_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_residences_present_1945_1964 = QUERY_PRESENT(-> {Q(number_of_residences_1945_1964)}); + number_of_residences_demolished_1945_1964 = USER_INPUT(); + number_of_residences_future_1945_1964 = number_of_residences_present_1945_1964 - number_of_residences_demolished_1945_1964; + + number_of_residences_demolished_total = Q(number_of_demolished_residences); + number_of_residences_new = INPUT_VALUE(households_number_of_residences_new); + total_number_of_residences_future = ( + total_number_of_residences_present - + number_of_residences_demolished_total + + number_of_residences_new); + + relative_change_total = DIVIDE(total_number_of_residences_future, total_number_of_residences_present); + relative_change_1945_1964 = DIVIDE(number_of_residences_future_1945_1964, number_of_residences_present_1945_1964); + + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, relative_change_1945_1964), + UPDATE_WITH_FACTOR(V(G(households_1945_1964)), number_of_units, relative_change_1945_1964), + ) +- priority = 3 +- max_value_gql = present:Q(number_of_residences_1945_1964) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad new file mode 100644 index 0000000000..48212949fc --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad @@ -0,0 +1,45 @@ +# This input slider sets the demolished buildings for one construction peroid. +# It updates the total number of residences, total roof surface for pv, total cooling demand. +# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# Related priorities are set as follows: +# - 4: shares of new buildings +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad + +- query = + total_number_of_residences_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_residences_present_1965_1984 = QUERY_PRESENT(-> {Q(number_of_residences_1965_1984)}); + number_of_residences_demolished_1965_1984 = USER_INPUT(); + number_of_residences_future_1965_1984 = number_of_residences_present_1965_1984 - number_of_residences_demolished_1965_1984; + + number_of_residences_demolished_total = Q(number_of_demolished_residences); + number_of_residences_new = INPUT_VALUE(households_number_of_residences_new); + total_number_of_residences_future = ( + total_number_of_residences_present - + number_of_residences_demolished_total + + number_of_residences_new); + + relative_change_total = DIVIDE(total_number_of_residences_future, total_number_of_residences_present); + relative_change_1965_1984 = DIVIDE(number_of_residences_future_1965_1984, number_of_residences_present_1965_1984); + + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, relative_change_1965_1984), + UPDATE_WITH_FACTOR(V(G(households_1965_1984)), number_of_units, relative_change_1965_1984), + ) +- priority = 3 +- max_value_gql = present:Q(number_of_residences_1965_1984) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad new file mode 100644 index 0000000000..b3fbfdb4a6 --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad @@ -0,0 +1,45 @@ +# This input slider sets the demolished buildings for one construction peroid. +# It updates the total number of residences, total roof surface for pv, total cooling demand. +# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# Related priorities are set as follows: +# - 4: shares of new buildings +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad + +- query = + total_number_of_residences_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_residences_present_1985_2004 = QUERY_PRESENT(-> {Q(number_of_residences_1985_2004)}); + number_of_residences_demolished_1985_2004 = USER_INPUT(); + number_of_residences_future_1985_2004 = number_of_residences_present_1985_2004 - number_of_residences_demolished_1985_2004; + + number_of_residences_demolished_total = Q(number_of_demolished_residences); + number_of_residences_new = INPUT_VALUE(households_number_of_residences_new); + total_number_of_residences_future = ( + total_number_of_residences_present - + number_of_residences_demolished_total + + number_of_residences_new); + + relative_change_total = DIVIDE(total_number_of_residences_future, total_number_of_residences_present); + relative_change_1985_2004 = DIVIDE(number_of_residences_future_1985_2004, number_of_residences_present_1985_2004); + + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, relative_change_1985_2004), + UPDATE_WITH_FACTOR(V(G(households_1985_2004)), number_of_units, relative_change_1985_2004), + ) +- priority = 3 +- max_value_gql = present:Q(number_of_residences_1985_2004) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad new file mode 100644 index 0000000000..c835dbafab --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad @@ -0,0 +1,45 @@ +# This input slider sets the demolished buildings for one construction peroid. +# It updates the total number of residences, total roof surface for pv, total cooling demand. +# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# Related priorities are set as follows: +# - 4: shares of new buildings +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad + +- query = + total_number_of_residences_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_residences_present_2005_present = QUERY_PRESENT(-> {Q(number_of_residences_2005_present)}); + number_of_residences_demolished_2005_present = USER_INPUT(); + number_of_residences_future_2005_present = number_of_residences_present_2005_present - number_of_residences_demolished_2005_present; + + number_of_residences_demolished_total = Q(number_of_demolished_residences); + number_of_residences_new = INPUT_VALUE(households_number_of_residences_new); + total_number_of_residences_future = ( + total_number_of_residences_present - + number_of_residences_demolished_total + + number_of_residences_new); + + relative_change_total = DIVIDE(total_number_of_residences_future, total_number_of_residences_present); + relative_change_2005_present = DIVIDE(number_of_residences_future_2005_present, number_of_residences_present_2005_present); + + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, relative_change_2005_present), + UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, relative_change_2005_present), + ) +- priority = 3 +- max_value_gql = present:Q(number_of_residences_2005_present) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad new file mode 100644 index 0000000000..00d01a78af --- /dev/null +++ b/inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad @@ -0,0 +1,45 @@ +# This input slider sets the demolished buildings for one construction peroid. +# It updates the total number of residences, total roof surface for pv, total cooling demand. +# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# Related priorities are set as follows: +# - 4: shares of new buildings +# - 3: number of new buildings & number of buildings demolished +# - 2: setting weather curve +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad + +- query = + total_number_of_residences_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_residences_present_before_1945 = QUERY_PRESENT(-> {Q(number_of_residences_before_1945)}); + number_of_residences_demolished_before_1945 = USER_INPUT(); + number_of_residences_future_before_1945 = number_of_residences_present_before_1945 - number_of_residences_demolished_before_1945; + + number_of_residences_demolished_total = Q(number_of_demolished_residences); + number_of_residences_new = INPUT_VALUE(households_number_of_residences_new); + total_number_of_residences_future = ( + total_number_of_residences_present - + number_of_residences_demolished_total + + number_of_residences_new); + + relative_change_total = DIVIDE(total_number_of_residences_future, total_number_of_residences_present); + relative_change_before_1945 = DIVIDE(number_of_residences_future_before_1945, number_of_residences_present_before_1945); + + roof_surface_for_pv_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change_total, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + + UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, relative_change_before_1945), + UPDATE_WITH_FACTOR(V(G(households_before_1945)), number_of_units, relative_change_before_1945), + ) +- priority = 3 +- max_value_gql = present:Q(number_of_residences_before_1945) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad deleted file mode 100644 index 3f6dfe073b..0000000000 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1945_1964.ad +++ /dev/null @@ -1,18 +0,0 @@ -# This input slider keeps only the share value itself. The actual number-of-units and -# demand updates happen centrally in number_of_residences_demolished.ad. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_demolished -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value = 20.0 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad deleted file mode 100644 index 3f6dfe073b..0000000000 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1965_1984.ad +++ /dev/null @@ -1,18 +0,0 @@ -# This input slider keeps only the share value itself. The actual number-of-units and -# demand updates happen centrally in number_of_residences_demolished.ad. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_demolished -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value = 20.0 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad deleted file mode 100644 index 3f6dfe073b..0000000000 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_1985_2004.ad +++ /dev/null @@ -1,18 +0,0 @@ -# This input slider keeps only the share value itself. The actual number-of-units and -# demand updates happen centrally in number_of_residences_demolished.ad. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_demolished -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value = 20.0 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad deleted file mode 100644 index 3f6dfe073b..0000000000 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_2005_present.ad +++ /dev/null @@ -1,18 +0,0 @@ -# This input slider keeps only the share value itself. The actual number-of-units and -# demand updates happen centrally in number_of_residences_demolished.ad. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_demolished -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value = 20.0 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad b/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad deleted file mode 100644 index 3f6dfe073b..0000000000 --- a/inputs/demand/households/households_number/households_demolished_share_per_construction_period/households_demolished_before_1945.ad +++ /dev/null @@ -1,18 +0,0 @@ -# This input slider keeps only the share value itself. The actual number-of-units and -# demand updates happen centrally in number_of_residences_demolished.ad. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_demolished -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value = 20.0 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad similarity index 100% rename from inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_apartments.ad rename to inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad similarity index 100% rename from inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_detached.ad rename to inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad similarity index 100% rename from inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_semi_detached.ad rename to inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad diff --git a/inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad similarity index 100% rename from inputs/demand/households/households_number/households_new_buildings_share_per_type/households_share_of_terraced.ad rename to inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad b/inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad similarity index 92% rename from inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad rename to inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad index b1677f745e..91c9eba28c 100644 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad @@ -7,15 +7,15 @@ # Finally the total number of units and useful heat demand are updated for all 4 types. # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new buildings # - 3: number of new buildings & number of buildings demolished # - 2: setting weather curve # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration - query = total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = INPUT_VALUE(households_number_of_residences_demolished_v2a); + number_of_units_demolished = Q(number_of_demolished_residences); number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; number_of_new_units_future = USER_INPUT(); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; @@ -58,7 +58,7 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), + UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad deleted file mode 100644 index 7ec773b428..0000000000 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v1.ad +++ /dev/null @@ -1,276 +0,0 @@ -# In this input, the number of demolished households is set. -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand -# are updated purely based on the new total number of households. -# Once the number of demolished households is set the demolished buildigns are -# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). -# This is done based on the slider settings in households_demolished_share_per_construction_period -# and the current share of buildings per type in each construction period. -# Finally the total number of units and useful heat demand are updated for all 20 types. - -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = USER_INPUT(); - number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); - total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; - - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - - number_of_apartments_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_apartments_before_1945)}); - number_of_detached_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_before_1945)}); - number_of_semi_detached_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_before_1945)}); - number_of_terraced_present_before_1945 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_before_1945)}); - - heat_demand_apartments_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_before_1945, preset_demand)}); - heat_demand_detached_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_before_1945, preset_demand)}); - heat_demand_semi_detached_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945, preset_demand)}); - heat_demand_terraced_present_before_1945 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_before_1945, preset_demand)}); - - total_units_before_1945 = ( - number_of_apartments_present_before_1945 + - number_of_detached_present_before_1945 + - number_of_semi_detached_present_before_1945 + - number_of_terraced_present_before_1945 - ); - - share_demolished_before_1945 = INPUT_VALUE(households_demolished_before_1945)/100; - total_demolished_before_1945 = number_of_units_demolished * share_demolished_before_1945; - - demolished_apartments_before_1945 = (number_of_apartments_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; - demolished_detached_before_1945 = (number_of_detached_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; - demolished_semi_detached_before_1945 = (number_of_semi_detached_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; - demolished_terraced_before_1945 = (number_of_terraced_present_before_1945 / total_units_before_1945) * total_demolished_before_1945; - - number_of_apartments_future_before_1945 = number_of_apartments_present_before_1945 - demolished_apartments_before_1945; - number_of_detached_future_before_1945 = number_of_detached_present_before_1945 - demolished_detached_before_1945; - number_semi_detached_future_before_1945 = number_of_semi_detached_present_before_1945 - demolished_semi_detached_before_1945; - number_of_terraced_future_before_1945 = number_of_terraced_present_before_1945 - demolished_terraced_before_1945; - - heat_demand_apartments_future_before_1945 = heat_demand_apartments_present_before_1945 * (number_of_apartments_future_before_1945 / number_of_apartments_present_before_1945); - heat_demand_detached_future_before_1945 = heat_demand_detached_present_before_1945 * (number_of_detached_future_before_1945 / number_of_detached_present_before_1945); - heat_demand_semi_detached_future_before_1945 = heat_demand_semi_detached_present_before_1945 * (number_semi_detached_future_before_1945 / number_of_semi_detached_present_before_1945); - heat_demand_terraced_future_before_1945 = heat_demand_terraced_present_before_1945 * (number_of_terraced_future_before_1945 / number_of_terraced_present_before_1945); - - number_of_apartments_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1945_1964)}); - number_of_detached_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1945_1964)}); - number_of_semi_detached_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1945_1964)}); - number_of_terraced_present_1945_1964 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1945_1964)}); - - heat_demand_apartments_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1945_1964, preset_demand)}); - heat_demand_detached_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1945_1964, preset_demand)}); - heat_demand_semi_detached_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964, preset_demand)}); - heat_demand_terraced_present_1945_1964 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1945_1964, preset_demand)}); - - total_units_1945_1964 = ( - number_of_apartments_present_1945_1964 + - number_of_detached_present_1945_1964 + - number_of_semi_detached_present_1945_1964 + - number_of_terraced_present_1945_1964 - ); - - share_demolished_1945_1964 = INPUT_VALUE(households_demolished_1945_1964)/100; - total_demolished_1945_1964 = number_of_units_demolished * share_demolished_1945_1964; - - demolished_apartments_1945_1964 = (number_of_apartments_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; - demolished_detached_1945_1964 = (number_of_detached_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; - demolished_semi_detached_1945_1964 = (number_of_semi_detached_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; - demolished_terraced_1945_1964 = (number_of_terraced_present_1945_1964 / total_units_1945_1964) * total_demolished_1945_1964; - - number_of_apartments_future_1945_1964 = number_of_apartments_present_1945_1964 - demolished_apartments_1945_1964; - number_of_detached_future_1945_1964 = number_of_detached_present_1945_1964 - demolished_detached_1945_1964; - number_semi_detached_future_1945_1964 = number_of_semi_detached_present_1945_1964 - demolished_semi_detached_1945_1964; - number_of_terraced_future_1945_1964 = number_of_terraced_present_1945_1964 - demolished_terraced_1945_1964; - - heat_demand_apartments_future_1945_1964 = heat_demand_apartments_present_1945_1964 * (number_of_apartments_future_1945_1964 / number_of_apartments_present_1945_1964); - heat_demand_detached_future_1945_1964 = heat_demand_detached_present_1945_1964 * (number_of_detached_future_1945_1964 / number_of_detached_present_1945_1964); - heat_demand_semi_detached_future_1945_1964 = heat_demand_semi_detached_present_1945_1964 * (number_semi_detached_future_1945_1964 / number_of_semi_detached_present_1945_1964); - heat_demand_terraced_future_1945_1964 = heat_demand_terraced_present_1945_1964 * (number_of_terraced_future_1945_1964 / number_of_terraced_present_1945_1964); - - number_of_apartments_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1965_1984)}); - number_of_detached_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1965_1984)}); - number_of_semi_detached_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1965_1984)}); - number_of_terraced_present_1965_1984 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1965_1984)}); - - heat_demand_apartments_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1965_1984, preset_demand)}); - heat_demand_detached_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1965_1984, preset_demand)}); - heat_demand_semi_detached_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984, preset_demand)}); - heat_demand_terraced_present_1965_1984 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1965_1984, preset_demand)}); - - total_units_1965_1984 = ( - number_of_apartments_present_1965_1984 + - number_of_detached_present_1965_1984 + - number_of_semi_detached_present_1965_1984 + - number_of_terraced_present_1965_1984 - ); - - share_demolished_1965_1984 = INPUT_VALUE(households_demolished_1965_1984)/100; - total_demolished_1965_1984 = number_of_units_demolished * share_demolished_1965_1984; - - demolished_apartments_1965_1984 = (number_of_apartments_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; - demolished_detached_1965_1984 = (number_of_detached_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; - demolished_semi_detached_1965_1984 = (number_of_semi_detached_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; - demolished_terraced_1965_1984 = (number_of_terraced_present_1965_1984 / total_units_1965_1984) * total_demolished_1965_1984; - - number_of_apartments_future_1965_1984 = number_of_apartments_present_1965_1984 - demolished_apartments_1965_1984; - number_of_detached_future_1965_1984 = number_of_detached_present_1965_1984 - demolished_detached_1965_1984; - number_semi_detached_future_1965_1984 = number_of_semi_detached_present_1965_1984 - demolished_semi_detached_1965_1984; - number_of_terraced_future_1965_1984 = number_of_terraced_present_1965_1984 - demolished_terraced_1965_1984; - - heat_demand_apartments_future_1965_1984 = heat_demand_apartments_present_1965_1984 * (number_of_apartments_future_1965_1984 / number_of_apartments_present_1965_1984); - heat_demand_detached_future_1965_1984 = heat_demand_detached_present_1965_1984 * (number_of_detached_future_1965_1984 / number_of_detached_present_1965_1984); - heat_demand_semi_detached_future_1965_1984 = heat_demand_semi_detached_present_1965_1984 * (number_semi_detached_future_1965_1984 / number_of_semi_detached_present_1965_1984); - heat_demand_terraced_future_1965_1984 = heat_demand_terraced_present_1965_1984 * (number_of_terraced_future_1965_1984 / number_of_terraced_present_1965_1984); - - number_of_apartments_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_apartments_1985_2004)}); - number_of_detached_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1985_2004)}); - number_of_semi_detached_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1985_2004)}); - number_of_terraced_present_1985_2004 = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1985_2004)}); - - heat_demand_apartments_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_1985_2004, preset_demand)}); - heat_demand_detached_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_1985_2004, preset_demand)}); - heat_demand_semi_detached_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004, preset_demand)}); - heat_demand_terraced_present_1985_2004 = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_1985_2004, preset_demand)}); - - total_units_1985_2004 = ( - number_of_apartments_present_1985_2004 + - number_of_detached_present_1985_2004 + - number_of_semi_detached_present_1985_2004 + - number_of_terraced_present_1985_2004 - ); - - share_demolished_1985_2004 = INPUT_VALUE(households_demolished_1985_2004)/100; - total_demolished_1985_2004 = number_of_units_demolished * share_demolished_1985_2004; - - demolished_apartments_1985_2004 = (number_of_apartments_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; - demolished_detached_1985_2004 = (number_of_detached_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; - demolished_semi_detached_1985_2004 = (number_of_semi_detached_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; - demolished_terraced_1985_2004 = (number_of_terraced_present_1985_2004 / total_units_1985_2004) * total_demolished_1985_2004; - - number_of_apartments_future_1985_2004 = number_of_apartments_present_1985_2004 - demolished_apartments_1985_2004; - number_of_detached_future_1985_2004 = number_of_detached_present_1985_2004 - demolished_detached_1985_2004; - number_semi_detached_future_1985_2004 = number_of_semi_detached_present_1985_2004 - demolished_semi_detached_1985_2004; - number_of_terraced_future_1985_2004 = number_of_terraced_present_1985_2004 - demolished_terraced_1985_2004; - - heat_demand_apartments_future_1985_2004 = heat_demand_apartments_present_1985_2004 * (number_of_apartments_future_1985_2004 / number_of_apartments_present_1985_2004); - heat_demand_detached_future_1985_2004 = heat_demand_detached_present_1985_2004 * (number_of_detached_future_1985_2004 / number_of_detached_present_1985_2004); - heat_demand_semi_detached_future_1985_2004 = heat_demand_semi_detached_present_1985_2004 * (number_semi_detached_future_1985_2004 / number_of_semi_detached_present_1985_2004); - heat_demand_terraced_future_1985_2004 = heat_demand_terraced_present_1985_2004 * (number_of_terraced_future_1985_2004 / number_of_terraced_present_1985_2004); - - number_of_apartments_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_apartments_2005_present)}); - number_of_detached_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_detached_houses_2005_present)}); - number_of_semi_detached_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_2005_present)}); - number_of_terraced_present_2005_present = QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_2005_present)}); - - heat_demand_apartments_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_apartments_2005_present, preset_demand)}); - heat_demand_detached_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_detached_houses_2005_present, preset_demand)}); - heat_demand_semi_detached_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present, preset_demand)}); - heat_demand_terraced_present_2005_present = QUERY_PRESENT(-> {V(households_useful_demand_for_space_heating_terraced_houses_2005_present, preset_demand)}); - - total_units_2005_present = ( - number_of_apartments_present_2005_present + - number_of_detached_present_2005_present + - number_of_semi_detached_present_2005_present + - number_of_terraced_present_2005_present - ); - - share_demolished_2005_present = INPUT_VALUE(households_demolished_2005_present)/100; - total_demolished_2005_present = number_of_units_demolished * share_demolished_2005_present; - - demolished_apartments_2005_present = (number_of_apartments_present_2005_present / total_units_2005_present) * total_demolished_2005_present; - demolished_detached_2005_present = (number_of_detached_present_2005_present / total_units_2005_present) * total_demolished_2005_present; - demolished_semi_detached_2005_present = (number_of_semi_detached_present_2005_present / total_units_2005_present) * total_demolished_2005_present; - demolished_terraced_2005_present = (number_of_terraced_present_2005_present / total_units_2005_present) * total_demolished_2005_present; - - number_of_apartments_future_2005_present = number_of_apartments_present_2005_present - demolished_apartments_2005_present; - number_of_detached_future_2005_present = number_of_detached_present_2005_present - demolished_detached_2005_present; - number_semi_detached_future_2005_present = number_of_semi_detached_present_2005_present - demolished_semi_detached_2005_present; - number_of_terraced_future_2005_present = number_of_terraced_present_2005_present - demolished_terraced_2005_present; - - heat_demand_apartments_future_2005_present = heat_demand_apartments_present_2005_present * (number_of_apartments_future_2005_present / number_of_apartments_present_2005_present); - heat_demand_detached_future_2005_present = heat_demand_detached_present_2005_present * (number_of_detached_future_2005_present / number_of_detached_present_2005_present); - heat_demand_semi_detached_future_2005_present = heat_demand_semi_detached_present_2005_present * (number_semi_detached_future_2005_present / number_of_semi_detached_present_2005_present); - heat_demand_terraced_future_2005_present = heat_demand_terraced_present_2005_present * (number_of_terraced_future_2005_present / number_of_terraced_present_2005_present); - - EACH( - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), preset_demand, heat_demand_apartments_future_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, number_of_apartments_future_before_1945), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, heat_demand_detached_future_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, number_of_detached_future_before_1945), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, heat_demand_semi_detached_future_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, number_semi_detached_future_before_1945), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, heat_demand_terraced_future_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, number_of_terraced_future_before_1945), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), preset_demand, heat_demand_apartments_future_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, number_of_apartments_future_1945_1964), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), preset_demand, heat_demand_detached_future_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, number_of_detached_future_1945_1964), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), preset_demand, heat_demand_semi_detached_future_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, number_semi_detached_future_1945_1964), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), preset_demand, heat_demand_terraced_future_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, number_of_terraced_future_1945_1964), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), preset_demand, heat_demand_apartments_future_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, number_of_apartments_future_1965_1984), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), preset_demand, heat_demand_detached_future_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, number_of_detached_future_1965_1984), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), preset_demand, heat_demand_semi_detached_future_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, number_semi_detached_future_1965_1984), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), preset_demand, heat_demand_terraced_future_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, number_of_terraced_future_1965_1984), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), preset_demand, heat_demand_apartments_future_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, number_of_apartments_future_1985_2004), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), preset_demand, heat_demand_detached_future_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, number_of_detached_future_1985_2004), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), preset_demand, heat_demand_semi_detached_future_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, number_semi_detached_future_1985_2004), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), preset_demand, heat_demand_terraced_future_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, number_of_terraced_future_1985_2004), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), preset_demand, heat_demand_apartments_future_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, number_of_apartments_future_2005_present), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), preset_demand, heat_demand_detached_future_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, number_of_detached_future_2005_present), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), preset_demand, heat_demand_semi_detached_future_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, number_semi_detached_future_2005_present), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), preset_demand, heat_demand_terraced_future_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, number_of_terraced_future_2005_present) - ) -- priority = 3 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad deleted file mode 100644 index d69d060ccc..0000000000 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2.ad +++ /dev/null @@ -1,75 +0,0 @@ -# In this input, the number of demolished households is set. -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand -# are updated purely based on the new total number of households. -# Once the number of demolished households is set the demolished buildigns are -# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). -# This is done based on the slider settings in households_demolished_share_per_construction_period -# and the current share of buildings per type in each construction period. -# Finally the total number of units and useful heat demand are updated for all 20 types. - -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = USER_INPUT(); - number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); - total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); - - roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); - useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); - - units_present_before_1945 = QUERY_PRESENT(-> {SUM(V(G(households_before_1945), number_of_units))}); - demolished_before_1945 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0)); - remaining_share_before_1945 = 1.0 - DIVIDE(demolished_before_1945, units_present_before_1945); - - units_present_1945_1964 = QUERY_PRESENT(-> {SUM(V(G(households_1945_1964), number_of_units))}); - demolished_1945_1964 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0)); - remaining_share_1945_1964 = 1.0 - DIVIDE(demolished_1945_1964, units_present_1945_1964); - - units_present_1965_1984 = QUERY_PRESENT(-> {SUM(V(G(households_1965_1984), number_of_units))}); - demolished_1965_1984 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0)); - remaining_share_1965_1984 = 1.0 - DIVIDE(demolished_1965_1984, units_present_1965_1984); - - units_present_1985_2004 = QUERY_PRESENT(-> {SUM(V(G(households_1985_2004), number_of_units))}); - demolished_1985_2004 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0)); - remaining_share_1985_2004 = 1.0 - DIVIDE(demolished_1985_2004, units_present_1985_2004); - - units_present_2005_present = QUERY_PRESENT(-> {SUM(V(G(households_2005_present), number_of_units))}); - demolished_2005_present = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0)); - remaining_share_2005_present = 1.0 - DIVIDE(demolished_2005_present, units_present_2005_present); - - EACH( - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - - UPDATE_WITH_FACTOR(V(G(households_before_1945)), number_of_units, remaining_share_before_1945), - UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, remaining_share_before_1945), - - UPDATE_WITH_FACTOR(V(G(households_1945_1964)), number_of_units, remaining_share_1945_1964), - UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, remaining_share_1945_1964), - - UPDATE_WITH_FACTOR(V(G(households_1965_1984)), number_of_units, remaining_share_1965_1984), - UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, remaining_share_1965_1984), - - UPDATE_WITH_FACTOR(V(G(households_1985_2004)), number_of_units, remaining_share_1985_2004), - UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, remaining_share_1985_2004), - - UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, remaining_share_2005_present), - UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, remaining_share_2005_present) - ) -- priority = 3 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad deleted file mode 100644 index 103e1cc8a5..0000000000 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v2a.ad +++ /dev/null @@ -1,108 +0,0 @@ -# In this input, the number of demolished households is set. -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand -# are updated purely based on the new total number of households. -# Once the number of demolished households is set the demolished buildigns are -# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). -# This is done based on the slider settings in households_demolished_share_per_construction_period -# and the current share of buildings per type in each construction period. -# Finally the total number of units and useful heat demand are updated for all 20 types. - -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = USER_INPUT(); - number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); - total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); - - roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); - useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); - - units_present_before_1945 = QUERY_PRESENT(-> {SUM(V(G(households_before_1945), number_of_units))}); - demolished_before_1945 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_before_1945), 100.0)); - remaining_share_before_1945 = 1.0 - DIVIDE(demolished_before_1945, units_present_before_1945); - - units_present_1945_1964 = QUERY_PRESENT(-> {SUM(V(G(households_1945_1964), number_of_units))}); - demolished_1945_1964 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1945_1964), 100.0)); - remaining_share_1945_1964 = 1.0 - DIVIDE(demolished_1945_1964, units_present_1945_1964); - - units_present_1965_1984 = QUERY_PRESENT(-> {SUM(V(G(households_1965_1984), number_of_units))}); - demolished_1965_1984 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1965_1984), 100.0)); - remaining_share_1965_1984 = 1.0 - DIVIDE(demolished_1965_1984, units_present_1965_1984); - - units_present_1985_2004 = QUERY_PRESENT(-> {SUM(V(G(households_1985_2004), number_of_units))}); - demolished_1985_2004 = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_1985_2004), 100.0)); - remaining_share_1985_2004 = 1.0 - DIVIDE(demolished_1985_2004, units_present_1985_2004); - - units_present_2005_present = QUERY_PRESENT(-> {SUM(V(G(households_2005_present), number_of_units))}); - demolished_2005_present = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE(households_demolished_2005_present), 100.0)); - remaining_share_2005_present = 1.0 - DIVIDE(demolished_2005_present, units_present_2005_present); - - nuo_apartments_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_before_1945)}), remaining_share_before_1945), 0); - nuo_detached_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_before_1945)}), remaining_share_before_1945), 0); - nuo_semi_detached_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_before_1945)}), remaining_share_before_1945), 0); - nuo_terraced_before_1945 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_before_1945)}), remaining_share_before_1945), 0); - nuo_apartments_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1945_1964)}), remaining_share_1945_1964), 0); - nuo_detached_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1945_1964)}), remaining_share_1945_1964), 0); - nuo_semi_detached_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1945_1964)}), remaining_share_1945_1964), 0); - nuo_terraced_1945_1964 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1945_1964)}), remaining_share_1945_1964), 0); - nuo_apartments_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1965_1984)}), remaining_share_1965_1984), 0); - nuo_detached_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1965_1984)}), remaining_share_1965_1984), 0); - nuo_semi_detached_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1965_1984)}), remaining_share_1965_1984), 0); - nuo_terraced_1965_1984 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1965_1984)}), remaining_share_1965_1984), 0); - nuo_apartments_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_1985_2004)}), remaining_share_1985_2004), 0); - nuo_detached_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_1985_2004)}), remaining_share_1985_2004), 0); - nuo_semi_detached_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_1985_2004)}), remaining_share_1985_2004), 0); - nuo_terraced_1985_2004 = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_1985_2004)}), remaining_share_1985_2004), 0); - nuo_apartments_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_apartments_2005_present)}), remaining_share_2005_present), 0); - nuo_detached_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_detached_houses_2005_present)}), remaining_share_2005_present), 0); - nuo_semi_detached_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_semi_detached_houses_2005_present)}), remaining_share_2005_present), 0); - nuo_terraced_2005_present = ROUND(PRODUCT(QUERY_PRESENT(->{AREA(present_number_of_terraced_houses_2005_present)}), remaining_share_2005_present), 0); - - EACH( - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - - UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, remaining_share_before_1945), - UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, remaining_share_1945_1964), - UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, remaining_share_1965_1984), - UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, remaining_share_1985_2004), - UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, remaining_share_2005_present), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, nuo_apartments_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, nuo_detached_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, nuo_semi_detached_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, nuo_terraced_before_1945), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, nuo_apartments_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, nuo_detached_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, nuo_semi_detached_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, nuo_terraced_1945_1964), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, nuo_apartments_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, nuo_detached_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, nuo_semi_detached_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, nuo_terraced_1965_1984), - UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, nuo_apartments_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, nuo_detached_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, nuo_semi_detached_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, nuo_terraced_1985_2004), - UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, nuo_apartments_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, nuo_detached_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, nuo_semi_detached_2005_present), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, nuo_terraced_2005_present) - ) -- priority = 3 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future diff --git a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad b/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad deleted file mode 100644 index cc091cd0f6..0000000000 --- a/inputs/demand/households/households_number/households_total_numbers/households_number_of_residences_demolished_v3.ad +++ /dev/null @@ -1,62 +0,0 @@ -# In this input, the number of demolished households is set. -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand -# are updated purely based on the new total number of households. -# Once the number of demolished households is set the demolished buildigns are -# divided amongst the 20 sets of buildings (5 construction periods x 4 building types). -# This is done based on the slider settings in households_demolished_share_per_construction_period -# and the current share of buildings per type in each construction period. -# Finally the total number of units and useful heat demand are updated for all 20 types. - -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = USER_INPUT(); - number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = INPUT_VALUE(households_number_of_residences_new); - total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; - - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - - building_types = ["apartments", "detached_houses", "semi_detached_houses", "terraced_houses"]; - construction_periods = ["before_1945", "1945_1964", "1965_1984", "1985_2004", "2005_present"]; - - EACH( - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, total_number_of_units_future), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - - *construction_periods.flat_map{|period| - units_present = building_types.map{|type| - QUERY_PRESENT(->{AREA("present_number_of_#{type}_#{period}")}) - }; - total_units_present = units_present.sum; - total_demolished = PRODUCT(number_of_units_demolished, DIVIDE(INPUT_VALUE("households_demolished_#{period}"),100)); - - building_types.each_with_index.flat_map{|type, index| - node_key = "households_useful_demand_for_space_heating_#{type}_#{period}"; - present_units = units_present[index]; - future_units = ROUND(present_units - PRODUCT(DIVIDE(present_units, total_units_present), total_demolished), 0); - present_heat = QUERY_PRESENT(->{V(node_key, preset_demand)}); - [ - UPDATE(V(node_key), preset_demand, PRODUCT(present_heat, DIVIDE(future_units, present_units))), - UPDATE(V(node_key), number_of_units, future_units) - ] - } - } - ) -- priority = 3 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future From 0981c33f5db9b96c789c645104c2d39895f80e6d Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Tue, 11 Aug 2026 17:58:21 +0200 Subject: [PATCH 16/28] Step value for insulation inputs from 1.0 to 0.1 --- .../households_insulation/households_insulation_1945_1964.ad | 2 +- .../households_insulation/households_insulation_1965_1984.ad | 2 +- .../households_insulation/households_insulation_1985_2004.ad | 2 +- .../households_insulation/households_insulation_2005_present.ad | 2 +- .../households_insulation/households_insulation_before_1945.ad | 2 +- .../households_insulation/households_insulation_new_houses.ad | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad index 51d277b6eb..bea3ec1170 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -40,7 +40,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad index 30b09303cd..cd4a4f2c38 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -40,7 +40,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad index 36d3af023c..59ec879f10 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -41,7 +41,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad index edea33cf7a..0acfc7b0b6 100644 --- a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -41,7 +41,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad index 4b913a87c5..b895fb8b13 100644 --- a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -41,7 +41,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad index d4d4dc7760..59f99b1293 100644 --- a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad +++ b/inputs/demand/households/households_insulation/households_insulation_new_houses.ad @@ -41,7 +41,7 @@ - max_value = 0.0 - min_value = -100.0 - start_value = 0.0 -- step_value = 1.0 +- step_value = 0.1 - unit = % - update_period = future - update_type = mixed From 06f869447ba28cb92bc547daacf4c90cb2b58482 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 13 Aug 2026 10:15:01 +0200 Subject: [PATCH 17/28] Omit buildings-related input changes --- .../buildings_space_heating_behaviour.ad | 20 -------- ...buildings_insulation_existing_buildings.ad | 21 --------- ...dings_insulation_level_buildings_future.ad | 0 ...ings_insulation_level_buildings_present.ad | 0 .../buildings_insulation_new_buildings.ad | 21 --------- ...uildings_number_of_buildings_demolished.ad | 45 ------------------ .../buildings_number_of_buildings_future.ad | 0 .../buildings_number_of_buildings_new.ad | 47 ------------------- .../buildings_number_of_buildings_present.ad | 0 9 files changed, 154 deletions(-) delete mode 100644 inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad delete mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad rename inputs/demand/buildings/buildings_insulation/{OLD_SLIDERS => }/buildings_insulation_level_buildings_future.ad (100%) rename inputs/demand/buildings/buildings_insulation/{OLD_SLIDERS => }/buildings_insulation_level_buildings_present.ad (100%) delete mode 100644 inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad delete mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad rename inputs/demand/buildings/buildings_number/{OLD_SLIDERS => }/buildings_number_of_buildings_future.ad (100%) delete mode 100644 inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad rename inputs/demand/buildings/buildings_number/{OLD_SLIDERS => }/buildings_number_of_buildings_present.ad (100%) diff --git a/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad b/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad deleted file mode 100644 index 7a80b44dd1..0000000000 --- a/inputs/demand/buildings/buildings_behaviour/buildings_space_heating_behaviour.ad +++ /dev/null @@ -1,20 +0,0 @@ -# This input calculates the changed heat demand due to behavioural changes. -# It only updates the demand. -# Its priority is delibaretely set low (0) to make sure it happens after the typical demand is changed due to insulation. -# This input therefore does not udpate the typical_useful_demand_for_space_heating_buildings_present/future -# The typical demand is used in the queries costs_of_insulation_buildings_present and costs_of_insulation_buildings_future - -- query = - relative_change = (100 + USER_INPUT())/100; - EACH( - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change) - ) -- priority = 0 -- max_value = 50.0 -- min_value = -50.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad deleted file mode 100644 index b5b02b972f..0000000000 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_existing_buildings.ad +++ /dev/null @@ -1,21 +0,0 @@ -# This input lets you change the insulation of existing buildings by reducing it with a certain percentage -# This percentage is used update: -### The useful_demand -### The typical_useful_demand -### The investment costs for insulation - -- query = - relative_change = (100 + USER_INPUT())/100; - EACH( - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change), - UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_present, relative_change), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) - ) -- priority = 1 -- max_value = 0.0 -- min_value = -100.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_future.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad similarity index 100% rename from inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_future.ad rename to inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_future.ad diff --git a/inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_present.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad similarity index 100% rename from inputs/demand/buildings/buildings_insulation/OLD_SLIDERS/buildings_insulation_level_buildings_present.ad rename to inputs/demand/buildings/buildings_insulation/buildings_insulation_level_buildings_present.ad diff --git a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad b/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad deleted file mode 100644 index fae7a8d161..0000000000 --- a/inputs/demand/buildings/buildings_insulation/buildings_insulation_new_buildings.ad +++ /dev/null @@ -1,21 +0,0 @@ -# This input lets you change the insulation of new buildings by reducing it with a certain percentage -# This percentage is used update: -### The preset_demand -### The typical_useful_demand -### The investment costs for insulation - -- query = - relative_change = (100 + USER_INPUT())/100; - EACH( - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, relative_change), - UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_buildings_future, relative_change), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) - ) -- priority = 1 -- max_value = 0.0 -- min_value = -100.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = mixed \ No newline at end of file diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad deleted file mode 100644 index 44876c0749..0000000000 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad +++ /dev/null @@ -1,45 +0,0 @@ -# This input lets you demolish existing buildings. -# After you have set your number of demolished buildings it updates the following: -### useful demand for space heating -### useful demand for cooling -### useful demand for lighting -### useful demand for appliances -### building surface available for PV -### number of units - -# This input does not update the investment costs for insulation. This is done in the insulation inputs -# To make this work, the priority of this input is higher than the insulation inputs - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); - number_of_units_demolished = USER_INPUT(); - number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; - - number_of_new_units_future = INPUT_VALUE(buildings_number_of_buildings_new); - - total_number_of_units_future = number_of_existing_buildings_future + number_of_new_units_future; - - relative_change_existing = number_of_existing_buildings_future / total_number_of_units_present; - relative_change_total = total_number_of_units_future / total_number_of_units_present; - - useful_cooling_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); - useful_lighting_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); - useful_appliances_demand_future = relative_change_total * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); - roof_surface_for_pv_future = relative_change_total * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); - - EACH( - UPDATE_WITH_FACTOR(V(buildings_useful_demand_for_space_heating_buildings_present), preset_demand, relative_change_existing), - UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), - UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), - UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, number_of_existing_buildings_future) - ) -- priority = 2 -- max_value_gql = present:AREA(present_number_of_buildings) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_future.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad similarity index 100% rename from inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_future.ad rename to inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad deleted file mode 100644 index 26305daa10..0000000000 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_new.ad +++ /dev/null @@ -1,47 +0,0 @@ -# This input lets you build new buildings -# After you have set your number of new buildings buildings it updates the following: -### useful demand for space heating -### useful demand for cooling -### useful demand for lighting -### useful demand for appliances -### building surface available for PV -### number of units - -# This input does not update the investment costs for insulation. This is done in the insulation inputs -# To make this work, the priority of this input is higher than the insulation inputs - -- query = - insulation_value_future = AREA(typical_useful_demand_for_space_heating_buildings_future); - typical_surface_area_per_unit = AREA(area_per_building_residence_equivalent); - heat_demand_per_unit = insulation_value_future * typical_surface_area_per_unit * MJ_PER_KWH; - - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_buildings)}); - number_of_units_demolished = INPUT_VALUE(buildings_number_of_buildings_demolished); - number_of_existing_buildings_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = USER_INPUT(); - - total_number_of_units_future = number_of_existing_buildings_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; - - useful_heat_demand_new_buildings_future = number_of_new_units_future * heat_demand_per_unit; - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_cooling, preset_demand)}); - useful_lighting_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_light, preset_demand)}); - useful_appliances_demand_future = relative_change * QUERY_PRESENT(-> {V(buildings_useful_demand_for_appliances, preset_demand)}); - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(buildings_roof_surface_available_for_pv)}); - - EACH( - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future), preset_demand, useful_heat_demand_new_buildings_future), - UPDATE(V(buildings_useful_demand_cooling), preset_demand, useful_cooling_demand_future), - UPDATE(V(buildings_useful_demand_light), preset_demand, useful_lighting_demand_future), - UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, useful_appliances_demand_future), - UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, number_of_new_units_future) - ) -- priority = 2 -- max_value_gql = present:AREA(present_number_of_buildings) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_present.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad similarity index 100% rename from inputs/demand/buildings/buildings_number/OLD_SLIDERS/buildings_number_of_buildings_present.ad rename to inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad From d7d405c4a750869178f4c744d61273e4fd29ca6d Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 13 Aug 2026 13:15:23 +0200 Subject: [PATCH 18/28] Change insulation sliders to positive values --- .../households_insulation_1945_1964.ad | 6 +++--- .../households_insulation_1965_1984.ad | 6 +++--- .../households_insulation_1985_2004.ad | 6 +++--- .../households_insulation_2005_present.ad | 6 +++--- .../households_insulation_before_1945.ad | 6 +++--- ...ew_houses.ad => households_insulation_new_residences.ad} | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) rename inputs/demand/households/households_insulation/{households_insulation_new_houses.ad => households_insulation_new_residences.ad} (96%) diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad index bea3ec1170..92f15842e9 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -18,7 +18,7 @@ # Therefore it works to simply multiply by the relative change due to insulation here. - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1945_1964, insulation_relative_change), @@ -37,8 +37,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1945_1964)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad index cd4a4f2c38..090c423347 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -18,7 +18,7 @@ # Therefore it works to simply multiply by the relative change due to insulation here. - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1965_1984, insulation_relative_change), @@ -37,8 +37,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1965_1984)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad index 59ec879f10..651078d309 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -19,7 +19,7 @@ - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1985_2004, insulation_relative_change), @@ -38,8 +38,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1985_2004)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad index 0acfc7b0b6..fc2bca99f7 100644 --- a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -19,7 +19,7 @@ - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_2005_present, insulation_relative_change), @@ -38,8 +38,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_2005_present)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad index b895fb8b13..381ed21c77 100644 --- a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -19,7 +19,7 @@ - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_before_1945, insulation_relative_change), @@ -38,8 +38,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_before_1945)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % diff --git a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad similarity index 96% rename from inputs/demand/households/households_insulation/households_insulation_new_houses.ad rename to inputs/demand/households/households_insulation/households_insulation_new_residences.ad index 59f99b1293..5885e8e95e 100644 --- a/inputs/demand/households/households_insulation/households_insulation_new_houses.ad +++ b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad @@ -19,7 +19,7 @@ - query = - insulation_relative_change = (100 + USER_INPUT())/100; + insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_future, insulation_relative_change), @@ -38,8 +38,8 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_future)})) ) - priority = 1 -- max_value = 0.0 -- min_value = -100.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % From d0216819c301ea83232487ee85e3cd2bf52ed9bf Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 13 Aug 2026 14:03:26 +0200 Subject: [PATCH 19/28] Various improvements --- .../number_of_demolished_residences.gql | 3 +- .../households_share_of_apartments.gql | 2 +- .../households_share_of_detached.gql | 2 +- .../households_share_of_semi_detached.gql | 2 +- .../households_share_of_terraced.gql | 2 +- .../households_space_heating_behaviour.ad} | 22 ++--- .../households_insulation_1945_1964.ad | 21 ++--- .../households_insulation_1965_1984.ad | 21 ++--- .../households_insulation_1985_2004.ad | 22 ++--- .../households_insulation_2005_present.ad | 22 ++--- .../households_insulation_before_1945.ad | 21 ++--- .../households_insulation_new_residences.ad | 21 ++--- .../households_demolished_1945_1964.ad | 19 ++-- .../households_demolished_1965_1984.ad | 19 ++-- .../households_demolished_1985_2004.ad | 19 ++-- .../households_demolished_2005_present.ad | 19 ++-- .../households_demolished_before_1945.ad | 19 ++-- .../households_share_of_apartments.ad | 19 ---- .../households_share_of_detached.ad | 19 ---- .../households_share_of_semi_detached.ad | 19 ---- .../households_share_of_terraced.ad | 19 ---- .../households_number_of_residences_new.ad | 84 ------------------ .../households_share_of_apartments.ad | 19 ++++ .../households_share_of_detached.ad | 19 ++++ .../households_share_of_semi_detached.ad | 19 ++++ .../households_share_of_terraced.ad | 19 ++++ .../households_number_of_residences_new.ad | 86 +++++++++++++++++++ 27 files changed, 275 insertions(+), 303 deletions(-) rename inputs/demand/households/{households_heat_behaviour/households_heating_behaviour.ad => households_demand/households_space_heating_behaviour.ad} (82%) rename inputs/demand/households/households_number/{households_demolished_residences => demolished_residences}/households_demolished_1945_1964.ad (78%) rename inputs/demand/households/households_number/{households_demolished_residences => demolished_residences}/households_demolished_1965_1984.ad (78%) rename inputs/demand/households/households_number/{households_demolished_residences => demolished_residences}/households_demolished_1985_2004.ad (78%) rename inputs/demand/households/households_number/{households_demolished_residences => demolished_residences}/households_demolished_2005_present.ad (78%) rename inputs/demand/households/households_number/{households_demolished_residences => demolished_residences}/households_demolished_before_1945.ad (78%) delete mode 100644 inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad delete mode 100644 inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad delete mode 100644 inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad delete mode 100644 inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad delete mode 100644 inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad create mode 100644 inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad create mode 100644 inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad create mode 100644 inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad create mode 100644 inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad create mode 100644 inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad diff --git a/gqueries/general/number_of_units/number_of_demolished_residences.gql b/gqueries/general/number_of_units/number_of_demolished_residences.gql index b0fa38e258..2d12eb83e9 100644 --- a/gqueries/general/number_of_units/number_of_demolished_residences.gql +++ b/gqueries/general/number_of_units/number_of_demolished_residences.gql @@ -4,5 +4,6 @@ INPUT_VALUE(households_demolished_1945_1964), INPUT_VALUE(households_demolished_1965_1984), INPUT_VALUE(households_demolished_1985_2004), - INPUT_VALUE(households_demolished_2005_present)) + INPUT_VALUE(households_demolished_2005_present) + ) - unit = # diff --git a/gqueries/input_elements/start_value/households_share_of_apartments.gql b/gqueries/input_elements/start_value/households_share_of_apartments.gql index dfd175691f..3ecd52130d 100644 --- a/gqueries/input_elements/start_value/households_share_of_apartments.gql +++ b/gqueries/input_elements/start_value/households_share_of_apartments.gql @@ -1,2 +1,2 @@ -- query = PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)),100) +- query = PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)), 100.0) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_detached.gql b/gqueries/input_elements/start_value/households_share_of_detached.gql index 5c22a8a4cd..a7d383edb7 100644 --- a/gqueries/input_elements/start_value/households_share_of_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_detached.gql @@ -1,2 +1,2 @@ -- query = PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)),100) +- query = PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)), 100.0) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql index 57efc431d4..604127660a 100644 --- a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql @@ -1,2 +1,2 @@ -- query = PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)),100) +- query = PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)), 100.0) - unit = factor diff --git a/gqueries/input_elements/start_value/households_share_of_terraced.gql b/gqueries/input_elements/start_value/households_share_of_terraced.gql index 52e1eb6730..2d575d7b4e 100644 --- a/gqueries/input_elements/start_value/households_share_of_terraced.gql +++ b/gqueries/input_elements/start_value/households_share_of_terraced.gql @@ -1,2 +1,2 @@ -- query = PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)),100) +- query = PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)), 100.0) - unit = factor diff --git a/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad similarity index 82% rename from inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad rename to inputs/demand/households/households_demand/households_space_heating_behaviour.ad index bd7039a0dc..61536fcacd 100644 --- a/inputs/demand/households/households_heat_behaviour/households_heating_behaviour.ad +++ b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad @@ -1,23 +1,16 @@ -# This input slider lets you reduce or increase the heat demand for households solely by the behaviour. -# Therefore it only affects the actual useful demand. -# Unlike insulation it does not affect the typical heat demand and the insulation costs. -# The priority is lower than the other heat demand input sliders. It therefore uses the demand that -# is already calculated in other sliders. It can therefore update with factor, instead of calculating -# everything here. - +# This sets the change in heat demand due to behaviour of all residence types and construction periods. +# # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature -# Every building type / construction period has to be updated individually. They are sorted by period. - - query = - relative_change = (100 + USER_INPUT())/100; + relative_change = DIVIDE((100.0 + USER_INPUT()), 100.0); - EACH( + EACH( UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, relative_change), UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, relative_change), UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, relative_change), @@ -47,7 +40,7 @@ UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_detached_houses_before_1945), preset_demand, relative_change), UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), preset_demand, relative_change), UPDATE_WITH_FACTOR(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), preset_demand, relative_change) - ) + ) - priority = 0 - max_value = 50.0 - min_value = -50.0 @@ -55,4 +48,3 @@ - step_value = 1.0 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad index 92f15842e9..327b92d873 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -1,24 +1,18 @@ -# This input lets you set the reduced heat demand for residences built between 1945 and 1964 due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation for residences built between +# 1945 and 1964 and updates the typical useful demand area attributes and preset demand for space +# heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1945_1964, insulation_relative_change), @@ -43,4 +37,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad index 090c423347..42b50957bd 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -1,24 +1,18 @@ -# This input lets you set the reduced heat demand for residences built between 1965 and 1984 due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation for residences built between +# 1965 and 1984 and updates the typical useful demand area attributes and preset demand for space +# heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1965_1984, insulation_relative_change), @@ -43,4 +37,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad index 651078d309..d193b6cb09 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -1,25 +1,18 @@ -# This input lets you set the reduced heat demand for residences built between 1985 and 2004 due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation for residences built between +# 1985 and 2004 and updates the typical useful demand area attributes and preset demand for space +# heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. - +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_1985_2004, insulation_relative_change), @@ -44,4 +37,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad index fc2bca99f7..59438b0a80 100644 --- a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -1,25 +1,18 @@ -# This input lets you set the reduced heat demand for residences built from 2005 to present due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation for residences built from +# 2005 to present and updates the typical useful demand area attributes and preset demand for space +# heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. - +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_2005_present, insulation_relative_change), @@ -44,4 +37,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad index 381ed21c77..83400c54f7 100644 --- a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -1,25 +1,17 @@ -# This input lets you set the reduced heat demand for residences built before 1945 due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation for residences built before +# 1945 and updates the typical useful demand area attributes and preset demand for space heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. - +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_before_1945, insulation_relative_change), @@ -44,4 +36,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_insulation/households_insulation_new_residences.ad b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad index 5885e8e95e..d5dd12b7bc 100644 --- a/inputs/demand/households/households_insulation/households_insulation_new_residences.ad +++ b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad @@ -1,25 +1,17 @@ -# This input lets you set the reduced heat demand for new residences due to insulation -# -# It works by calculating the relative change. This relative change is used to update the: -# - typical useful demand -# - preset_useful demand -# +# This input sets reduction of heat demand due to improved insulation and updates the typical +# useful demand area attributes and preset demand for space heating. # Finally the new values are used to calculate the initial investment costs for insulation in the # respective queries. # # Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature -# The priority of this input is lower than the demolition of houses from this construction period. -# In these sliders the total demand is calculated before insulation. -# Therefore it works to simply multiply by the relative change due to insulation here. - +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = - insulation_relative_change = DIVIDE(100 + NEG(USER_INPUT()), 100.0); + insulation_relative_change = DIVIDE(100.0 + NEG(USER_INPUT()), 100.0); EACH( UPDATE_WITH_FACTOR(AREA(), typical_useful_demand_for_space_heating_apartments_future, insulation_relative_change), @@ -44,4 +36,3 @@ - step_value = 0.1 - unit = % - update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad similarity index 78% rename from inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad rename to inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad index ec6b950e1f..3b6bac8d85 100644 --- a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1945_1964.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad @@ -1,10 +1,11 @@ -# This input slider sets the demolished buildings for one construction peroid. -# It updates the total number of residences, total roof surface for pv, total cooling demand. -# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# This input sets the demolished residence for one construction period. +# It updates the total number of residences, roof surface for pv, total cooling demand. +# It also updates the number of units and useful demand for all residence types within this construction period individually. +# # Related priorities are set as follows: -# - 4: shares of new buildings +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad @@ -29,13 +30,17 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, relative_change_1945_1964), UPDATE_WITH_FACTOR(V(G(households_1945_1964)), number_of_units, relative_change_1945_1964), - ) + ) - priority = 3 - max_value_gql = present:Q(number_of_residences_1945_1964) - min_value = 0.0 diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad similarity index 78% rename from inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad rename to inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad index 48212949fc..d0dd639834 100644 --- a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1965_1984.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad @@ -1,10 +1,11 @@ -# This input slider sets the demolished buildings for one construction peroid. -# It updates the total number of residences, total roof surface for pv, total cooling demand. -# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# This input sets the demolished residence for one construction period. +# It updates the total number of residences, roof surface for pv, total cooling demand. +# It also updates the number of units and useful demand for all residence types within this construction period individually. +# # Related priorities are set as follows: -# - 4: shares of new buildings +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad @@ -29,13 +30,17 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, relative_change_1965_1984), UPDATE_WITH_FACTOR(V(G(households_1965_1984)), number_of_units, relative_change_1965_1984), - ) + ) - priority = 3 - max_value_gql = present:Q(number_of_residences_1965_1984) - min_value = 0.0 diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad similarity index 78% rename from inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad rename to inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad index b3fbfdb4a6..f0a2898d03 100644 --- a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_1985_2004.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad @@ -1,10 +1,11 @@ -# This input slider sets the demolished buildings for one construction peroid. -# It updates the total number of residences, total roof surface for pv, total cooling demand. -# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# This input sets the demolished residence for one construction period. +# It updates the total number of residences, roof surface for pv, total cooling demand. +# It also updates the number of units and useful demand for all residence types within this construction period individually. +# # Related priorities are set as follows: -# - 4: shares of new buildings +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad @@ -29,13 +30,17 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, relative_change_1985_2004), UPDATE_WITH_FACTOR(V(G(households_1985_2004)), number_of_units, relative_change_1985_2004), - ) + ) - priority = 3 - max_value_gql = present:Q(number_of_residences_1985_2004) - min_value = 0.0 diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad similarity index 78% rename from inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad rename to inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad index c835dbafab..1ef9dc258d 100644 --- a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_2005_present.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad @@ -1,10 +1,11 @@ -# This input slider sets the demolished buildings for one construction peroid. -# It updates the total number of residences, total roof surface for pv, total cooling demand. -# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# This input sets the demolished residence for one construction period. +# It updates the total number of residences, roof surface for pv, total cooling demand. +# It also updates the number of units and useful demand for all residence types within this construction period individually. +# # Related priorities are set as follows: -# - 4: shares of new buildings +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad @@ -29,13 +30,17 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, relative_change_2005_present), UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, relative_change_2005_present), - ) + ) - priority = 3 - max_value_gql = present:Q(number_of_residences_2005_present) - min_value = 0.0 diff --git a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad similarity index 78% rename from inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad rename to inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad index 00d01a78af..241d32e55e 100644 --- a/inputs/demand/households/households_number/households_demolished_residences/households_demolished_before_1945.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad @@ -1,10 +1,11 @@ -# This input slider sets the demolished buildings for one construction peroid. -# It updates the total number of residences, total roof surface for pv, total cooling demand. -# It alsl updates the number of units and useful demand for all building types within this construction period individually. +# This input sets the demolished residence for one construction period. +# It updates the total number of residences, roof surface for pv, total cooling demand. +# It also updates the number of units and useful demand for all residence types within this construction period individually. +# # Related priorities are set as follows: -# - 4: shares of new buildings +# - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve +# - 2: settings_weather_curve_set # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad @@ -29,13 +30,17 @@ EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, relative_change_before_1945), UPDATE_WITH_FACTOR(V(G(households_before_1945)), number_of_units, relative_change_before_1945), - ) + ) - priority = 3 - max_value_gql = present:Q(number_of_residences_before_1945) - min_value = 0.0 diff --git a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad deleted file mode 100644 index cfac37c298..0000000000 --- a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_apartments.ad +++ /dev/null @@ -1,19 +0,0 @@ -# This input lets you decide what part of the new buildings will be apartments. -# The total number of new buildings is set in total_number_of_residences_new.ad -# The start value is based on the share of apartments in the exisiting building stock. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_new_residences -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:Q(households_share_of_apartments) -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad deleted file mode 100644 index 66fe091079..0000000000 --- a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_detached.ad +++ /dev/null @@ -1,19 +0,0 @@ -# This input lets you decide what part of the new buildings will be detached houses. -# The total number of new buildings is set in total_number_of_residences_new.ad -# The start value is based on the share of detached houses in the exisiting building stock. -# Related priorities are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_new_residences -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:Q(households_share_of_detached) -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad deleted file mode 100644 index 361781729d..0000000000 --- a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_semi_detached.ad +++ /dev/null @@ -1,19 +0,0 @@ -# This input lets you decide what part of the new buildings will be semi detached houses. -# The total number of new buildings is set in total_number_of_residences_new.ad -# The start value is based on the share of semi detached houses in the exisiting building stock. -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_new_residences -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:Q(households_share_of_semi_detached) -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad deleted file mode 100644 index 02c9adea1d..0000000000 --- a/inputs/demand/households/households_number/households_new_residences_share_per_type/households_share_of_terraced.ad +++ /dev/null @@ -1,19 +0,0 @@ -# This input lets you decide what part of the new buildings will be terraced houses. -# The total number of new buildings is set in total_number_of_residences_new.ad -# The start value is based on the share of terraced houses in the exisiting building stock. -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings & shares of buildings demolished -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature - -- query = UPDATE() -- share_group = households_new_residences -- priority = 4 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:Q(households_share_of_terraced) -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad deleted file mode 100644 index 91c9eba28c..0000000000 --- a/inputs/demand/households/households_number/households_new_residences_total/households_number_of_residences_new.ad +++ /dev/null @@ -1,84 +0,0 @@ -# In this input, the number of new households is set. -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand -# are updated purely based on the new total number of households. -# Once the number of new households is set the new buildigns are -# divided amongst the 4 buildings types. -# This is done based on the slider settings in households_new_buildings_share_per_type -# Finally the total number of units and useful heat demand are updated for all 4 types. - -# Priorities of related inputs are set as follows: -# - 4: shares of new buildings -# - 3: number of new buildings & number of buildings demolished -# - 2: setting weather curve -# - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration - -- query = - total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); - number_of_units_demolished = Q(number_of_demolished_residences); - number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; - number_of_new_units_future = USER_INPUT(); - total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; - - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); - - share_new_apartments = INPUT_VALUE(households_share_of_apartments) / 100; - number_new_apartments = share_new_apartments * number_of_new_units_future; - - typical_heat_new_apartments_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_apartments_future)}); - typical_surface_area_per_unit_apartments = 84.0916691776263; - typical_heat_demand_per_unit_apartments = typical_heat_new_apartments_future * typical_surface_area_per_unit_apartments; - total_heat_demand_apartments_new = number_new_apartments * typical_heat_demand_per_unit_apartments * MJ_PER_KWH; - - share_new_detached = INPUT_VALUE(households_share_of_detached) / 100; - number_new_detached = share_new_detached * number_of_new_units_future; - - typical_heat_new_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future)}); - typical_surface_area_per_unit_detached = 224.001485938283; - typical_heat_demand_per_unit_detached = typical_heat_new_detached_future * typical_surface_area_per_unit_detached; - total_heat_demand_detached_new = number_new_detached * typical_heat_demand_per_unit_detached * MJ_PER_KWH; - - share_new_semi_detached = INPUT_VALUE(households_share_of_semi_detached) / 100; - number_new_semi_detached = share_new_semi_detached * number_of_new_units_future; - - typical_heat_new_semi_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future)}); - typical_surface_area_per_unit_semi_detached = 147.709471392282; - typical_heat_demand_per_unit_semi_detached = typical_heat_new_semi_detached_future * typical_surface_area_per_unit_semi_detached; - total_heat_demand_semi_detached_new = number_new_semi_detached * typical_heat_demand_per_unit_semi_detached * MJ_PER_KWH; - - share_new_terraced = INPUT_VALUE(households_share_of_terraced) / 100; - number_new_terraced = share_new_terraced * number_of_new_units_future; - - typical_heat_new_terraced_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future)}); - typical_surface_area_per_unit_terraced = 130.419159051538; - typical_heat_demand_per_unit_terraced = typical_heat_new_terraced_future * typical_surface_area_per_unit_terraced; - total_heat_demand_terraced_new = number_new_terraced * typical_heat_demand_per_unit_terraced * MJ_PER_KWH; - - EACH( - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), - UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, total_heat_demand_apartments_new), - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, number_new_apartments), - - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, total_heat_demand_detached_new), - UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), number_of_units, number_new_detached), - - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, total_heat_demand_semi_detached_new), - UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), number_of_units, number_new_semi_detached), - - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, total_heat_demand_terraced_new), - UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, number_new_terraced), - ) -- priority = 3 -- max_value_gql = present:AREA(present_number_of_residences) -- min_value = 0.0 -- start_value = 0.0 -- step_value = 1.0 -- unit = # -- update_period = future -- update_type = mixed diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad new file mode 100644 index 0000000000..6acf8be79d --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad @@ -0,0 +1,19 @@ +# This input sets the share of new residences that will be apartments. +# The input updates nothing but is used in the input total_number_of_residences_new.ad +# +# Priorities of related inputs are set as follows: +# - 4: shares of new residences +# - 3: number of new buildings & number of buildings demolished +# - 2: settings_weather_curve_set +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration + +- query = UPDATE() +- share_group = households_new_residences +- priority = 4 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:Q(households_share_of_apartments) +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad new file mode 100644 index 0000000000..b1cb637687 --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad @@ -0,0 +1,19 @@ +# This input sets the share of new residences that will be detached houses. +# The input updates nothing but is used in the input total_number_of_residences_new.ad +# +# Priorities of related inputs are set as follows: +# - 4: shares of new residences +# - 3: number of new buildings & number of buildings demolished +# - 2: settings_weather_curve_set +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration + +- query = UPDATE() +- share_group = households_new_residences +- priority = 4 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:Q(households_share_of_detached) +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad new file mode 100644 index 0000000000..5e652514fb --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad @@ -0,0 +1,19 @@ +# This input sets the share of new residences that will be semi detached houses. +# The input updates nothing but is used in the input total_number_of_residences_new.ad +# +# Priorities of related inputs are set as follows: +# - 4: shares of new residences +# - 3: number of new buildings & number of buildings demolished +# - 2: settings_weather_curve_set +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration + +- query = UPDATE() +- share_group = households_new_residences +- priority = 4 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:Q(households_share_of_semi_detached) +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad new file mode 100644 index 0000000000..df518eb74c --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad @@ -0,0 +1,19 @@ +# This input sets the share of new residences that will be terraced houses. +# The input updates nothing but is used in the input total_number_of_residences_new.ad +# +# Priorities of related inputs are set as follows: +# - 4: shares of new residences +# - 3: number of new buildings & number of buildings demolished +# - 2: settings_weather_curve_set +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration + +- query = UPDATE() +- share_group = households_new_residences +- priority = 4 +- max_value = 100.0 +- min_value = 0.0 +- start_value_gql = present:Q(households_share_of_terraced) +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad new file mode 100644 index 0000000000..09be31f1bc --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -0,0 +1,86 @@ +# This input sets the number of new residences +# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# are updated based on the new total number of residences. +# New number of residences is subsequently distributed across the 4 residence types using +# the share inputs for new residences. +# Finally the total number of units and useful heat demand are updated for all 4 types. + +# Priorities of related inputs are set as follows: +# - 4: shares of new residences +# - 3: number of new buildings & number of buildings demolished +# - 2: settings_weather_curve_set +# - 1: insulation sliders +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration + +- query = + total_number_of_units_present = QUERY_PRESENT(-> { AREA(present_number_of_residences)}); + number_of_units_demolished = Q(number_of_demolished_residences); + number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; + number_of_new_units_future = USER_INPUT(); + total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; + relative_change = total_number_of_units_future / total_number_of_units_present; + + roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); + useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + + share_new_apartments = INPUT_VALUE(households_share_of_apartments) / 100.0; + number_new_apartments = share_new_apartments * number_of_new_units_future; + + typical_heat_new_apartments_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_apartments_future)}); + typical_surface_area_per_unit_apartments = 84.0916691776263; + typical_heat_demand_per_unit_apartments = typical_heat_new_apartments_future * typical_surface_area_per_unit_apartments; + total_heat_demand_apartments_new = number_new_apartments * typical_heat_demand_per_unit_apartments * MJ_PER_KWH; + + share_new_detached = INPUT_VALUE(households_share_of_detached) / 100.0; + number_new_detached = share_new_detached * number_of_new_units_future; + + typical_heat_new_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future)}); + typical_surface_area_per_unit_detached = 224.001485938283; + typical_heat_demand_per_unit_detached = typical_heat_new_detached_future * typical_surface_area_per_unit_detached; + total_heat_demand_detached_new = number_new_detached * typical_heat_demand_per_unit_detached * MJ_PER_KWH; + + share_new_semi_detached = INPUT_VALUE(households_share_of_semi_detached) / 100.0; + number_new_semi_detached = share_new_semi_detached * number_of_new_units_future; + + typical_heat_new_semi_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future)}); + typical_surface_area_per_unit_semi_detached = 147.709471392282; + typical_heat_demand_per_unit_semi_detached = typical_heat_new_semi_detached_future * typical_surface_area_per_unit_semi_detached; + total_heat_demand_semi_detached_new = number_new_semi_detached * typical_heat_demand_per_unit_semi_detached * MJ_PER_KWH; + + share_new_terraced = INPUT_VALUE(households_share_of_terraced) / 100.0; + number_new_terraced = share_new_terraced * number_of_new_units_future; + + typical_heat_new_terraced_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future)}); + typical_surface_area_per_unit_terraced = 130.419159051538; + typical_heat_demand_per_unit_terraced = typical_heat_new_terraced_future * typical_surface_area_per_unit_terraced; + total_heat_demand_terraced_new = number_new_terraced * typical_heat_demand_per_unit_terraced * MJ_PER_KWH; + + EACH( + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), + UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), + UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) + ), + + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, total_heat_demand_apartments_new), + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, number_new_apartments), + + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), preset_demand, total_heat_demand_detached_new), + UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), number_of_units, number_new_detached), + + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), preset_demand, total_heat_demand_semi_detached_new), + UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), number_of_units, number_new_semi_detached), + + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, total_heat_demand_terraced_new), + UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, number_new_terraced), + ) +- priority = 3 +- max_value_gql = present:AREA(present_number_of_residences) +- min_value = 0.0 +- start_value = 0.0 +- step_value = 1.0 +- unit = # +- update_period = future From 89f3edd62879d308b20d535b31b4de80b83d1350 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 13 Aug 2026 14:11:56 +0200 Subject: [PATCH 20/28] Restore accidentally removed inhabitants input --- .../households_number_of_inhabitants.ad | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 inputs/demand/households/households_population/households_number_of_inhabitants.ad diff --git a/inputs/demand/households/households_population/households_number_of_inhabitants.ad b/inputs/demand/households/households_population/households_number_of_inhabitants.ad new file mode 100644 index 0000000000..28e6f379b1 --- /dev/null +++ b/inputs/demand/households/households_population/households_number_of_inhabitants.ad @@ -0,0 +1,26 @@ +- query = + EACH( + UPDATE(AREA(), number_of_inhabitants, USER_INPUT() * MILLIONS), + UPDATE_WITH_FACTOR( + V(households_useful_demand_light, + households_useful_demand_cooking_useable_heat, + households_appliances_dishwasher_electricity, + households_appliances_fridge_freezer_electricity, + households_appliances_vacuum_cleaner_electricity, + households_appliances_washing_machine_electricity, + households_appliances_clothes_dryer_electricity, + households_appliances_television_electricity, + households_appliances_computer_media_electricity, + households_appliances_other_electricity, + households_useful_demand_hot_water + ), preset_demand, USER_INPUT() * MILLIONS / QUERY_PRESENT(-> { AREA(number_of_inhabitants) }) + ) + ) +- priority = 0 +- max_value_gql = present:AREA(number_of_inhabitants) / MILLIONS * 2 +- min_value_gql = present:AREA(number_of_inhabitants) / MILLIONS * 0.5 +- start_value_gql = present:AREA(number_of_inhabitants) / MILLIONS +- step_value = 0.1 +- unit = # +- update_period = future +- update_type = mixed From 840089778aa8974323af50c9d4f86b6b701832c4 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 13 Aug 2026 16:59:40 +0200 Subject: [PATCH 21/28] Minor improvements --- .../start_value/households_share_of_apartments.gql | 2 +- .../input_elements/start_value/households_share_of_detached.gql | 2 +- .../start_value/households_share_of_semi_detached.gql | 2 +- .../input_elements/start_value/households_share_of_terraced.gql | 2 +- .../new_residences_total/households_number_of_residences_new.ad | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gqueries/input_elements/start_value/households_share_of_apartments.gql b/gqueries/input_elements/start_value/households_share_of_apartments.gql index 3ecd52130d..a18cb8affd 100644 --- a/gqueries/input_elements/start_value/households_share_of_apartments.gql +++ b/gqueries/input_elements/start_value/households_share_of_apartments.gql @@ -1,2 +1,2 @@ - query = PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)), 100.0) -- unit = factor +- unit = share diff --git a/gqueries/input_elements/start_value/households_share_of_detached.gql b/gqueries/input_elements/start_value/households_share_of_detached.gql index a7d383edb7..30ffca2880 100644 --- a/gqueries/input_elements/start_value/households_share_of_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_detached.gql @@ -1,2 +1,2 @@ - query = PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)), 100.0) -- unit = factor +- unit = share diff --git a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql index 604127660a..b4f37cb6d1 100644 --- a/gqueries/input_elements/start_value/households_share_of_semi_detached.gql +++ b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql @@ -1,2 +1,2 @@ - query = PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)), 100.0) -- unit = factor +- unit = share diff --git a/gqueries/input_elements/start_value/households_share_of_terraced.gql b/gqueries/input_elements/start_value/households_share_of_terraced.gql index 2d575d7b4e..ab0de57aa1 100644 --- a/gqueries/input_elements/start_value/households_share_of_terraced.gql +++ b/gqueries/input_elements/start_value/households_share_of_terraced.gql @@ -1,2 +1,2 @@ - query = PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)), 100.0) -- unit = factor +- unit = share diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad index 09be31f1bc..d3e76c3c91 100644 --- a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -18,7 +18,7 @@ number_of_existing_units_future = total_number_of_units_present - number_of_units_demolished; number_of_new_units_future = USER_INPUT(); total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; - relative_change = total_number_of_units_future / total_number_of_units_present; + relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); From fab1b73cfeb77f6011727b25a40678e8d70f2d72 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 14 Aug 2026 14:04:08 +0200 Subject: [PATCH 22/28] GQL improvements --- .../households_number_of_residences_new.ad | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad index d3e76c3c91..749a32075b 100644 --- a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -20,40 +20,40 @@ total_number_of_units_future = number_of_existing_units_future + number_of_new_units_future; relative_change = DIVIDE(total_number_of_units_future, total_number_of_units_present); - roof_surface_for_pv_future = relative_change * QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)}); - useful_cooling_demand_future = relative_change * QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)}); + roof_surface_for_pv_future = PRODUCT(relative_change, QUERY_PRESENT(-> {AREA(residences_roof_surface_available_for_pv)})); + useful_cooling_demand_future = PRODUCT(relative_change, QUERY_PRESENT(-> {V(households_useful_demand_for_cooling, preset_demand)})); - share_new_apartments = INPUT_VALUE(households_share_of_apartments) / 100.0; - number_new_apartments = share_new_apartments * number_of_new_units_future; + share_new_apartments = DIVIDE(INPUT_VALUE(households_share_of_apartments), 100.0); + number_new_apartments = PRODUCT(share_new_apartments, number_of_new_units_future); typical_heat_new_apartments_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_apartments_future)}); typical_surface_area_per_unit_apartments = 84.0916691776263; - typical_heat_demand_per_unit_apartments = typical_heat_new_apartments_future * typical_surface_area_per_unit_apartments; - total_heat_demand_apartments_new = number_new_apartments * typical_heat_demand_per_unit_apartments * MJ_PER_KWH; + typical_heat_demand_per_unit_apartments = PRODUCT(typical_heat_new_apartments_future, typical_surface_area_per_unit_apartments); + total_heat_demand_apartments_new = PRODUCT(number_new_apartments, typical_heat_demand_per_unit_apartments, MJ_PER_KWH); - share_new_detached = INPUT_VALUE(households_share_of_detached) / 100.0; - number_new_detached = share_new_detached * number_of_new_units_future; + share_new_detached = DIVIDE(INPUT_VALUE(households_share_of_detached), 100.0); + number_new_detached = PRODUCT(share_new_detached, number_of_new_units_future); typical_heat_new_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future)}); typical_surface_area_per_unit_detached = 224.001485938283; - typical_heat_demand_per_unit_detached = typical_heat_new_detached_future * typical_surface_area_per_unit_detached; - total_heat_demand_detached_new = number_new_detached * typical_heat_demand_per_unit_detached * MJ_PER_KWH; + typical_heat_demand_per_unit_detached = PRODUCT(typical_heat_new_detached_future, typical_surface_area_per_unit_detached); + total_heat_demand_detached_new = PRODUCT(number_new_detached, typical_heat_demand_per_unit_detached, MJ_PER_KWH); - share_new_semi_detached = INPUT_VALUE(households_share_of_semi_detached) / 100.0; - number_new_semi_detached = share_new_semi_detached * number_of_new_units_future; + share_new_semi_detached = DIVIDE(INPUT_VALUE(households_share_of_semi_detached), 100.0); + number_new_semi_detached = PRODUCT(share_new_semi_detached, number_of_new_units_future); typical_heat_new_semi_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future)}); typical_surface_area_per_unit_semi_detached = 147.709471392282; - typical_heat_demand_per_unit_semi_detached = typical_heat_new_semi_detached_future * typical_surface_area_per_unit_semi_detached; - total_heat_demand_semi_detached_new = number_new_semi_detached * typical_heat_demand_per_unit_semi_detached * MJ_PER_KWH; + typical_heat_demand_per_unit_semi_detached = PRODUCT(typical_heat_new_semi_detached_future, typical_surface_area_per_unit_semi_detached); + total_heat_demand_semi_detached_new = PRODUCT(number_new_semi_detached, typical_heat_demand_per_unit_semi_detached, MJ_PER_KWH); - share_new_terraced = INPUT_VALUE(households_share_of_terraced) / 100.0; - number_new_terraced = share_new_terraced * number_of_new_units_future; + share_new_terraced = DIVIDE(INPUT_VALUE(households_share_of_terraced), 100.0); + number_new_terraced = PRODUCT(share_new_terraced, number_of_new_units_future); typical_heat_new_terraced_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future)}); typical_surface_area_per_unit_terraced = 130.419159051538; - typical_heat_demand_per_unit_terraced = typical_heat_new_terraced_future * typical_surface_area_per_unit_terraced; - total_heat_demand_terraced_new = number_new_terraced * typical_heat_demand_per_unit_terraced * MJ_PER_KWH; + typical_heat_demand_per_unit_terraced = PRODUCT(typical_heat_new_terraced_future, typical_surface_area_per_unit_terraced); + total_heat_demand_terraced_new = PRODUCT(number_new_terraced, typical_heat_demand_per_unit_terraced, MJ_PER_KWH); EACH( UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), From 7f48bb41b469435e3f56fdea88821ab2e7795990 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 09:45:49 +0200 Subject: [PATCH 23/28] Adjust household batteries number of units for quintel/etsource#3473 The priority of the market share is 0 so it is set after all housing stock sliders. The number of units in the start year is always 0 as well. The reference to the households p2p can therefore be removed from all housing stock sliders. The QUERY FUTURE did not work, so it is replaced by referring to INPUT VALUES and AREA attributes. --- .../households_demolished_1945_1964.ad | 6 ------ .../households_demolished_1965_1984.ad | 6 ------ .../households_demolished_1985_2004.ad | 6 ------ .../households_demolished_2005_present.ad | 6 ------ .../households_demolished_before_1945.ad | 6 ------ .../households_number_of_residences_new.ad | 8 +------- ...lity_p2p_electricity_market_penetration.ad | 20 ++++++++++++++++--- 7 files changed, 18 insertions(+), 40 deletions(-) diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad index 3b6bac8d85..969157e283 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad @@ -32,12 +32,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE_WITH_FACTOR(V(G(households_1945_1964)), preset_demand, relative_change_1945_1964), UPDATE_WITH_FACTOR(V(G(households_1945_1964)), number_of_units, relative_change_1945_1964), ) diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad index d0dd639834..814647518e 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad @@ -32,12 +32,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE_WITH_FACTOR(V(G(households_1965_1984)), preset_demand, relative_change_1965_1984), UPDATE_WITH_FACTOR(V(G(households_1965_1984)), number_of_units, relative_change_1965_1984), ) diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad index f0a2898d03..3ac3fbb60d 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad @@ -32,12 +32,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE_WITH_FACTOR(V(G(households_1985_2004)), preset_demand, relative_change_1985_2004), UPDATE_WITH_FACTOR(V(G(households_1985_2004)), number_of_units, relative_change_1985_2004), ) diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad index 1ef9dc258d..461519fa96 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad @@ -32,12 +32,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE_WITH_FACTOR(V(G(households_2005_present)), preset_demand, relative_change_2005_present), UPDATE_WITH_FACTOR(V(G(households_2005_present)), number_of_units, relative_change_2005_present), ) diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad index 241d32e55e..3ca820e3a3 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad @@ -32,12 +32,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_residences_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_residences_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE_WITH_FACTOR(V(G(households_before_1945)), preset_demand, relative_change_before_1945), UPDATE_WITH_FACTOR(V(G(households_before_1945)), number_of_units, relative_change_before_1945), ) diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad index 749a32075b..22f27391bb 100644 --- a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -1,5 +1,5 @@ # This input sets the number of new residences -# The hot water demand, number of unites for p2p electricity, roof area for PV and cooling demand +# The hot water demand, roof area for PV and cooling demand # are updated based on the new total number of residences. # New number of residences is subsequently distributed across the 4 residence types using # the share inputs for new residences. @@ -59,12 +59,6 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), - UPDATE( - V(households_flexibility_p2p_electricity), - number_of_units, - PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0)) - ), - UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, total_heat_demand_apartments_new), UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, number_new_apartments), diff --git a/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad b/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad index 134a2c6f7d..524920c029 100644 --- a/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad +++ b/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad @@ -1,7 +1,21 @@ - query = - UPDATE( - V(households_flexibility_p2p_electricity), number_of_units, (USER_INPUT() / 100.0) * QUERY_FUTURE(-> { Q(number_of_residences) }) - ) + number_of_residences_start_year = QUERY_PRESENT(-> { AREA(present_number_of_residences) }); + number_of_residences_demolished = SUM( + INPUT_VALUE(households_demolished_before_1945), + INPUT_VALUE(households_demolished_1945_1964), + INPUT_VALUE(households_demolished_1965_1984), + INPUT_VALUE(households_demolished_1985_2004), + INPUT_VALUE(households_demolished_2005_present) + ); + number_of_residences_built = INPUT_VALUE(households_number_of_residences_new); + number_of_residences_future_year = number_of_residences_start_year + number_of_residences_built - number_of_residences_demolished; + + UPDATE( + V(households_flexibility_p2p_electricity), + number_of_units, + (USER_INPUT() / 100.0) * number_of_residences_future_year + ) + - priority = 0 - max_value = 100.0 - min_value = 0.0 From 7181b98ce4d1657900617e54a802deff6b118f58 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 10:26:31 +0200 Subject: [PATCH 24/28] Add reference to households batteries in behaviour input --- .../households_demand/households_space_heating_behaviour.ad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inputs/demand/households/households_demand/households_space_heating_behaviour.ad b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad index 61536fcacd..016ff60c65 100644 --- a/inputs/demand/households/households_demand/households_space_heating_behaviour.ad +++ b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad @@ -5,7 +5,7 @@ # - 3: number of new buildings & number of buildings demolished # - 2: settings_weather_curve_set # - 1: insulation sliders -# - 0: behaviour slider & outdoor temperature +# - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad - query = relative_change = DIVIDE((100.0 + USER_INPUT()), 100.0); From a6a9467a4f781966288f27e738347c9dc57cb6d5 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 14:53:13 +0200 Subject: [PATCH 25/28] Update description to show impact of weather set --- .../households_demand/households_space_heating_behaviour.ad | 2 +- .../households_insulation/households_insulation_1945_1964.ad | 2 +- .../households_insulation/households_insulation_1965_1984.ad | 2 +- .../households_insulation/households_insulation_1985_2004.ad | 2 +- .../households_insulation/households_insulation_2005_present.ad | 2 +- .../households_insulation/households_insulation_before_1945.ad | 2 +- .../households_insulation_new_residences.ad | 2 +- .../demolished_residences/households_demolished_1945_1964.ad | 2 +- .../demolished_residences/households_demolished_1965_1984.ad | 2 +- .../demolished_residences/households_demolished_1985_2004.ad | 2 +- .../demolished_residences/households_demolished_2005_present.ad | 2 +- .../demolished_residences/households_demolished_before_1945.ad | 2 +- .../households_share_of_apartments.ad | 2 +- .../households_share_of_detached.ad | 2 +- .../households_share_of_semi_detached.ad | 2 +- .../households_share_of_terraced.ad | 2 +- .../new_residences_total/households_number_of_residences_new.ad | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/inputs/demand/households/households_demand/households_space_heating_behaviour.ad b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad index 016ff60c65..64ed1e27d4 100644 --- a/inputs/demand/households/households_demand/households_space_heating_behaviour.ad +++ b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad @@ -3,7 +3,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad index 327b92d873..bc76f2282a 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -7,7 +7,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad index 42b50957bd..ccbecc622b 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -7,7 +7,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad index d193b6cb09..8010127d08 100644 --- a/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -7,7 +7,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad index 59438b0a80..9f6cfd9703 100644 --- a/inputs/demand/households/households_insulation/households_insulation_2005_present.ad +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -7,7 +7,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad index 83400c54f7..6b0701cd05 100644 --- a/inputs/demand/households/households_insulation/households_insulation_before_1945.ad +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -6,7 +6,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_insulation/households_insulation_new_residences.ad b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad index d5dd12b7bc..a63f919547 100644 --- a/inputs/demand/households/households_insulation/households_insulation_new_residences.ad +++ b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad @@ -6,7 +6,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad index 969157e283..1f4418103b 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad @@ -5,7 +5,7 @@ # Related priorities are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad index 814647518e..644ab7438c 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad @@ -5,7 +5,7 @@ # Related priorities are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad index 3ac3fbb60d..24d0f183d2 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad @@ -5,7 +5,7 @@ # Related priorities are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad index 461519fa96..399d58f65f 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad @@ -5,7 +5,7 @@ # Related priorities are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad index 3ca820e3a3..455d4b0824 100644 --- a/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad @@ -5,7 +5,7 @@ # Related priorities are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration.ad diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad index 6acf8be79d..d3b4672fbd 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad @@ -4,7 +4,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad index b1cb637687..8ec6f345a6 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad @@ -4,7 +4,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad index 5e652514fb..0676b699f9 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad @@ -4,7 +4,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad index df518eb74c..ebbe790e50 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad @@ -4,7 +4,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad index 22f27391bb..6a606f67fa 100644 --- a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -8,7 +8,7 @@ # Priorities of related inputs are set as follows: # - 4: shares of new residences # - 3: number of new buildings & number of buildings demolished -# - 2: settings_weather_curve_set +# - 2: settings_weather_curve_set (if set, this overrides the outdoor temperature input) # - 1: insulation sliders # - 0: behaviour slider & outdoor temperature & households_flexibility_p2p_electricity_market_penetration From 8df61977fa2dba3427ce3e2cd3ccb2f6e42d2066 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 15:20:27 +0200 Subject: [PATCH 26/28] Simplify households battery query --- ...olds_flexibility_p2p_electricity_market_penetration.ad | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad b/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad index 524920c029..fbf628a6cb 100644 --- a/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad +++ b/inputs/flexibility/households/households_flexibility_p2p_electricity_market_penetration.ad @@ -1,12 +1,6 @@ - query = number_of_residences_start_year = QUERY_PRESENT(-> { AREA(present_number_of_residences) }); - number_of_residences_demolished = SUM( - INPUT_VALUE(households_demolished_before_1945), - INPUT_VALUE(households_demolished_1945_1964), - INPUT_VALUE(households_demolished_1965_1984), - INPUT_VALUE(households_demolished_1985_2004), - INPUT_VALUE(households_demolished_2005_present) - ); + number_of_residences_demolished = QUERY_FUTURE(number_of_demolished_residences); number_of_residences_built = INPUT_VALUE(households_number_of_residences_new); number_of_residences_future_year = number_of_residences_start_year + number_of_residences_built - number_of_residences_demolished; From 2eeb5ca9cb3a9a5cbf16b227cdbaf58e6e855f37 Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 15:27:00 +0200 Subject: [PATCH 27/28] Update reference to correct input key --- .../households_share_of_apartments.ad | 2 +- .../households_share_of_detached.ad | 2 +- .../households_share_of_semi_detached.ad | 2 +- .../households_share_of_terraced.ad | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad index d3b4672fbd..421e33a506 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_apartments.ad @@ -1,5 +1,5 @@ # This input sets the share of new residences that will be apartments. -# The input updates nothing but is used in the input total_number_of_residences_new.ad +# The input updates nothing but is used in the input households_number_of_residences_new.ad # # Priorities of related inputs are set as follows: # - 4: shares of new residences diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad index 8ec6f345a6..4b506d3dc6 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_detached.ad @@ -1,5 +1,5 @@ # This input sets the share of new residences that will be detached houses. -# The input updates nothing but is used in the input total_number_of_residences_new.ad +# The input updates nothing but is used in the input households_number_of_residences_new.ad # # Priorities of related inputs are set as follows: # - 4: shares of new residences diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad index 0676b699f9..13f1e565f3 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_semi_detached.ad @@ -1,5 +1,5 @@ # This input sets the share of new residences that will be semi detached houses. -# The input updates nothing but is used in the input total_number_of_residences_new.ad +# The input updates nothing but is used in the input households_number_of_residences_new.ad # # Priorities of related inputs are set as follows: # - 4: shares of new residences diff --git a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad index ebbe790e50..006e7e6609 100644 --- a/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad +++ b/inputs/demand/households/households_number/new_residences_share_per_type/households_share_of_terraced.ad @@ -1,5 +1,5 @@ # This input sets the share of new residences that will be terraced houses. -# The input updates nothing but is used in the input total_number_of_residences_new.ad +# The input updates nothing but is used in the input households_number_of_residences_new.ad # # Priorities of related inputs are set as follows: # - 4: shares of new residences From 7612a269b6a72b0e7e7bb64c2017e6f64e3c52ff Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Thu, 20 Aug 2026 15:28:56 +0200 Subject: [PATCH 28/28] Change spacing for clarity --- .../households_number_of_residences_new.ad | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad index 6a606f67fa..fa956df099 100644 --- a/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -25,7 +25,6 @@ share_new_apartments = DIVIDE(INPUT_VALUE(households_share_of_apartments), 100.0); number_new_apartments = PRODUCT(share_new_apartments, number_of_new_units_future); - typical_heat_new_apartments_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_apartments_future)}); typical_surface_area_per_unit_apartments = 84.0916691776263; typical_heat_demand_per_unit_apartments = PRODUCT(typical_heat_new_apartments_future, typical_surface_area_per_unit_apartments); @@ -33,7 +32,6 @@ share_new_detached = DIVIDE(INPUT_VALUE(households_share_of_detached), 100.0); number_new_detached = PRODUCT(share_new_detached, number_of_new_units_future); - typical_heat_new_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_detached_houses_future)}); typical_surface_area_per_unit_detached = 224.001485938283; typical_heat_demand_per_unit_detached = PRODUCT(typical_heat_new_detached_future, typical_surface_area_per_unit_detached); @@ -41,7 +39,6 @@ share_new_semi_detached = DIVIDE(INPUT_VALUE(households_share_of_semi_detached), 100.0); number_new_semi_detached = PRODUCT(share_new_semi_detached, number_of_new_units_future); - typical_heat_new_semi_detached_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_semi_detached_houses_future)}); typical_surface_area_per_unit_semi_detached = 147.709471392282; typical_heat_demand_per_unit_semi_detached = PRODUCT(typical_heat_new_semi_detached_future, typical_surface_area_per_unit_semi_detached); @@ -49,7 +46,6 @@ share_new_terraced = DIVIDE(INPUT_VALUE(households_share_of_terraced), 100.0); number_new_terraced = PRODUCT(share_new_terraced, number_of_new_units_future); - typical_heat_new_terraced_future = QUERY_FUTURE(-> { AREA(typical_useful_demand_for_space_heating_terraced_houses_future)}); typical_surface_area_per_unit_terraced = 130.419159051538; typical_heat_demand_per_unit_terraced = PRODUCT(typical_heat_new_terraced_future, typical_surface_area_per_unit_terraced); @@ -59,6 +55,7 @@ UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), UPDATE(AREA(), residences_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(households_useful_demand_for_cooling), preset_demand, useful_cooling_demand_future), + UPDATE(V(households_useful_demand_for_space_heating_apartments_future), preset_demand, total_heat_demand_apartments_new), UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, number_new_apartments), @@ -71,6 +68,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), preset_demand, total_heat_demand_terraced_new), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, number_new_terraced), ) + - priority = 3 - max_value_gql = present:AREA(present_number_of_residences) - min_value = 0.0