Merge 8c13909 into 5f7f69b

FlexMeasures · Feb 14, 2024 · 45997f1 · 45997f1
2 parents 5f7f69b + 8c13909
commit 45997f1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/flexmeasures/data/models/planning/storage.py b/flexmeasures/data/models/planning/storage.py
@@ -27,7 +27,7 @@
 from flexmeasures.data.schemas.scheduling import FlexContextSchema
 from flexmeasures.utils.time_utils import get_max_planning_horizon
 from flexmeasures.utils.coding_utils import deprecated
-from flexmeasures.utils.unit_utils import ur, convert_units
+from flexmeasures.utils.unit_utils import ur
 
 
 def check_and_convert_power_capacity(
@@ -211,12 +211,12 @@ def _prepare(self, skip_validation: bool = False) -> tuple:  # noqa: C901
             ) * get_continuous_series_sensor_or_quantity(
                 quantity_or_sensor=production_capacity,
                 actuator=sensor,
-                unit=sensor.unit,
+                unit="MW",
                 query_window=(start, end),
                 resolution=resolution,
                 beliefs_before=belief_time,
                 fallback_attribute="production_capacity",
-                max_value=convert_units(power_capacity_in_mw, "MW", sensor.unit),
+                max_value=power_capacity_in_mw,
             )
         if sensor.get_attribute("is_strictly_non_negative"):
             device_constraints[0]["derivative max"] = 0
@@ -226,12 +226,12 @@ def _prepare(self, skip_validation: bool = False) -> tuple:  # noqa: C901
             ] = get_continuous_series_sensor_or_quantity(
                 quantity_or_sensor=consumption_capacity,
                 actuator=sensor,
-                unit=sensor.unit,
+                unit="MW",
                 query_window=(start, end),
                 resolution=resolution,
                 beliefs_before=belief_time,
                 fallback_attribute="consumption_capacity",
-                max_value=convert_units(power_capacity_in_mw, "MW", sensor.unit),
+                max_value=power_capacity_in_mw,
             )
 
         soc_gain = self.flex_model.get("soc_gain", [])