commit

pyrecoy/pyrecoy/pyrecoy2/assets.py

@@ -211,7 +211,7 @@ class Heatpump(Asset):
             return func
 
         # return cop_curve
-        return 2.7
+        return 2.5
 
     @lru_cache(maxsize=None)
     def get_cop(self, heat_output, Tsink=None, Tsource=None):
@@ -250,7 +250,7 @@ class Heatpump(Asset):
             heat_output = 1
 
         # cop = self.get_cop(heat_output=heat_output, Tsink=Tsink, Tsource=Tsource)
-        cop = 2.7
+        cop = 2.5
         return -heat_output / cop
 
     def set_load(self, *args, **kwargs):
@@ -529,12 +529,13 @@ class HotWaterStorage(Battery):
         min_storagelevel,
         initial_storagelevel=None,
     ):
-        rated_capacity = capacity_per_volume * volume
+        # rated_capacity = capacity_per_volume * volume
+        rated_capacity = 3
 
         if not initial_storagelevel:
             initial_storagelevel = min_storagelevel
         soc_at_start = initial_storagelevel / rated_capacity
-        max_storagelevel = rated_capacity * 0.95
+        max_storagelevel = rated_capacity
         min_soc = min_storagelevel / rated_capacity
         max_soc = max_storagelevel / rated_capacity
         self.temperature = temperature
@@ -559,7 +560,7 @@ class HotWaterStorage(Battery):
     def charging_power_limit(self):
         max_charging_energy = self.max_chargelevel - self.chargelevel
         # return min(self.MWh_to_MW(max_charging_energy), -self.min_power)
-        return 0.5
+        return 0.4
 
     @property
     def discharging_power_limit(self):