start fixing determineFlexOptions

ie3-institute · Aug 21, 2024 · a6b5031 · a6b5031
1 parent 49bb285
commit a6b5031
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala b/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
@@ -282,9 +282,8 @@ final case class HpModel(
     /* Determine the options we have */
     val (
       thermalEnergyDemandHouse,
-      thermalEnergyDemandStorage,
-      // FIXME
-      thermalEnergyDemandWaterStorage,
+      thermalEnergyDemandHeatStorage,
+      thermalEnergyDemandDomesticHotWaterStorage,
       updatedThermalGridState,
     ) =
       thermalGrid.energyDemandAndUpdatedState(
@@ -295,11 +294,16 @@ final case class HpModel(
         data.simulationStart,
         data.houseInhabitants,
       )
+
     val canOperate =
       thermalEnergyDemandHouse.hasRequiredDemand || thermalEnergyDemandHouse.hasAdditionalDemand ||
-        thermalEnergyDemandStorage.hasRequiredDemand || thermalEnergyDemandStorage.hasAdditionalDemand
+        thermalEnergyDemandHeatStorage.hasRequiredDemand || thermalEnergyDemandHeatStorage.hasAdditionalDemand ||
+        thermalEnergyDemandDomesticHotWaterStorage.hasRequiredDemand || thermalEnergyDemandDomesticHotWaterStorage.hasAdditionalDemand
+
     val canBeOutOfOperation =
-      !thermalEnergyDemandHouse.hasRequiredDemand && !thermalEnergyDemandStorage.hasRequiredDemand
+      !thermalEnergyDemandHouse.hasRequiredDemand &&
+        !thermalEnergyDemandHeatStorage.hasRequiredDemand &&
+        !thermalEnergyDemandDomesticHotWaterStorage.hasRequiredDemand
 
     val lowerBoundary =
       if (canBeOutOfOperation)