Remove intelligent control input sliders from scenarios

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

graphs/energy/nodes/buildings/buildings_useful_demand_light.demand.ad → 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

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

inputs/demand/buildings/buildings_misc/buildings_useful_demand_electricity.ad → 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

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

inputs/demand/buildings/buildings_lighting/buildings_lighting_efficient_fluorescent_electricity_share.ad

@@ -1,14 +1,14 @@
 - 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)
     )
 - share_group = lighting_buildings
 - 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

inputs/demand/buildings/buildings_lighting/buildings_lighting_led_electricity_share.ad

@@ -1,14 +1,14 @@
 - 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)
     )
 - share_group = lighting_buildings
 - 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

inputs/demand/buildings/buildings_lighting/buildings_lighting_standard_fluorescent_electricity_share.ad

@@ -1,14 +1,14 @@
 - 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)
     )
 - share_group = lighting_buildings
 - 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