ie3-institute · danielfeismann · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 15, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add unapply method for ThermalHouseResults [#934](https://github.com/ie3-institute/simona/issues/934)
 - Added `ApparentPower` to differentiate between different power types [#794](https://github.com/ie3-institute/simona/issues/794)
 - Update/enhance config documentation [#1013](https://github.com/ie3-institute/simona/issues/1013)
+- Integration test for thermal grids [#878](https://github.com/ie3-institute/simona/issues/878)
+- Integration test for thermal grids [#878](https://github.com/ie3-institute/simona/issues/878)
 
 ### Changed
 - Adapted to changed data source in PSDM [#435](https://github.com/ie3-institute/simona/issues/435)
@@ -144,6 +146,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix initialisation freezing on empty primary data [#981](https://github.com/ie3-institute/simona/issues/981)
 - Shallow fetch in CI [#1041](https://github.com/ie3-institute/simona/issues/1041)
 - Correct wrong use of term "wall clock time" [#727](https://github.com/ie3-institute/simona/issues/727)
+- Refactoring of `ThermalGrid.handleInfeed` to fix thermal storage recharge correctly when empty [#930](https://github.com/ie3-institute/simona/issues/930)
+- Refactoring of `ThermalGrid.handleInfeed` to fix thermal storage recharge correctly when empty [#930](https://github.com/ie3-institute/simona/issues/930)
 
 ## [3.0.0] - 2023-08-07
 

diff --git a/docs/readthedocs/models.md b/docs/readthedocs/models.md
@@ -28,6 +28,7 @@ maxdepth: 1
 models/bm_model
 models/chp_model
 models/cts_model
+models/dhws_model
 models/evcs_model
 models/hp_model
 models/load_model

diff --git a/docs/readthedocs/models/cts_model.md b/docs/readthedocs/models/cts_model.md
@@ -3,7 +3,7 @@
 This page documents the functionality of the cylindrical thermal 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. Also, the model holds a variable for the current storage level.
+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. Also, the model holds a variable for the current storage level. At initialisation the storage will be empty.
 
 ## Attributes, Units and Remarks
 

diff --git a/docs/readthedocs/models/dhws_model.md b/docs/readthedocs/models/dhws_model.md
@@ -0,0 +1,56 @@
+(dhws_model)=
+# Domestic Hot Water Storage
+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. Also the model holds a variable for the current storage level. At initialisation the storage will be full. Domestic hot water storage will be refilled when the state of charge will be below 20 % or when the required water demand can not be covered by the stored energy in the storage itself.
+
+## Attributes, Units and Remarks
+
+Please refer to  {doc}`PowerSystemDataModel - CTS Model <psdm:models/input/thermal/domestichotwaterstorage>` for Attributes and Units used in this Model.
+
+## Calculations
+### Maximal storage capacity
+As the name suggests this storage has a cylindric form, hence its maximum storage capacity $V_{st, max}$ can be given by:
+
+$$
+V_{st, max} = \pi \cdot r^2 \cdot h
+$$
+
+### Conversions of energy and volume
+
+In this model the change of stored energy (heat) is represented by the change of the volume of the storage medium. This relation between stored heat and volume change is given by:
+
+$$
+V = (\frac{W}{c \cdot (tE - tA)})
+$$
+
+with
+W = energy to be converted to volume
+V = resulting volume
+tE = return temperature
+tA = inlet temperature
+c = $1,15 \frac{kWh}{m^3 \cdot K}$
+
+The original equation is given by:
+
+$$
+\Delta V_{st} = (\frac{\dot{Q_{th}} \cdot \Delta t}{c \cdot (tA - tE)})
+$$
+
+Reference:
+
+* {cite:cts}`Quaschning.2013`
+
+
+That is the mathematical description of loading and unloading processes concerning the buffer storage. Whenever heat is stored within the storage or removed from the storage this equation is used. This includes the case that the whole heat demand is satisfied by the storage.
+
+The same relationship is used to determine the quantity of heat which is stored in the storage by converting the equation to:
+
+$$
+W = V \cdot c \cdot (tE - tA)
+$$
+
+## Store/Take energy
+
+This calculation is performed as follows: An amount of energy is specified for storing or taking. The model then changes the storage level and returns if it exceeded the maximum (when storing energy) or the minimum (when taking energy).
diff --git a/docs/readthedocs/models/thermal_house_model.md b/docs/readthedocs/models/thermal_house_model.md
@@ -6,7 +6,7 @@ This page documents the functionality of the thermal house available in SIMONA.
 
 ## Behaviour
 
-This house model represents the thermal behaviour of a building. This reflects a simple shoebox with a thermal capacity and with transmission losses.
+This house model represents the thermal behaviour of a building. This reflects a simple shoebox with a thermal capacity and with 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. 
 
 ## Attributes, Units and Remarks
 

diff --git a/src/main/resources/config/config-template.conf b/src/main/resources/config/config-template.conf
@@ -51,7 +51,7 @@ EvcsRuntimeConfig {
   baseRuntimeConfig: BaseRuntimeConfig # this entry is ignored by the config generator,
   # but cannot removed bc otherwise EvcsRuntimeConfig is handled as String
   chargingStrategy: String | "maxPower" # can be one of maxPower, constantPower, gridOrientedScheduling or marketOrientedScheduling
-  lowestEvSoc: Double | 0.2 # Defines the lowest possible state of charge (SoC) that an EV is allowed to uncharge in vehicle to grid (V2G) mode
+  lowestEvSoc: Double | 0.2 # Defines the lowest possible state of charge (SoC) that an EV is allowed to discharge in vehicle to grid (V2G) mode
 }
 
 #@define extends BaseRuntimeConfig

diff --git a/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala
@@ -54,7 +54,6 @@ import edu.ie3.simona.event.ResultEvent
 import edu.ie3.simona.event.ResultEvent.{
   FlexOptionsResultEvent,
   ParticipantResultEvent,
-  ThermalResultEvent,
 }
 import edu.ie3.simona.event.notifier.NotifierConfig
 import edu.ie3.simona.exceptions.CriticalFailureException
@@ -1913,8 +1912,7 @@ protected trait ParticipantAgentFundamentals[
       result: R
   ): Option[ResultEvent] = result match {
     case thermalUnitResult: ThermalUnitResult =>
-      Some(ThermalResultEvent(thermalUnitResult))
-
+      Some(ResultEvent.ThermalResultEvent(thermalUnitResult))
     case unsupported =>
       log.debug(
         s"Results of class '${unsupported.getClass.getSimpleName}' are currently not supported."

diff --git a/src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
@@ -430,6 +430,12 @@ trait HpAgentFundamentals
     HpRelevantData(
       tick,
       weatherData.temp.inKelvin,
+      baseStateData.startDate,
+      baseStateData.model.thermalGrid.house.map(_.houseInhabitants).getOrElse {
+        throw new InconsistentStateException(
+          s"The model ${baseStateData.model.thermalGrid.house} was not provided with the needed number of inhabitants."
+        )
+      },
     )
   }
 

diff --git a/src/main/scala/edu/ie3/simona/event/ResultEvent.scala b/src/main/scala/edu/ie3/simona/event/ResultEvent.scala
@@ -18,6 +18,7 @@ import edu.ie3.datamodel.models.result.system.{
 }
 import edu.ie3.datamodel.models.result.thermal.{
   CylindricalStorageResult,
+  DomesticHotWaterStorageResult,
   ThermalHouseResult,
   ThermalUnitResult,
 }
@@ -92,6 +93,26 @@ object ResultEvent {
     }
   }
 
+  object DomesticHotWaterStorageResult {
+    def unapply(result: DomesticHotWaterStorageResult): Option[
+      (
+          ZonedDateTime,
+          UUID,
+          ComparableQuantity[Power],
+          ComparableQuantity[Energy],
+      )
+    ] = {
+      Option(result).map { result =>
+        (
+          result.getTime,
+          result.getInputModel,
+          result.getqDot,
+          result.getEnergy,
+        )
+      }
+    }
+  }
+
   /** Event that holds all grid calculation results of a power flow calculation.
     * The usage of a type is necessary here, to avoid passing in other instances
     * of [[edu.ie3.datamodel.models.result.ResultEntity]] except of the wanted