new dhw for pellet heating

FZJ-IEK3-VSA · Nov 14, 2024 · 080c4b2 · 080c4b2
1 parent 4d6a5d5
commit 080c4b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/hisim/components/generic_boiler.py b/hisim/components/generic_boiler.py
@@ -845,8 +845,8 @@ def modulate_power(
             percentage = minimal_percentage
             return percentage
 
-        # if something went wrong
-        raise ValueError("Modulation of Generic Boiler needs some adjustments")
+        percentage = 0.0
+        return percentage
 
     def conditions_on_off(
         self,
@@ -1015,7 +1015,7 @@ def get_scaled_conventional_pellet_dhw_boiler_config(
         maximal_thermal_power_in_watt = 2500 * number_of_apartments_in_building
         config = GenericBoilerConfig(
             building_name=building_name,
-            name="ConventionalPelletBoiler",
+            name="ConventionalPelletBoilerForDHW",
             boiler_type=BoilerType.CONVENTIONAL,
             energy_carrier=lt.LoadTypes.PELLETS,
             temperature_delta_in_celsius=10,

diff --git a/system_setups/household_pellets_building_sizer_with_new_dhw.py b/system_setups/household_pellets_building_sizer_with_new_dhw.py
@@ -277,15 +277,14 @@ def setup_function(
 
     # Build Pellet Heater for DHW
     # DHW Pellet heater and storage configs
-    my_pellet_heater_for_dhw_config = generic_boiler.GenericBoilerConfig.get_scaled_conventional_pellet_boiler_config(
-        heating_load_of_building_in_watt=6000 * number_of_apartments
+    my_pellet_heater_for_dhw_config = generic_boiler.GenericBoilerConfigForDHW.get_scaled_conventional_pellet_dhw_boiler_config(
+        number_of_apartments_in_building=number_of_apartments
     )
-    my_pellet_heater_for_dhw_config.name = my_pellet_heater_for_dhw_config.name + "ForDHW"
-    my_pellet_heater_controller_dhw_config = generic_boiler.GenericBoilerControllerConfig.get_default_on_off_generic_boiler_controller_config(
+
+    my_pellet_heater_controller_dhw_config = generic_boiler.GenericBoilerControllerConfigForDHW.get_default_on_off_dhw_boiler_controller_config(
         minimal_thermal_power_in_watt=my_pellet_heater_for_dhw_config.minimal_thermal_power_in_watt,
         maximal_thermal_power_in_watt=my_pellet_heater_for_dhw_config.maximal_thermal_power_in_watt,
     )
-    my_pellet_heater_controller_dhw_config.name = my_pellet_heater_controller_dhw_config.name + "ForDHW"
 
     my_dhw_storage_config = simple_water_storage.SimpleDHWStorageConfig.get_scaled_dhw_storage(
         number_of_apartments=number_of_apartments