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.

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

Modify templates to support branched off configuration of GHEs #669

Merged
merged 50 commits into from
Nov 13, 2024

Conversation

JingWang-CUB
Copy link
Collaborator

@JingWang-CUB JingWang-CUB commented Oct 22, 2024

Any background context you want to provide?

Now the GHEs are directly put on the ATL which does not comply with real-world implementations.

What does this PR accomplish?

Put GHEs on their dedicated branches and add separate pumps for them.
image

How should this be manually tested?

poetry run any 5G tests with GHE

What are the relevant tickets?

#663

Screenshots (if appropriate)

@JingWang-CUB JingWang-CUB linked an issue Oct 22, 2024 that may be closed by this pull request
@JingWang-CUB JingWang-CUB marked this pull request as draft October 22, 2024 22:27
@JingWang-CUB JingWang-CUB changed the base branch from develop to bump-om November 11, 2024 21:32
@JingWang-CUB JingWang-CUB requested a review from vtnate November 11, 2024 21:47
@JingWang-CUB JingWang-CUB marked this pull request as ready for review November 11, 2024 23:05
Copy link
Contributor

@vtnate vtnate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love seeing a more realistic representation!

@vtnate vtnate merged commit 3a78ff3 into bump-om Nov 13, 2024
10 checks passed
@vtnate vtnate deleted the branch_off_ghe branch November 13, 2024 23:08
vtnate added a commit that referenced this pull request Nov 15, 2024
* experiment with new Ubuntu and OM versions

* bump dependency versions

* use OM 1.23.0 with Ubuntu 20 in Dockerfile

* refer to not-yet-built container in modelica_runner.py

* bump OM to 1.23.1

* use OMv1.24.0

* Upgrade to MBLv11 (#649)

* use MBLv11 paths in templates

* experiment with new Ubuntu and OM versions

* use OM 1.23.0 with Ubuntu 20 in Dockerfile

* update dependencies

* more code/template changes to work with MBLv11

* update Dockerfile to load new MBL version

* go back to what OM has in their Dockerfile (mostly)

* cleaned up Dockerfile after Netskope shenanigans

* even newer dependency versions [skip ci]

* document the MBL version in the runner readme

* update mbl version in CI

* bump gmt version, and use modelica-builder branch

* bump dependencies

* update modelica runner readme

* point to docker image that only exists on my computer

* read mbl version from utils function

* bump pre-commit hook versions

* linting

* bump dependencies

* redeclare ETS type and update variable name to fix broken tests due to version change

* change the required mo file name

* replace the mo file with the new version in MBLv11

* update function path

* new pump controller parameter input

* connect statements for new pump controller

* remove parameters no longer needed

* additional parameters required by distribution 2 pipe

* update path for terUni

* update paths and add dis

* new required parameter for pump control

* pre-commit changes

* compile msl test creates fmu one dir up from results dir

* pre-commit Modelica formatter changed some things

* reminder note to release MB in conjunction with this

* text fixes

---------

Co-authored-by: Jing Wang <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>

* remove unnecessary version in modelica runner readme

* add default for `fraLat` and clean up setting other defaults

* Modify templates to support branched off configuration of GHEs (#669)

* use MBLv11 paths in templates

* experiment with new Ubuntu and OM versions

* use OM 1.23.0 with Ubuntu 20 in Dockerfile

* update dependencies

* more code/template changes to work with MBLv11

* update Dockerfile to load new MBL version

* go back to what OM has in their Dockerfile (mostly)

* cleaned up Dockerfile after Netskope shenanigans

* even newer dependency versions [skip ci]

* document the MBL version in the runner readme

* update mbl version in CI

* bump gmt version, and use modelica-builder branch

* bump dependencies

* update modelica runner readme

* point to docker image that only exists on my computer

* read mbl version from utils function

* bump pre-commit hook versions

* linting

* bump dependencies

* redeclare ETS type and update variable name to fix broken tests due to version change

* change the required mo file name

* replace the mo file with the new version in MBLv11

* update function path

* new pump controller parameter input

* connect statements for new pump controller

* remove parameters no longer needed

* additional parameters required by distribution 2 pipe

* update path for terUni

* update paths and add dis

* new required parameter for pump control

* pre-commit changes

* change class of the district pump

* update mass flow rate in datDes

* add pump and controller to borefield instance

* modify medium and parameter redeclaration

* add district supply and return sensors for control

* connect statements for each borefield

* pre-commit changes

* rename file

* remove unused input file

* use renamed input file

* fix class name

* bug fix

* fix connection of QCoo_flow

* increase pump head for multi-ghe

* remove test_borefield and the corresponding coupling

---------

Co-authored-by: Nathan Moore <[email protected]>

* update modelica-builder to v0.6.0

* bump dependencies

* regenerate lock file after merging develop

---------

Co-authored-by: Jing Wang <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Jing Wang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Branch off GHE and add dedicated circulation pump for GHE
2 participants