-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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]>
- Loading branch information
1 parent
f8d1fbb
commit 164c265
Showing
48 changed files
with
319 additions
and
325 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
"version": "0.2", | ||
"language": "en", | ||
"words": [ | ||
"armhf", | ||
"autoload", | ||
"borefield", | ||
"buildingspy", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...ectors/couplings/5G_templates/NetworkAmbientWaterStub_Borefield/ComponentDefinitions.mopt
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
...onnectors/couplings/5G_templates/NetworkAmbientWaterStub_Borefield/ConnectStatements.mopt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.