More prep for building sizer 6 (#374)

* aplly some changes for new dhw testing * add energy intensity in utsp * add energy intensity in utsp * fix energy intensity utsp * fix energy intensity utsp * make oil setup with new dhw method * code qualy * fix code qualy * new dhw for pellet heating * dhw for gas * add dhw district heating * add dhw district heating * code qualy * some testing * new dhw testing * dev on scenario_analysis
FZJ-IEK3-VSA · Dec 18, 2024 · ca74e92 · ca74e92
1 parent 9ec6160
commit ca74e92
Show file tree

Hide file tree

Showing 14 changed files with 3,363 additions and 220 deletions.
diff --git a/hisim/components/gas_meter.py b/hisim/components/gas_meter.py
@@ -152,6 +152,7 @@ def __init__(
         )
 
         self.add_dynamic_default_connections(self.get_default_connections_from_generic_gas_heater())
+        self.add_dynamic_default_connections(self.get_default_connections_from_generic_dhw_gas_heater())
         self.add_dynamic_default_connections(self.get_default_connections_from_generic_heat_source())
 
     def get_default_connections_from_generic_gas_heater(
@@ -178,6 +179,30 @@ def get_default_connections_from_generic_gas_heater(
         )
         return dynamic_connections
 
+    def get_default_connections_from_generic_dhw_gas_heater(
+        self,
+    ):
+        """Get gas heater default connections."""
+
+        from hisim.components.generic_boiler import (  # pylint: disable=import-outside-toplevel
+            GenericBoilerForDHW,
+        )
+
+        dynamic_connections = []
+        gas_heater_class_name = GenericBoilerForDHW.get_classname()
+        dynamic_connections.append(
+            dynamic_component.DynamicComponentConnection(
+                source_component_class=GenericBoilerForDHW,
+                source_class_name=gas_heater_class_name,
+                source_component_field_name=GenericBoilerForDHW.EnergyDemand,
+                source_load_type=lt.LoadTypes.GAS,
+                source_unit=lt.Units.WATT_HOUR,
+                source_tags=[lt.InandOutputType.GAS_CONSUMPTION_UNCONTROLLED],
+                source_weight=999,
+            )
+        )
+        return dynamic_connections
+
     def get_default_connections_from_generic_heat_source(
         self,
     ):

diff --git a/hisim/components/generic_boiler.py b/hisim/components/generic_boiler.py