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

Upgrade OpenModelica & MBL #641

Merged
merged 17 commits into from
Nov 15, 2024
Merged

Upgrade OpenModelica & MBL #641

merged 17 commits into from
Nov 15, 2024

Conversation

vtnate
Copy link
Contributor

@vtnate vtnate commented Jul 2, 2024

Any background context you want to provide?

A new version of OpenModelica was recently released. We can now take advantage of their "many improvements and bug fixes" in this newest version.

What does this PR accomplish?

  • Update Dockerfile to use new OM version
    • Rename a variable in the Dockerfile
    • Move cmake to a different part of the Dockerfile to be as similar as possible to the OM Dockerfile ours is modeled on
  • Declare new version of the Dockerfile in the Modelica readme
  • Refer to the not-yet-created/uploaded Docker image in modelica_runner.py

How should this be manually tested?

  • Generate new Docker image according to the docs
    • Tag it 2.1.03.0.0 (@nllong is that the right version for this change?)
  • Upload to NREL's dockerhub account
  • Run test suite
    • These tests are the ones that work with Ubuntu 20 but not with 22 or 24 😢 (due to something in this file that LBNL isn't interested in addressing) and make a good canary in the coal mine.

What are the relevant tickets?

Screenshots (if appropriate)

@vtnate vtnate added the dependencies Pull requests that update a dependency file label Jul 2, 2024
@vtnate vtnate requested a review from nllong July 2, 2024 15:06
@vtnate vtnate self-assigned this Jul 2, 2024
@nllong
Copy link
Member

nllong commented Jul 3, 2024

tests failing? should I wait until that gets resolved to review?

@vtnate
Copy link
Contributor Author

vtnate commented Jul 3, 2024

tests failing? should I wait until that gets resolved to review?

No, please review now. The tests are failing because in modelica_runner.py I'm referring to an image that doesn't exist yet.

Will you please:

  1. confirm that version 2.1.0 is correct
  2. build the image
  3. run the tests locally (if you don't trust me 😆)
  4. push the image to dockerhub

Once those are good, I can re-run CI and once we have all green you can approve and we can merge it.

@vtnate vtnate changed the title Bump OM to 1.23.0 Upgrade OpenModelica Jul 5, 2024
@vtnate vtnate marked this pull request as draft October 8, 2024 21:38
@vtnate vtnate marked this pull request as ready for review October 9, 2024 20:37
vtnate and others added 5 commits October 28, 2024 08:39
* 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]>
* 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]>
Copy link
Member

@nllong nllong left a comment

Choose a reason for hiding this comment

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

amazing! This is so much work. Glad to see the tests passing to make sure that this doesn't break anything!

@vtnate vtnate changed the title Upgrade OpenModelica Upgrade OpenModelica & MBL Nov 15, 2024
@vtnate vtnate merged commit 164c265 into develop Nov 15, 2024
10 checks passed
@vtnate vtnate deleted the bump-om branch November 15, 2024 21:13
@vtnate vtnate added the enhancement New feature or request label Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants