Implementing preset_demand_by method in FLH curve inputs for heat

Author: kaskranenburgQ

inputs/full_load_hours/flh_of_geothermal_heat_user_curve.ad

@@ -3,18 +3,36 @@
 # You can see this in the user_curves.yml
 
 - query =
-    UPDATE(
-      V(
-        energy_heat_well_shallow_lt_geothermal,
-        energy_heat_well_deep_ht_geothermal,
-        energy_heat_well_deep_mt_geothermal,
-        energy_heat_well_shallow_heatpump_mt_geothermal,
-        industry_heat_well_geothermal,
-        agriculture_geothermal
-      ),
-      full_load_hours,
-      USER_INPUT()
+    original_nou_energy_heat_well_shallow_lt_geothermal =                   V(energy_heat_well_shallow_lt_geothermal,      number_of_units);
+    original_nou_energy_heat_well_deep_ht_geothermal =                      V(energy_heat_well_deep_ht_geothermal,      number_of_units);
+    original_nou_energy_heat_well_deep_mt_geothermal =                      V(energy_heat_well_deep_mt_geothermal,      number_of_units);
+    original_nou_energy_heat_well_shallow_heatpump_mt_geothermal =          V(energy_heat_well_shallow_heatpump_mt_geothermal,    number_of_units);
+    original_nou_industry_heat_well_geothermal =                            V(industry_heat_well_geothermal,   number_of_units);
+
+    EACH(
+      UPDATE(V(energy_heat_well_shallow_lt_geothermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_well_shallow_lt_geothermal), number_of_units, original_nou_energy_heat_well_shallow_lt_geothermal),
+      UPDATE(V(energy_heat_well_shallow_lt_geothermal), preset_demand_by_steam_hot_water_production, V(energy_heat_well_shallow_lt_geothermal, production_based_on_number_of_units)),
+
+      UPDATE(V(energy_heat_well_deep_ht_geothermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_well_deep_ht_geothermal), number_of_units, original_nou_energy_heat_well_deep_ht_geothermal),
+      UPDATE(V(energy_heat_well_deep_ht_geothermal), preset_demand_by_steam_hot_water_production, V(energy_heat_well_deep_ht_geothermal, production_based_on_number_of_units)),
+
+      UPDATE(V(energy_heat_well_deep_mt_geothermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_well_deep_mt_geothermal), number_of_units, original_nou_energy_heat_well_deep_mt_geothermal),
+      UPDATE(V(energy_heat_well_deep_mt_geothermal), preset_demand_by_steam_hot_water_production, V(energy_heat_well_deep_mt_geothermal, production_based_on_number_of_units)),
+
+      UPDATE(V(energy_heat_well_shallow_heatpump_mt_geothermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_well_shallow_heatpump_mt_geothermal), number_of_units, original_nou_energy_heat_well_shallow_heatpump_mt_geothermal),
+      UPDATE(V(energy_heat_well_shallow_heatpump_mt_geothermal), preset_demand_by_steam_hot_water_production, V(energy_heat_well_shallow_heatpump_mt_geothermal, production_based_on_number_of_units)),
+
+      UPDATE(V(industry_heat_well_geothermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(industry_heat_well_geothermal), number_of_units, original_nou_industry_heat_well_geothermal),
+      UPDATE(V(industry_heat_well_geothermal), preset_demand_by_steam_hot_water_production, V(industry_heat_well_geothermal, production_based_on_number_of_units)),
+
+      UPDATE(V(agriculture_geothermal), full_load_hours, USER_INPUT())
     )
+
 - priority = 1
 - max_value = 8760.0
 - min_value = 0.0

inputs/full_load_hours/flh_of_solar_thermal_user_curve.ad

@@ -3,17 +3,27 @@
 # You can see this in the user_curves.yml
 
 - query =
-    UPDATE(
-      V(
-        energy_heat_solar_ht_solar_thermal,
-        energy_heat_solar_lt_solar_thermal,
-        energy_heat_solar_mt_solar_thermal,
-        buildings_space_heater_solar_thermal,
-        households_water_heater_solar_thermal
-      ),
-    full_load_hours,
-    USER_INPUT()
-  )
+    original_nou_energy_heat_solar_ht_solar_thermal =             V(energy_heat_solar_ht_solar_thermal,      number_of_units);
+    original_nou_energy_heat_solar_lt_solar_thermal =             V(energy_heat_solar_lt_solar_thermal,      number_of_units);
+    original_nou_energy_heat_solar_mt_solar_thermal =             V(energy_heat_solar_mt_solar_thermal,      number_of_units);
+    
+    EACH(
+      UPDATE(V(energy_heat_solar_ht_solar_thermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_solar_ht_solar_thermal), number_of_units, original_nou_energy_heat_solar_ht_solar_thermal),
+      UPDATE(V(energy_heat_solar_ht_solar_thermal), preset_demand_by_steam_hot_water_production, V(energy_heat_solar_ht_solar_thermal, production_based_on_number_of_units)),
+
+      UPDATE(V(energy_heat_solar_lt_solar_thermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_solar_lt_solar_thermal), number_of_units, original_nou_energy_heat_solar_lt_solar_thermal),
+      UPDATE(V(energy_heat_solar_lt_solar_thermal), preset_demand_by_steam_hot_water_production, V(energy_heat_solar_lt_solar_thermal, production_based_on_number_of_units)),
+
+      UPDATE(V(energy_heat_solar_mt_solar_thermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(energy_heat_solar_mt_solar_thermal), number_of_units, original_nou_energy_heat_solar_mt_solar_thermal),
+      UPDATE(V(energy_heat_solar_mt_solar_thermal), preset_demand_by_steam_hot_water_production, V(energy_heat_solar_mt_solar_thermal, production_based_on_number_of_units)),
+
+      UPDATE(V(buildings_space_heater_solar_thermal), full_load_hours, USER_INPUT()),
+      UPDATE(V(households_water_heater_solar_thermal), full_load_hours, USER_INPUT()),
+    )
+
 - priority = 1
 - max_value = 8760.0
 - min_value = 0.0