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

ThermalGrid integration test #879

Draft
wants to merge 246 commits into
base: dev
Choose a base branch
from
Draft

ThermalGrid integration test #879

wants to merge 246 commits into from

Conversation

danielfeismann
Copy link
Member

@danielfeismann danielfeismann commented Aug 4, 2024 •
edited
Loading

resolves #878

merge #860, #883, #873, #895, #931, #935, #1009 and #1044 first

merge #931 first

@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
only charge storage if it has still available capacity
9cd94e8
@danielfeismann
use the actual result tick for thermalhouse and thermal storage results
a001dc0
@danielfeismann
use the actual result tick for thermalhouse and thermal storage resul…
ae8185e 
…ts part 2
@danielfeismann
fmt
43d114b
@danielfeismann
Merge branch 'refs/heads/dev' into df/#827_fix_hp_storage_refill
d1edeab
@danielfeismann
refactor determining the energyDemand to recharge storage
402b858
@danielfeismann
split energyDemand of ThermalGrid into demand of house and of storage
901f444
@danielfeismann
Merge branch 'df/#1049-Introduce-ThermalDemandWrapper' into df/#930-r…
6dabaf7 
…efactor-handleInfeed

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
@danielfeismann
fix after merging
0d157db
@danielfeismann
Merge branch 'df/#1049-Introduce-ThermalDemandWrapper' into df/#878-t…
e059f31 
…hermalGridIT

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridSpec.scala
@danielfeismann
fmt
9a9096d
@danielfeismann
Merge branch 'dev' into df/#930-refactor-handleInfeed
7e8afb0
@danielfeismann
Merge branch 'dev' into df/#878-thermalGridIT
6ec32b8
@danielfeismann
adapt ChpModelSpec and CylindricalThermalStorageSpec to zero for mini…
51741cc 
…mum storage volume level
@danielfeismann
hard fix for zero values as minimum storage volume level to prevent n…
8e19705 
…on-plausible behaviour till psdm release
@danielfeismann
adapt cases for handling thermal infeed into ThermalGrid
d567b81
@danielfeismann
fmt
0ab7ade
@danielfeismann
hard fix for zero values as minimum storage volume level to prevent n…
81694cc 
…on-plausible behaviour till psdm release
@danielfeismann
adapt ChpModelSpec and CylindricalThermalStorageSpec to zero for mini…
d9f859c 
…mum storage volume level
@danielfeismann
adapt cases for handling thermal infeed into ThermalGrid
bed4f7b
@danielfeismann
fix consider qDot as heat result of hp only when hp is running
badd6d9
@danielfeismann
fmt
ae84f16
@danielfeismann
fix consider qDot as heat result of hp only when hp is running
f371e2e
@danielfeismann
fmt
6bb59f9
@danielfeismann
fix wrong case within thermalGrid
02edbf5
@danielfeismann
split handleInfeed method a tiny bit
6051f39
@danielfeismann
fix wrong case within thermalGrid
dab5a85
@danielfeismann
split handleInfeed method a tiny bit
0adc6c9
@danielfeismann
fmt
1586bd3
@danielfeismann
Merge branch 'dev' into df/#930-refactor-handleInfeed
88c6e3a 
# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
@danielfeismann
fix after merging dev
be3b094
@danielfeismann
fix tests after merging dev
6163afd
@danielfeismann
Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT
b90144d 
# Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
@danielfeismann
fmt
6d3a5c7
@danielfeismann
Merge branch 'dev' into df/#878-thermalGridIT
f6d0faa 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
Merge branch 'dev' into df/#878-thermalGridIT
21c50cf 
# Conflicts:
#	src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
@danielfeismann
Merge branch 'dev' into df/#878-thermalGridIT
79c3994 
# Conflicts:
#	CHANGELOG.md
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
em Related to Energy Management test Issues related to (unit) tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement ThermalGrid Integration test
1 participant
@danielfeismann