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

Update to use FMS 2023.04 #1043

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from

Conversation

shlyaeva
Copy link
Collaborator

@shlyaeva shlyaeva commented May 14, 2024

All work done by @climbfuji and @travissluka, I'm just raking up PR points.

jedi-ci-bundle-branch=feature/no_gfdl_forks
jedi-ci-next=true

build-group=https://github.com/JCSDA-internal/fv3-jedi-linearmodel/pull/17
build-group=JCSDA/GFDL_atmos_cubed_sphere#6
build-group=https://github.com/JCSDA-internal/fv3-jedi/pull/812

@shlyaeva shlyaeva marked this pull request as ready for review June 11, 2024 11:05
@shlyaeva shlyaeva added the coordinate merge Ready for merge but needs to be coordinated with other repos label Jun 11, 2024
@shlyaeva shlyaeva changed the title Feature/mom6 fms update dom 20240509 Update to use FMS 2023.04 Jun 11, 2024
@climbfuji
Copy link
Contributor

I don't see any CI runs?

@shlyaeva
Copy link
Collaborator Author

I just made it non-draft a few minutes ago; we'll need to trigger CI.

@eap
Copy link

eap commented Jun 11, 2024

I temporarily patched a change to the CI manifest that should allow this to build. It has already gotten past the first configuration step so we should have the results soon.

I've already reverted the change (since it was global) so additional pushes will fail quickly as before.

Copy link
Collaborator

@travissluka travissluka left a comment

Choose a reason for hiding this comment

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

I see the modified CI worked.
Builds and tests pass on my machine (with develop merged in)

It'll be nice to remove the JCSDA FMS and MOM6 repo forks !

@@ -47,10 +48,7 @@ include_directories( ${NETCDF_INCLUDE_DIRS} )
# Model
# TODO update to allow switching between mom6solo (here) and UFS (external)
Copy link
Collaborator

Choose a reason for hiding this comment

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

note to self, or anyone else that cares, this is fine for now but I'm assuming we're building MOM6 twice when soca is built as part of the ufs-bundle. No real harm, but wasteful. At some point special logic should be added to use a prebuilt mom6 lib if it exists.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
coordinate merge Ready for merge but needs to be coordinated with other repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants