Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for runningHp when handling infeed to thermalGrid #1168

Merged
merged 4 commits into from
Feb 17, 2025
Merged

Check for runningHp when handling infeed to thermalGrid #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb1b874
handle edge cases of thermal grid
danielfeismann Feb 12, 2025
f5d89b5
edge case continue heating till target temperature when surplus energ…
danielfeismann Feb 12, 2025
925fa05
Merge branch 'refs/heads/dev' into df/#1167-handle-edge-cases-of-ther…
danielfeismann Feb 17, 2025
526fb78
update changelog
danielfeismann Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Rename `PrimaryDataWithApparentPower` to `PrimaryDataWithComplexPower` [#1140](https://github.com/ie3-institute/simona/issues/1140)
- Refactoring of `ThermalGrid.handleInfeed` to fix thermal storage recharge correctly when empty [#930](https://github.com/ie3-institute/simona/issues/930)
- Move `ScheduleServiceActivation` out of `RegistrationResponseMessage` [#1143](https://github.com/ie3-institute/simona/issues/1143)
- Check for runningHp when handling infeed to thermalGrid [#1167](https://github.com/ie3-institute/simona/issues/1167)

## [3.0.0] - 2023-08-07

Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@ final case class ThermalGrid(

// We can use the qDots from lastState to keep continuity. If...
if (
// ... house was heated in lastState but not from Storage and has still some demand.
((qDotHouseLastState > zeroKW && (qDotStorageLastState >= zeroKW) && thermalDemands.houseDemand.hasAdditionalDemand) ||
// ... house was heated in lastState but not from Storage and has still some demand. Hp must still run for this.
((qDotHouseLastState > zeroKW && (qDotStorageLastState >= zeroKW) && thermalDemands.houseDemand.hasAdditionalDemand) && isRunning ||
// ... storage was filled up in the lastState and has still additional demand
// But only if the house not reached some requiredDemand.
qDotStorageLastState > zeroKW && thermalDemands.heatStorageDemand.hasAdditionalDemand && !thermalDemands.houseDemand.hasRequiredDemand)
// But only if the house not reached some requiredDemand. Hp must still run for this.
qDotStorageLastState > zeroKW && thermalDemands.heatStorageDemand.hasAdditionalDemand && !thermalDemands.houseDemand.hasRequiredDemand && isRunning)
) {
// We can continue for the house
val (updatedHouseState, thermalHouseThreshold, remainingQDotHouse) =
Expand Down