ie3-institute · staudtMarius · Dec 10, 2025 · Apr 22, 2025 · Apr 23, 2025 · Apr 23, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added basic external em service [#1566](https://github.com/ie3-institute/simona/issues/1566)
 - Implement energy limit flex options and adapt optimization [#1572](https://github.com/ie3-institute/simona/issues/1572)
 - Introducing `onePU` as default quantity [#1607](https://github.com/ie3-institute/simona/issues/1607)
+- Introducing energy demand for warm water heating [#856](https://github.com/ie3-institute/simona/issues/856)
 
 ### Changed
 - Upgraded `scala2` to `scala3` [#53](https://github.com/ie3-institute/simona/issues/53)

diff --git a/docs/readthedocs/models/dhws_model.md b/docs/readthedocs/models/dhws_model.md
@@ -3,7 +3,7 @@
 This page documents the functionality of the domestic hot water storage available in SIMONA.
 
 ## Behaviour
-This storage model operates on volumes, although the functions it provides for other models all operate with energy. Internally the storage model converts energy to volume and vice versa with formulas specified below. Furthermore, it is assumed that the storage medium is water. At initialisation the storage will be full. Domestic hot water storage will be charged when the state of charge is be below 20 % or when the required heat demand for hot tap water is higher than the stored energy in the storage.
+This storage model operates on volumes, although the functions it provides for other models all operate with energy. Internally the storage model converts energy to volume and vice versa with formulas specified below. Furthermore, it is assumed that the storage medium is water. At initialisation the storage will be full. Domestic hot water storage will be charged when the state of charge is be below 20 % or when the required heat demand for hot tap water is higher than the stored energy in the storage. Furthermore the domestic hot water storage is not considered in any flexibility measures of the heat source (e.g. heat pump).
 
 ## Attributes, Units and Remarks
 

diff --git a/docs/readthedocs/models/thermal_house_model.md b/docs/readthedocs/models/thermal_house_model.md
@@ -7,8 +7,7 @@ This page documents the functionality of the thermal house available in SIMONA.
 
 ## Behaviour
 
-This house model represents the thermal behaviour of a building. It represents a simple shoebox with thermal capacity and transmission losses.
-The house can optionally be equipped with a {ref}`cts_model` as thermal storage. Both are connected by the {ref}`thermal_grid_model`.
+This house model represents the thermal behaviour of a building. It represents a simple shoebox with thermal capacity and transmission losses for its heating demand. As well the hot water demand (tap water) based on the number of inhabitants and the housing type on hourly basis is considered. The house can optionally be equipped with a {ref}`cts_model` as thermal storage. Both are connected by the {ref}`thermal_grid_model`.
 
 The thermal house provides two different energy demands. The required demand indicates that the inner temperature of the house is below the lower temperature boundary and thus, requires mandatory heating. An additional demand indicates the amount of energy necessary to reach the target temperature. Additional demand not necessarily requires to be covered but could, e.g. for flexibility purposes.
 

diff --git a/src/main/scala/edu/ie3/simona/model/participant/hp/HpModel.scala b/src/main/scala/edu/ie3/simona/model/participant/hp/HpModel.scala
@@ -24,7 +24,10 @@ import edu.ie3.simona.model.participant.control.QControl
 import edu.ie3.simona.model.participant.hp.HpModel.{HpOperatingPoint, HpState}
 import edu.ie3.simona.model.participant.{ParticipantFlexModel, ParticipantModel}
 import edu.ie3.simona.model.thermal.ThermalGrid
-import edu.ie3.simona.model.thermal.ThermalGrid.*
+import edu.ie3.simona.model.thermal.ThermalGrid.{
+  ThermalDemandWrapper,
+  ThermalGridState,
+}
 import edu.ie3.simona.ontology.messages.flex.FlexType
 import edu.ie3.simona.service.Data.PrimaryData.{
   ComplexPower,
@@ -78,7 +81,19 @@ class HpModel private (
         operatingPoint,
       )
 
-    val thermalDemands = thermalGrid.determineEnergyDemand(thermalGridState)
+    val hoursWaterDemandToDetermine = thermalGrid.house.flatMap(
+      _.checkIfNeedToDetermineDomesticHotWaterDemand(
+        tick,
+        simulationTime,
+        lastState,
+      )
+    )
+
+    val thermalDemands =
+      thermalGrid.determineEnergyDemand(
+        thermalGridState,
+        hoursWaterDemandToDetermine,
+      )
 
     lastState.copy(
       tick = tick,
@@ -231,7 +246,7 @@ class HpModel private (
     * @param thermalGridState
     *   State of the thermalGrid.
     * @param thermalDemands
-    *   ThermalEnergyDemand of the house and the thermal storage.
+    *   ThermalEnergyDemand of the house and the thermal storages.
     * @param wasRunningLastPeriod
     *   Indicates if the Hp was running till this tick.
     * @return
@@ -246,19 +261,23 @@ class HpModel private (
 
     val demandHouse = thermalDemands.houseDemand
     val demandHeatStorage = thermalDemands.heatStorageDemand
+    val demandDomesticHotWaterStorage =
+      thermalDemands.domesticHotWaterStorageDemand
     val noHeatStorageOrEmpty = thermalGridState.isHeatStorageEmpty
 
     val turnHpOn =
       (demandHouse.hasRequiredDemand && noHeatStorageOrEmpty) ||
-        (demandHouse.hasPossibleDemand && wasRunningLastPeriod ||
-          demandHeatStorage.hasRequiredDemand ||
-          (demandHeatStorage.hasPossibleDemand && wasRunningLastPeriod))
+        (demandHouse.hasPossibleDemand && wasRunningLastPeriod) ||
+        demandHeatStorage.hasRequiredDemand ||
+        (demandHeatStorage.hasPossibleDemand && wasRunningLastPeriod) ||
+        demandDomesticHotWaterStorage.hasRequiredDemand
 
     val canOperate =
       demandHouse.hasRequiredDemand || demandHouse.hasPossibleDemand ||
-        demandHeatStorage.hasRequiredDemand || demandHeatStorage.hasPossibleDemand
+        demandHeatStorage.hasRequiredDemand || demandHeatStorage.hasPossibleDemand ||
+        demandDomesticHotWaterStorage.hasRequiredDemand
     val canBeOutOfOperation =
-      !(demandHouse.hasRequiredDemand && noHeatStorageOrEmpty)
+      !(demandHouse.hasRequiredDemand && noHeatStorageOrEmpty) && !demandDomesticHotWaterStorage.hasRequiredDemand
 
     (
       turnHpOn,
@@ -333,16 +352,21 @@ object HpModel {
     *   [[edu.ie3.simona.model.thermal.ThermalHouse]] used for space heating.
     * @param qDotHeatStorage
     *   The thermal power input of the
-    *   [[edu.ie3.simona.model.thermal.ThermalStorage]].
+    *   [[edu.ie3.simona.model.thermal.ThermalStorage]] used for heat storage.
+    * @param qDotDomesticHotWaterStorage
+    *   The thermal power input of the
+    *   [[edu.ie3.simona.model.thermal.DomesticHotWaterStorage]] used for
+    *   domestic hot water / tap water.
     */
   final case class ThermalGridOperatingPoint(
       qDotHp: Power,
       qDotHouse: Power,
       qDotHeatStorage: Power,
+      qDotDomesticHotWaterStorage: Power,
   )
   object ThermalGridOperatingPoint {
     def zero: ThermalGridOperatingPoint =
-      ThermalGridOperatingPoint(zeroKW, zeroKW, zeroKW)
+      ThermalGridOperatingPoint(zeroKW, zeroKW, zeroKW, zeroKW)
   }
 
   /** Holds all relevant data for a hp model calculation.
@@ -381,7 +405,11 @@ object HpModel {
     ): HpState = {
       val therGrid = ThermalGrid(thermalGrid)
       val initialState = ThermalGrid.startingState(therGrid, zeroCelsius)
-      val thermalDemand = therGrid.determineEnergyDemand(initialState)
+      val thermalDemand =
+        therGrid.determineEnergyDemand(
+          initialState,
+          Some(Seq(simulationTime.getHour)),
+        )
 
       HpState(
         tick,

diff --git a/src/main/scala/edu/ie3/simona/model/thermal/ThermalDemandConditions.scala b/src/main/scala/edu/ie3/simona/model/thermal/ThermalDemandConditions.scala
@@ -12,8 +12,10 @@ import edu.ie3.util.scala.quantities.DefaultQuantities.zeroKW
 private case class ThermalDemandConditions(
     shouldContinueHouseHeating: Boolean,
     houseDemand: Boolean,
+    waterStorageDemand: Boolean,
     heatStorageDemand: Boolean,
     housePossible: Boolean,
+    waterStoragePossible: Boolean,
     heatStoragePossible: Boolean,
     houseHeatedLastState: Boolean,
 )
@@ -38,14 +40,19 @@ private object ThermalDemandConditions {
     ThermalDemandConditions(
       /* Consider the action in the last state
        * We can continue using the qDots from last operating point to keep continuity.
-       * If the house was heated in lastState and has still some demand.
-       */
+       * If the house was heated in lastState and has still some demand and the domestic
+       * hot water storage has no demand. */
       shouldContinueHouseHeating =
-        lastOperatingPoint.qDotHouse > zeroKW && houseDemand.hasPossibleDemand,
+        lastOperatingPoint.qDotHouse > zeroKW && houseDemand.hasPossibleDemand &&
+          !state.thermalDemands.domesticHotWaterStorageDemand.hasRequiredDemand,
       houseDemand = houseDemand.hasRequiredDemand,
+      waterStorageDemand =
+        state.thermalDemands.domesticHotWaterStorageDemand.hasRequiredDemand,
       heatStorageDemand =
         heatStorageDemand.hasRequiredDemand || heatStorageDemand.hasPossibleDemand,
       housePossible = houseDemand.hasPossibleDemand,
+      waterStoragePossible =
+        state.thermalDemands.domesticHotWaterStorageDemand.hasPossibleDemand,
       heatStoragePossible = heatStorageDemand.hasPossibleDemand,
       houseHeatedLastState = isHouseHeatedLastState,
     )