-
Notifications
You must be signed in to change notification settings - Fork 7
Introducing energy demand for warm water heating #1358
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.
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
base: dev
Are you sure you want to change the base?
Conversation
# Conflicts: # src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala # src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala # src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalHouseSpec.scala
# Conflicts: # src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalHouseSpec.scala
# Conflicts: # src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
# Conflicts: # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala # src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala
# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/model/thermal/ThermalDemandConditions.scala # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala # src/main/scala/edu/ie3/simona/model/thermal/ThermalStrategyPatterns.scala
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR introduces energy demand for warm water heating in SIMONA's thermal modeling system. It adds domestic hot water storage functionality to thermal grids and enhances the thermal house model to handle both space heating and hot water demands.
Key changes include:
- Addition of domestic hot water storage components and their integration into thermal grids
- Enhanced thermal grid logic to handle multiple storage types and demand scenarios
- Refactored feed-in strategy patterns for distributing thermal power across grid elements
Reviewed Changes
Copilot reviewed 20 out of 21 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| ThermalGrid.scala | Major refactoring to support domestic hot water storage, new demand calculation methods, and feed-in strategy patterns |
| ThermalHouse.scala | Added import ordering fix for better code organization |
| ThermalThreshold.scala | Added SimpleThermalThreshold case class for generic threshold handling |
| ThermalStrategyPatterns.scala | New file defining feed-in distribution strategies |
| ThermalStorageType.scala | New type definitions for storage type safety |
| ThermalResult.scala | New result handling classes for different thermal components |
| ThermalDemandConditions.scala | New conditions evaluation logic for thermal demand scenarios |
| HpModel.scala | Updated to handle domestic hot water demand determination and enhanced operating point structure |
| Test files | Extensive updates to test data and specifications to accommodate new domestic hot water functionality |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/model/thermal/ThermalDemandConditions.scala # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
# Conflicts: # CHANGELOG.md
# Conflicts: # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala # src/main/scala/edu/ie3/simona/model/thermal/ThermalStrategyPatterns.scala # src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala # src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
resolves #856
merge first
ThermalGrid.determineMostRecentThreshold()#1478