diff --git a/CHANGELOG.md b/CHANGELOG.md index b0790e3ed9..c86e5004a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Rewrote ThermalHouseTest from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646) - Updated dependabot reviewers [#888](https://github.com/ie3-institute/simona/issues/888) - Merged `HpModelTestData` with `HpTestData` to `HpInputTestData` [#872](https://github.com/ie3-institute/simona/issues/872) +- Harmonised both methods that check the inner temperature of thermal house against the boundaries [#880](https://github.com/ie3-institute/simona/issues/880) - Prepare ThermalStorageTestData for Storage without storageVolumeLvlMin [#894](https://github.com/ie3-institute/simona/issues/894) ### Fixed diff --git a/src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala b/src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala index 8e3486d5a4..17c7a30ab5 100644 --- a/src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala +++ b/src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala @@ -383,10 +383,11 @@ final case class ThermalHouse( * true, if inner temperature is too high */ def isInnerTemperatureTooHigh( - innerTemperature: Temperature + innerTemperature: Temperature, + boundaryTemperature: Temperature = upperBoundaryTemperature, ): Boolean = innerTemperature > Kelvin( - upperBoundaryTemperature.toKelvinScale - temperatureTolerance.toKelvinScale + boundaryTemperature.toKelvinScale - temperatureTolerance.toKelvinScale ) /** Check if inner temperature is lower than preferred minimum temperature