Heat pump active power was determined regardless its maximum power. N…

edisgo/edisgo.py

@@ -55,6 +55,7 @@
 from edisgo.tools.geo import find_nearest_bus
 from edisgo.tools.spatial_complexity_reduction import spatial_complexity_reduction
 from edisgo.tools.tools import determine_grid_integration_voltage_level
+from edisgo.io.db import engine as toep_engine
 
 if "READTHEDOCS" not in os.environ:
     from shapely.geometry import Point

edisgo/flex_opt/heat_pump_operation.py

@@ -1,4 +1,6 @@
 import logging
+import copy
+import warnings
 
 import pandas as pd
 
@@ -31,11 +33,37 @@ def operating_strategy(
     if heat_pump_names is None:
         heat_pump_names = edisgo_obj.heat_pump.cop_df.columns
 
+    # if heat_pump is not in topology -> exception
+    # heat_pumps_in_topology_check = heat_pump_names.isin(edisgo_obj.topology.loads_df.index)
+    # for x in range(len(heat_pump_names)):
+    #     if not heat_pumps_in_topology_check[x]:
+    #         warnings.warn(f"Warning: Heat pump {heat_pump_names[x]} has not been inserted into the grid topology.")
+    #         heat_pump_names = heat_pump_names.drop[heat_pump_names[x]]
+
     if strategy == "uncontrolled":
         ts = (
             edisgo_obj.heat_pump.heat_demand_df.loc[:, heat_pump_names]
             / edisgo_obj.heat_pump.cop_df.loc[:, heat_pump_names]
         )
+
+        # clips heat pump load at maximum level
+        ts_prev = copy.deepcopy(ts)
+        for heat_pump_name in heat_pump_names:
+          ts[heat_pump_name] = [min(x,edisgo_obj.topology.loads_df.p_set[heat_pump_name]) for x in ts[heat_pump_name]]
+          if not ts[heat_pump_name].equals(ts_prev[heat_pump_name]):
+                warnings.warn(
+                    # Extension possible: print heat pumps that were clipped
+                    f"Warning: Heat pump active power at {edisgo_obj.topology.loads_df.bus[heat_pump_name]} was limited to its maximum."
+                    f"Heat demand at bus {edisgo_obj.topology.loads_df.bus[heat_pump_name]} should be covered by additional heat sources."
+                )
+
+        if not ts.equals(ts_prev):
+            warnings.warn(
+                # Extension possible: print heat pumps that were clipped
+                          "Warning: Heat pump active power was clipped at maximum level." 
+                          "Heat demand at bus should be covered by additional heat sources."
+            )
+
         edisgo_obj.timeseries.add_component_time_series(
             "loads_active_power",
             ts,

edisgo/network/timeseries.py

@@ -2120,7 +2120,6 @@ def add_component_time_series(self, df_name, ts_new):
             :attr:`~.network.timeseries.TimeSeries.generators_active_power`.
         ts_new : :pandas:`pandas.DataFrame<DataFrame>`
             Dataframe with new time series to add to existing time series dataframe.
-
         """
         # drop possibly already existing time series
         self.drop_component_time_series(df_name, ts_new.columns)