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

Jump to bottom

Fix hp thermal storage refill #860

Closed
wants to merge 92 commits into from
Closed

Fix hp thermal storage refill #860

wants to merge 92 commits into from

Conversation

danielfeismann
Copy link
Member

@danielfeismann danielfeismann commented Jul 23, 2024 •
edited
Loading

resolves point 8 of #827

merge #853, #825, #918 and #895 first!

@danielfeismann
add tests for determine flex potential at thermal grid state with ful…
339b43a 
…l storage and house above target temp
@danielfeismann
add tests for determine flex potential at thermal grid state with hou…
ff868bb 
…se below target temp
@danielfeismann
changelog
e202c18
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
e8b02bf 
…ouse

# Conflicts:
#	CHANGELOG.md
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
6f53562 
…ouse
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
93ba17d 
…ouse

# Conflicts:
#	CHANGELOG.md
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
420bb1d 
…ouse

# Conflicts:
#	CHANGELOG.md
@danielfeismann
add maybeThermalThreshold to nextActivationTicks
891ab88
@danielfeismann
changelog
5b9f652
@danielfeismann
provide heat pump the latest entry of weather data
989b7b6
@danielfeismann
adapt handleInfeed to check for lastState qDot
8b41023
@danielfeismann
fix energyDemand evaluation for demand only below target temperature
e4457dc
@danielfeismann
format and exception
374a2ee
@danielfeismann
Revert "format and exception"
280fed5 
This reverts commit 374a2ee.
@danielfeismann
format and exception
f51dd61
@danielfeismann
refactor handleInfeed to comply with case where thermal storage has b…
a297697 
…een charged within the last state
@danielfeismann
fix HpModelSpec to check for targetTemperature
77941f9
@danielfeismann
adapt HpModelSpec to check for targetTemperature
cde52e4
@danielfeismann
fmt
6244e79
@danielfeismann
refactor energyDemand
81ef30d
@danielfeismann
refactor EmAgentIT
ab0806c
@danielfeismann
rollback HpModelSpec
8c6aed6
@danielfeismann
fix energyDemand
44873d2
@danielfeismann
update EmAgentIT
ec7d3f7
@danielfeismann
adapt EmAgentIT
5dcc230
@danielfeismann
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
3cc1aa6
@danielfeismann
rollback EmAgentIT changes
a3959cb
@danielfeismann
Revert "rollback EmAgentIT changes"
07574aa 
This reverts commit a3959cb.
@danielfeismann
adapt EmAgentIT comments
1d7ae94
@danielfeismann
use actual state when determine energyDemand for next period
fd1630e
danielfeismann and others added 21 commits August 19, 2024 09:33
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
e6544dc 
…ouse
@danielfeismann
converting hyperlinks to markdown
f279b89
@danielfeismann
Revert "converting hyperlinks to markdown"
b9aafd1 
This reverts commit f279b89.
@danielfeismann
fix hyperlinks
b858b50
@danielfeismann @sebastian-peter
Update src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
cc312ad 
include suggestion from reviewer

Co-authored-by: Sebastian Peter <sebastian.peter@tu-dortmund.de>
@danielfeismann
add explanatory comments
a502267
@danielfeismann
correct name of variable
440019c
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
8f3d05a 
…ouse
@danielfeismann
Merge branch 'refs/heads/dev' into df/#729-additional-tests-thermal-h…
f912f30 
…ouse
@danielfeismann
Merge remote-tracking branch 'origin/df/#729-additional-tests-thermal…
e74c5dd 
…-house' into df/#729-additional-tests-thermal-house
@danielfeismann
Merge branch 'refs/heads/dev' into df/#827_fix_hp_storage_refill
6c9e988 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
Merge remote-tracking branch 'refs/remotes/origin/df/#729-additional-…
fe7f1b2 
…tests-thermal-house' into df/#827_fix_hp_storage_refill

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
@danielfeismann
fix merge conflict
95d4907
@danielfeismann
remove storage min lvl in HpInputTestData
c1891a0
@danielfeismann
move operation conditions of hp into operatesInNextState and adapt Hp…
0886111 
…ModelSpec cases
@danielfeismann
adapt condition for hasAdditionalDemand
441dfdb
@danielfeismann
refactor ThermalEnergyDemand
8ee3b77
@danielfeismann
fmt
ced3b55
@danielfeismann
Revert "adapt condition for hasAdditionalDemand"
b07c1f8 
This reverts commit 441dfdb.
@danielfeismann
Merge remote-tracking branch 'refs/remotes/origin/df/#917-Refactor-Th…
3696479 
…ermalEnergyDemand' into df/#827_fix_hp_storage_refill
@danielfeismann
remove broken test
8321411
@danielfeismann danielfeismann marked this pull request as draft August 21, 2024 17:48
@danielfeismann danielfeismann marked this pull request as ready for review August 21, 2024 18:29
@danielfeismann danielfeismann marked this pull request as draft August 24, 2024 05:28
@danielfeismann
Copy link
Member Author

Closed in favour of #931 and #928 and others

@danielfeismann danielfeismann deleted the df/#827_fix_hp_storage_refill branch February 6, 2025 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@danielfeismann danielfeismann

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@danielfeismann