Skip to content

Commit

Permalink
Refactoring of ThermalGrid.handleInfeed to fix thermal storage rechar…
Browse files Browse the repository at this point in the history
…ge correctly when empty
  • Loading branch information
danielfeismann committed Aug 24, 2024
1 parent e2d7133 commit 64a67ec
Show file tree
Hide file tree
Showing 9 changed files with 317 additions and 79 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix activation of Hp when not under control of an EM [#922](https://github.com/ie3-institute/simona/issues/922)
- Fixed ThermalStorageResults having multiple entries [#924](https://github.com/ie3-institute/simona/issues/924)
- Fix determineState of ThermalHouse [#926](https://github.com/ie3-institute/simona/issues/926)
- 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

Expand Down
7 changes: 7 additions & 0 deletions src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ final case class HpModel(
* data of heat pump including state of the heat pump
* @param isRunning
* determines whether the heat pump is running or not
* @param houseDemand
* determines if the thermal house has heat demand
* @param storageDemand
* determines if the thermal storage has heat demand
* @return
* next [[HpState]]
*/
Expand Down Expand Up @@ -245,7 +249,10 @@ final case class HpModel(
state.thermalGridState,
state.ambientTemperature.getOrElse(relevantData.ambientTemperature),
relevantData.ambientTemperature,
isRunning,
newThermalPower,
houseDemand,
storageDemand,
)

HpState(
Expand Down
Loading

0 comments on commit 64a67ec

Please sign in to comment.