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) }); 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..2d12eb83e9 --- /dev/null +++ b/gqueries/general/number_of_units/number_of_demolished_residences.gql @@ -0,0 +1,9 @@ +- 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 new file mode 100644 index 0000000000..a18cb8affd --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_apartments.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(number_of_apartments), Q(number_of_residences)), 100.0) +- 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 new file mode 100644 index 0000000000..30ffca2880 --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_detached.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(number_of_detached_houses), Q(number_of_residences)), 100.0) +- 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 new file mode 100644 index 0000000000..b4f37cb6d1 --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_semi_detached.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(number_of_semi_detached_houses), Q(number_of_residences)), 100.0) +- 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 new file mode 100644 index 0000000000..ab0de57aa1 --- /dev/null +++ b/gqueries/input_elements/start_value/households_share_of_terraced.gql @@ -0,0 +1,2 @@ +- query = PRODUCT(DIVIDE(Q(number_of_terraced_houses), Q(number_of_residences)), 100.0) +- unit = share 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_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_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 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..5dbd4c7e93 --- /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.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 = 100.0 +- min_value = 0.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..4dbac3bd48 --- /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.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 = 100.0 +- min_value = 0.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..9aba62f5bb --- /dev/null +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_demolished.ad @@ -0,0 +1,42 @@ +# 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) +# - 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 +# 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 = 3 +- 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..7f7052612e --- /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) +# - 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 = + 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; + + 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_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), + 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 = 3 +- 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 diff --git a/inputs/demand/households/households_demand/households_space_heating_behaviour.ad b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad new file mode 100644 index 0000000000..64ed1e27d4 --- /dev/null +++ b/inputs/demand/households/households_demand/households_space_heating_behaviour.ad @@ -0,0 +1,50 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + relative_change = DIVIDE((100.0 + USER_INPUT()), 100.0); + + 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 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..bc76f2282a --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1945_1964.ad @@ -0,0 +1,39 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future 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..ccbecc622b --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1965_1984.ad @@ -0,0 +1,39 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future 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..8010127d08 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_1985_2004.ad @@ -0,0 +1,39 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future 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..9f6cfd9703 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_2005_present.ad @@ -0,0 +1,39 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future 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..6b0701cd05 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_before_1945.ad @@ -0,0 +1,38 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future diff --git a/inputs/demand/households/households_insulation/households_insulation_level_apartments_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_1945_1964.ad deleted file mode 100644 index 1915bc3424..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_apartments_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_1965_1984.ad deleted file mode 100644 index b2f1999d1c..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_apartments_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_1985_2004.ad deleted file mode 100644 index 19d352fc7d..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_apartments_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_2005_present.ad deleted file mode 100644 index 953c96fb46..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_apartments_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_before_1945.ad deleted file mode 100644 index 438c23b266..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_apartments_future.ad b/inputs/demand/households/households_insulation/households_insulation_level_apartments_future.ad deleted file mode 100644 index d3843f04d3..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1945_1964.ad deleted file mode 100644 index be21d381c6..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1965_1984.ad deleted file mode 100644 index da684d2ac4..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_1985_2004.ad deleted file mode 100644 index 2c1a3db895..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_2005_present.ad deleted file mode 100644 index 2bb5114a89..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_before_1945.ad deleted file mode 100644 index ca0b61241b..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_detached_houses_future.ad b/inputs/demand/households/households_insulation/households_insulation_level_detached_houses_future.ad deleted file mode 100644 index aa1d2d0950..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1945_1964.ad deleted file mode 100644 index 4640e0a07c..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1965_1984.ad deleted file mode 100644 index 6f6b4a8b32..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_1985_2004.ad deleted file mode 100644 index b5a376219f..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_2005_present.ad deleted file mode 100644 index 3d4e3868e7..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_before_1945.ad deleted file mode 100644 index cb5620013f..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_semi_detached_houses_future.ad b/inputs/demand/households/households_insulation/households_insulation_level_semi_detached_houses_future.ad deleted file mode 100644 index f61e21252f..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_1945_1964.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1945_1964.ad deleted file mode 100644 index 52def98014..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_1965_1984.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1965_1984.ad deleted file mode 100644 index 5ebe7337d1..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_1985_2004.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_1985_2004.ad deleted file mode 100644 index 0ccc6b2297..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_2005_present.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_2005_present.ad deleted file mode 100644 index fc9c776d2f..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_before_1945.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_before_1945.ad deleted file mode 100644 index 03eaf21214..0000000000 --- a/inputs/demand/households/households_insulation/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/households_insulation_level_terraced_houses_future.ad b/inputs/demand/households/households_insulation/households_insulation_level_terraced_houses_future.ad deleted file mode 100644 index 6320c8591b..0000000000 --- a/inputs/demand/households/households_insulation/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_insulation/households_insulation_new_residences.ad b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad new file mode 100644 index 0000000000..a63f919547 --- /dev/null +++ b/inputs/demand/households/households_insulation/households_insulation_new_residences.ad @@ -0,0 +1,38 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- query = + 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), + 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 = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future 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 new file mode 100644 index 0000000000..1f4418103b --- /dev/null +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1945_1964.ad @@ -0,0 +1,44 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- 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(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/demolished_residences/households_demolished_1965_1984.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad new file mode 100644 index 0000000000..644ab7438c --- /dev/null +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1965_1984.ad @@ -0,0 +1,44 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- 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(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/demolished_residences/households_demolished_1985_2004.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad new file mode 100644 index 0000000000..24d0f183d2 --- /dev/null +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_1985_2004.ad @@ -0,0 +1,44 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- 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(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/demolished_residences/households_demolished_2005_present.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad new file mode 100644 index 0000000000..399d58f65f --- /dev/null +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_2005_present.ad @@ -0,0 +1,44 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- 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(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/demolished_residences/households_demolished_before_1945.ad b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad new file mode 100644 index 0000000000..455d4b0824 --- /dev/null +++ b/inputs/demand/households/households_number/demolished_residences/households_demolished_before_1945.ad @@ -0,0 +1,44 @@ +# 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 residences +# - 3: number of new buildings & number of buildings demolished +# - 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 + +- 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(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_number_of_apartments_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad deleted file mode 100644 index 06d4b94cca..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_apartments_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad deleted file mode 100644 index 8e5140d7d9..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_apartments_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad deleted file mode 100644 index e1b064202c..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_apartments_2005_present.ad b/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad deleted file mode 100644 index 858ea284c5..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_apartments_before_1945.ad b/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad deleted file mode 100644 index b5d45df19c..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_apartments_future.ad b/inputs/demand/households/households_number/households_number_of_apartments_future.ad deleted file mode 100644 index af9db9e35a..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad deleted file mode 100644 index 69a5f76317..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad deleted file mode 100644 index c4abb3d540..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad deleted file mode 100644 index f9e5d8775a..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad deleted file mode 100644 index 5b7505ac04..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad deleted file mode 100644 index 22d1fd7f8d..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_detached_houses_future.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad deleted file mode 100644 index aa710c1519..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad deleted file mode 100644 index f0e2537565..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad deleted file mode 100644 index 6fbd47da6e..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad deleted file mode 100644 index aa31ac7c34..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad deleted file mode 100644 index cc7edce138..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad deleted file mode 100644 index 7465347777..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_semi_detached_houses_future.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad deleted file mode 100644 index 2e01e4e102..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad deleted file mode 100644 index bb62e269bc..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad deleted file mode 100644 index 5e9f1a4fd8..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad deleted file mode 100644 index cf384adfb5..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad deleted file mode 100644 index c426069682..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad deleted file mode 100644 index 8708ec0bb3..0000000000 --- a/inputs/demand/households/households_number/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/households_number_of_terraced_houses_future.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad deleted file mode 100644 index ed53c30307..0000000000 --- a/inputs/demand/households/households_number/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/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..421e33a506 --- /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 households_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 (if set, this overrides the outdoor temperature input) +# - 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..4b506d3dc6 --- /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 households_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 (if set, this overrides the outdoor temperature input) +# - 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..13f1e565f3 --- /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 households_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 (if set, this overrides the outdoor temperature input) +# - 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..006e7e6609 --- /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 households_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 (if set, this overrides the outdoor temperature input) +# - 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..fa956df099 --- /dev/null +++ b/inputs/demand/households/households_number/new_residences_total/households_number_of_residences_new.ad @@ -0,0 +1,78 @@ +# This input sets the number of new residences +# 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. +# 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 (if set, this overrides the outdoor temperature input) +# - 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 = 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)})); + + 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); + total_heat_demand_apartments_new = PRODUCT(number_new_apartments, typical_heat_demand_per_unit_apartments, MJ_PER_KWH); + + 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); + total_heat_demand_detached_new = PRODUCT(number_new_detached, typical_heat_demand_per_unit_detached, MJ_PER_KWH); + + 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); + total_heat_demand_semi_detached_new = PRODUCT(number_new_semi_detached, typical_heat_demand_per_unit_semi_detached, MJ_PER_KWH); + + 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); + 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), + 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 diff --git a/inputs/demand/households/households_number/households_number_of_inhabitants.ad b/inputs/demand/households/households_population/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_population/households_number_of_inhabitants.ad 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..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,7 +1,15 @@ - 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 = 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; + + 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