diff --git a/config/energy_node_positions.yml b/config/energy_node_positions.yml index be56e7522f..d2c33187a2 100644 --- a/config/energy_node_positions.yml +++ b/config/energy_node_positions.yml @@ -251,12 +251,6 @@ buildings_lighting_efficient_fluorescent_electricity: buildings_lighting_led_electricity: x: 1520 "y": 9700 -buildings_lighting_savings_from_daylight_control_light: - x: 580 - "y": 9720 -buildings_lighting_savings_from_motion_detection_light: - x: 200 - "y": 9720 buildings_lighting_standard_fluorescent_electricity: x: 1520 "y": 9760 @@ -371,12 +365,6 @@ buildings_space_heater_wood_pellets_aggregator: buildings_useful_demand_after_insulation_cooling: x: 740 "y": 9320 -buildings_useful_demand_after_motion_detection_daylight_control_light: - x: 740 - "y": 9620 -buildings_useful_demand_after_motion_detection_light: - x: 380 - "y": 9620 buildings_useful_demand_cooling: x: 40 "y": 9320 @@ -396,8 +384,8 @@ buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: x: 500 "y": 8600 buildings_useful_demand_light: - x: 40 - "y": 9620 + x: 740 + "y": 9640 bunkers_aviation_mixer_kerosene: x: 1960 "y": 18080 diff --git a/datasets/eu/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv b/datasets/eu/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv deleted file mode 100644 index 418c74288e..0000000000 --- a/datasets/eu/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_daylight_control_light,9.47000000000000E-01 -buildings_lighting_savings_from_daylight_control_light,5.30000000000000E-02 \ No newline at end of file diff --git a/datasets/eu/shares/energy/buildings_useful_demand_light_child_share.csv b/datasets/eu/shares/energy/buildings_useful_demand_light_child_share.csv deleted file mode 100644 index 037c632eb5..0000000000 --- a/datasets/eu/shares/energy/buildings_useful_demand_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_light,9.61000000000000E-01 -buildings_lighting_savings_from_motion_detection_light,3.90000000000000E-02 \ No newline at end of file diff --git a/datasets/nl/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv b/datasets/nl/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv deleted file mode 100644 index 418c74288e..0000000000 --- a/datasets/nl/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_daylight_control_light,9.47000000000000E-01 -buildings_lighting_savings_from_daylight_control_light,5.30000000000000E-02 \ No newline at end of file diff --git a/datasets/nl/shares/energy/buildings_useful_demand_light_child_share.csv b/datasets/nl/shares/energy/buildings_useful_demand_light_child_share.csv deleted file mode 100644 index 037c632eb5..0000000000 --- a/datasets/nl/shares/energy/buildings_useful_demand_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_light,9.61000000000000E-01 -buildings_lighting_savings_from_motion_detection_light,3.90000000000000E-02 \ No newline at end of file diff --git a/datasets/nl2019/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv b/datasets/nl2019/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv deleted file mode 100644 index 418c74288e..0000000000 --- a/datasets/nl2019/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_daylight_control_light,9.47000000000000E-01 -buildings_lighting_savings_from_daylight_control_light,5.30000000000000E-02 \ No newline at end of file diff --git a/datasets/nl2019/shares/energy/buildings_useful_demand_light_child_share.csv b/datasets/nl2019/shares/energy/buildings_useful_demand_light_child_share.csv deleted file mode 100644 index 037c632eb5..0000000000 --- a/datasets/nl2019/shares/energy/buildings_useful_demand_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_light,9.61000000000000E-01 -buildings_lighting_savings_from_motion_detection_light,3.90000000000000E-02 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv b/datasets/nl2023/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv deleted file mode 100644 index 418c74288e..0000000000 --- a/datasets/nl2023/shares/energy/buildings_useful_demand_after_motion_detection_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_daylight_control_light,9.47000000000000E-01 -buildings_lighting_savings_from_daylight_control_light,5.30000000000000E-02 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/buildings_useful_demand_light_child_share.csv b/datasets/nl2023/shares/energy/buildings_useful_demand_light_child_share.csv deleted file mode 100644 index 037c632eb5..0000000000 --- a/datasets/nl2023/shares/energy/buildings_useful_demand_light_child_share.csv +++ /dev/null @@ -1,3 +0,0 @@ -key,share -buildings_useful_demand_after_motion_detection_light,9.61000000000000E-01 -buildings_lighting_savings_from_motion_detection_light,3.90000000000000E-02 \ No newline at end of file diff --git a/graphs/energy/edges/buildings/buildings_lighting_efficient_fluorescent_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad b/graphs/energy/edges/buildings/buildings_lighting_efficient_fluorescent_electricity-buildings_useful_demand_light@light.ad similarity index 100% rename from graphs/energy/edges/buildings/buildings_lighting_efficient_fluorescent_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad rename to graphs/energy/edges/buildings/buildings_lighting_efficient_fluorescent_electricity-buildings_useful_demand_light@light.ad diff --git a/graphs/energy/edges/buildings/buildings_lighting_led_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad b/graphs/energy/edges/buildings/buildings_lighting_led_electricity-buildings_useful_demand_light@light.ad similarity index 100% rename from graphs/energy/edges/buildings/buildings_lighting_led_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad rename to graphs/energy/edges/buildings/buildings_lighting_led_electricity-buildings_useful_demand_light@light.ad diff --git a/graphs/energy/edges/buildings/buildings_lighting_savings_from_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad b/graphs/energy/edges/buildings/buildings_lighting_savings_from_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad deleted file mode 100644 index 1716b1465e..0000000000 --- a/graphs/energy/edges/buildings/buildings_lighting_savings_from_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad +++ /dev/null @@ -1,2 +0,0 @@ -- type = share -- reversed = false diff --git a/graphs/energy/edges/buildings/buildings_lighting_savings_from_motion_detection_light-buildings_useful_demand_light@light.ad b/graphs/energy/edges/buildings/buildings_lighting_savings_from_motion_detection_light-buildings_useful_demand_light@light.ad deleted file mode 100644 index 1716b1465e..0000000000 --- a/graphs/energy/edges/buildings/buildings_lighting_savings_from_motion_detection_light-buildings_useful_demand_light@light.ad +++ /dev/null @@ -1,2 +0,0 @@ -- type = share -- reversed = false diff --git a/graphs/energy/edges/buildings/buildings_lighting_standard_fluorescent_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad b/graphs/energy/edges/buildings/buildings_lighting_standard_fluorescent_electricity-buildings_useful_demand_light@light.ad similarity index 100% rename from graphs/energy/edges/buildings/buildings_lighting_standard_fluorescent_electricity-buildings_useful_demand_after_motion_detection_daylight_control_light@light.ad rename to graphs/energy/edges/buildings/buildings_lighting_standard_fluorescent_electricity-buildings_useful_demand_light@light.ad diff --git a/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad b/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad deleted file mode 100644 index a3170b89c4..0000000000 --- a/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light-buildings_useful_demand_after_motion_detection_light@light.ad +++ /dev/null @@ -1,5 +0,0 @@ -- type = flexible -- reversed = false -- groups = [] - -~ child_share = SHARE("energy/buildings_useful_demand_after_motion_detection_light_child_share", buildings_useful_demand_after_motion_detection_daylight_control_light) diff --git a/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_light-buildings_useful_demand_light@light.ad b/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_light-buildings_useful_demand_light@light.ad deleted file mode 100644 index c703758362..0000000000 --- a/graphs/energy/edges/buildings/buildings_useful_demand_after_motion_detection_light-buildings_useful_demand_light@light.ad +++ /dev/null @@ -1,5 +0,0 @@ -- type = flexible -- reversed = false -- groups = [] - -~ child_share = SHARE("energy/buildings_useful_demand_light_child_share", buildings_useful_demand_after_motion_detection_light) diff --git a/graphs/energy/nodes/buildings/buildings_lighting_savings_from_daylight_control_light.ad b/graphs/energy/nodes/buildings/buildings_lighting_savings_from_daylight_control_light.ad deleted file mode 100644 index 53a29d1a18..0000000000 --- a/graphs/energy/nodes/buildings/buildings_lighting_savings_from_daylight_control_light.ad +++ /dev/null @@ -1,5 +0,0 @@ -- use = energetic -- groups = [] -- availability = 0.0 -- free_co2_factor = 0.0 -- full_load_hours = 0.0 diff --git a/graphs/energy/nodes/buildings/buildings_lighting_savings_from_motion_detection_light.ad b/graphs/energy/nodes/buildings/buildings_lighting_savings_from_motion_detection_light.ad deleted file mode 100644 index 53a29d1a18..0000000000 --- a/graphs/energy/nodes/buildings/buildings_lighting_savings_from_motion_detection_light.ad +++ /dev/null @@ -1,5 +0,0 @@ -- use = energetic -- groups = [] -- availability = 0.0 -- free_co2_factor = 0.0 -- full_load_hours = 0.0 diff --git a/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light.demand.ad b/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light.demand.ad deleted file mode 100644 index 5fda57d831..0000000000 --- a/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_daylight_control_light.demand.ad +++ /dev/null @@ -1,3 +0,0 @@ -- use = energetic -- groups = [useful_demand, useful_demand_electric] -- free_co2_factor = 0.0 diff --git a/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_light.demand.ad b/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_light.demand.ad deleted file mode 100644 index fed57fb59c..0000000000 --- a/graphs/energy/nodes/buildings/buildings_useful_demand_after_motion_detection_light.demand.ad +++ /dev/null @@ -1,3 +0,0 @@ -- use = energetic -- groups = [] -- free_co2_factor = 0.0 diff --git a/graphs/energy/nodes/buildings/buildings_useful_demand_light.demand.ad b/graphs/energy/nodes/buildings/buildings_useful_demand_light.ad similarity index 50% rename from graphs/energy/nodes/buildings/buildings_useful_demand_light.demand.ad rename to graphs/energy/nodes/buildings/buildings_useful_demand_light.ad index c1818ed3ed..b64b4c6faf 100644 --- a/graphs/energy/nodes/buildings/buildings_useful_demand_light.demand.ad +++ b/graphs/energy/nodes/buildings/buildings_useful_demand_light.ad @@ -1,3 +1,3 @@ - use = energetic -- groups = [preset_demand] +- groups = [preset_demand, useful_demand] - free_co2_factor = 0.0 diff --git a/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad new file mode 100644 index 0000000000..228c1508ce --- /dev/null +++ b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_appliances.ad @@ -0,0 +1,21 @@ +# 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 set, this input does nothing and the net effect of both inputs is +# set in the efficiency input + +- query = + IF( + INPUT_VALUE(buildings_appliances_efficiency) > 0.0, + -> {}, + -> {UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, USER_INPUT())} + ) + +- priority = 1 +- max_value = 5.0 +- min_value = -5.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = %y diff --git a/inputs/demand/buildings/buildings_misc/buildings_useful_demand_cooling.ad b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_cooling.ad similarity index 100% rename from inputs/demand/buildings/buildings_misc/buildings_useful_demand_cooling.ad rename to inputs/demand/buildings/buildings_demand/buildings_useful_demand_cooling.ad diff --git a/inputs/demand/buildings/buildings_misc/buildings_useful_demand_electricity.ad b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_lighting.ad similarity index 55% rename from inputs/demand/buildings/buildings_misc/buildings_useful_demand_electricity.ad rename to inputs/demand/buildings/buildings_demand/buildings_useful_demand_lighting.ad index 9e26e1d8a3..b9e2a73063 100644 --- a/inputs/demand/buildings/buildings_misc/buildings_useful_demand_electricity.ad +++ b/inputs/demand/buildings/buildings_demand/buildings_useful_demand_lighting.ad @@ -1,4 +1,4 @@ -- query = UPDATE(V(buildings_useful_demand_for_appliances,buildings_useful_demand_light), preset_demand, USER_INPUT()) +- query = UPDATE(V(buildings_useful_demand_light), preset_demand, USER_INPUT()) - priority = 0 - max_value = 5.0 - min_value = -5.0 diff --git a/inputs/demand/buildings/buildings_efficiency/buildings_appliances_efficiency.ad b/inputs/demand/buildings/buildings_efficiency/buildings_appliances_efficiency.ad new file mode 100644 index 0000000000..3e02494875 --- /dev/null +++ b/inputs/demand/buildings/buildings_efficiency/buildings_appliances_efficiency.ad @@ -0,0 +1,21 @@ +# 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 updated by the useful demand input +# When the efficiency is set, the useful demand input does nothing and the net effect of both +# inputs is set here + +- query = + buildings_appliances_efficiency_change = USER_INPUT(); + buildings_appliances_demand_change = DIVIDE(INPUT_VALUE(buildings_useful_demand_appliances),100.0); + buildings_appliances_net_change = SUM(buildings_appliances_demand_change, NEG(buildings_appliances_efficiency_change)); + + UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, buildings_appliances_net_change) + +- priority = 0 +- max_value = 5.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = %y diff --git a/inputs/demand/buildings/buildings_lighting/buildings_lighting_efficient_fluorescent_electricity_share.ad b/inputs/demand/buildings/buildings_lighting/buildings_lighting_efficient_fluorescent_electricity_share.ad index e5b5ac677b..968e29b58d 100644 --- a/inputs/demand/buildings/buildings_lighting/buildings_lighting_efficient_fluorescent_electricity_share.ad +++ b/inputs/demand/buildings/buildings_lighting/buildings_lighting_efficient_fluorescent_electricity_share.ad @@ -1,6 +1,6 @@ - query = UPDATE( - EDGE(buildings_lighting_efficient_fluorescent_electricity, buildings_useful_demand_after_motion_detection_daylight_control_light), + EDGE(buildings_lighting_efficient_fluorescent_electricity, buildings_useful_demand_light), share, DIVIDE(USER_INPUT(), 100) ) @@ -8,7 +8,7 @@ - priority = 0 - max_value = 100.0 - min_value = 0.0 -- start_value_gql = present:V(buildings_lighting_efficient_fluorescent_electricity,share_of_buildings_useful_demand_after_motion_detection_daylight_control_light) * 100 +- start_value_gql = present:V(buildings_lighting_efficient_fluorescent_electricity,share_of_buildings_useful_demand_light) * 100 - step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/buildings/buildings_lighting/buildings_lighting_led_electricity_share.ad b/inputs/demand/buildings/buildings_lighting/buildings_lighting_led_electricity_share.ad index 775a229a61..fca74a7083 100644 --- a/inputs/demand/buildings/buildings_lighting/buildings_lighting_led_electricity_share.ad +++ b/inputs/demand/buildings/buildings_lighting/buildings_lighting_led_electricity_share.ad @@ -1,6 +1,6 @@ - query = UPDATE( - EDGE(buildings_lighting_led_electricity, buildings_useful_demand_after_motion_detection_daylight_control_light), + EDGE(buildings_lighting_led_electricity, buildings_useful_demand_light), share, DIVIDE(USER_INPUT(), 100) ) @@ -8,7 +8,7 @@ - priority = 0 - max_value = 100.0 - min_value = 0.0 -- start_value_gql = present:V(buildings_lighting_led_electricity,share_of_buildings_useful_demand_after_motion_detection_daylight_control_light) * 100 +- start_value_gql = present:V(buildings_lighting_led_electricity,share_of_buildings_useful_demand_light) * 100 - step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/buildings/buildings_lighting/buildings_lighting_standard_fluorescent_electricity_share.ad b/inputs/demand/buildings/buildings_lighting/buildings_lighting_standard_fluorescent_electricity_share.ad index 1ff06dc37c..6406b3d15f 100644 --- a/inputs/demand/buildings/buildings_lighting/buildings_lighting_standard_fluorescent_electricity_share.ad +++ b/inputs/demand/buildings/buildings_lighting/buildings_lighting_standard_fluorescent_electricity_share.ad @@ -1,6 +1,6 @@ - query = UPDATE( - EDGE(buildings_lighting_standard_fluorescent_electricity, buildings_useful_demand_after_motion_detection_daylight_control_light), + EDGE(buildings_lighting_standard_fluorescent_electricity, buildings_useful_demand_light), share, DIVIDE(USER_INPUT(), 100) ) @@ -8,7 +8,7 @@ - priority = 0 - max_value = 100.0 - min_value = 0.0 -- start_value_gql = present:V(buildings_lighting_standard_fluorescent_electricity,share_of_buildings_useful_demand_after_motion_detection_daylight_control_light) * 100 +- start_value_gql = present:V(buildings_lighting_standard_fluorescent_electricity,share_of_buildings_useful_demand_light) * 100 - step_value = 0.1 - unit = % - update_period = future diff --git a/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_daylight_control_light.ad b/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_daylight_control_light.ad deleted file mode 100644 index ef9dadf787..0000000000 --- a/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_daylight_control_light.ad +++ /dev/null @@ -1,8 +0,0 @@ -- query = UPDATE(EDGE(buildings_useful_demand_after_motion_detection_light, buildings_lighting_savings_from_daylight_control_light), share, DIVIDE(USER_INPUT(),V(387.0))) -- priority = 0 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:V(buildings_lighting_savings_from_daylight_control_light,share_of_buildings_useful_demand_after_motion_detection_light) * 387 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_motion_detection_light.ad b/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_motion_detection_light.ad deleted file mode 100644 index ae7aba93fc..0000000000 --- a/inputs/demand/buildings/buildings_misc/buildings_lighting_savings_from_motion_detection_light.ad +++ /dev/null @@ -1,8 +0,0 @@ -- query = UPDATE(EDGE(buildings_useful_demand_light, buildings_lighting_savings_from_motion_detection_light), share, DIVIDE(USER_INPUT(),V(680.0))) -- priority = 0 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:V(buildings_lighting_savings_from_motion_detection_light,share_of_buildings_useful_demand_light) * 680 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/buildings/buildings_misc/buildings_useful_demand_for_appliances.ad b/inputs/demand/buildings/buildings_misc/buildings_useful_demand_for_appliances.ad deleted file mode 100644 index 8bd88f10c0..0000000000 --- a/inputs/demand/buildings/buildings_misc/buildings_useful_demand_for_appliances.ad +++ /dev/null @@ -1,9 +0,0 @@ -- query = UPDATE(V(buildings_useful_demand_for_appliances), preset_demand, NEG(USER_INPUT())) -- priority = 0 -- max_value = 5.0 -- min_value = 0.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = %y