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

Removed SOCA linkages for now and put them in a branch #3

Closed
wants to merge 2 commits into from

Conversation

mark-a-potts
Copy link
Collaborator

Description

This PR sets up the ufs-jedi-bundle to build with UFS in ATM-only mode.
Development work will continue on a branch to add in SOCA via UFS.

Definition of Done

The UFS related regression tests can be run via CI.

Issue(s) addressed

Dependencies

  • waiting on JCSDA-internal/fv3-jedi/pull/282

Impact

FV3-bundle should also be updated to remove the UFS option for building.

If changes in this PR require updating test data on AWS please add an "update test data" label and list the test data that needs to be updated to the best of your knowledge (example below).
Requires updating AWS test data for the following repositories:

ufs-c48 test data needs to be uploaded.

ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH feature/ufs UPDATE )
endif()
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH feature/ufs UPDATE )
Copy link
Contributor

Choose a reason for hiding this comment

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

Does the branch fv3-jedi::feature/ufs need to be merged into develop first or is this just temporary?

Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

Changes look good. I just have 1 question that needs clarification.

@mark-a-potts
Copy link
Collaborator Author

I have a PR in for the changes to fv3-jedi, so if that gets through, then we would want to change to develop for fv3-jedi and fv3-jedi-lm.

@mark-a-potts
Copy link
Collaborator Author

Just added a PR for fv3-jedi-lm as well. Those changes are minor, but necessary.

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

This looks good to me, sorry for the very late review. There is a question from @aerorahul that still needs to be answered. I assumed for my review that the feature/ufs branch is temporary.

Copy link

@guillaumevernieres guillaumevernieres left a comment

Choose a reason for hiding this comment

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

👍

if(NOT UFS_APP MATCHES "^(ATM|NG-GODAS|S2S)$")
ecbuild_error("Valid options for -DUFS_APP are ATM|NG-GODAS|S2S")
if(NOT UFS_APP MATCHES "^(ATM)$")
ecbuild_error("Only -DUFS_APP=ATM is currently supported")

Choose a reason for hiding this comment

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

Lame! ;)

@climbfuji
Copy link
Collaborator

@mark-a-potts I am finally getting to this, will test the ufs-jedi-bundle and the fv3-jedi-bundle on my mac with the changes to this repo, fv3-jedi and fv3-jedi-data.

@climbfuji
Copy link
Collaborator

@mark-a-potts @aerorahul This PR is aging off pretty quickly. Are there PRs that need to be merged first? This was a question that Rahul had a while back. Thanks.

@climbfuji
Copy link
Collaborator

Superseded by #9

@climbfuji climbfuji closed this Feb 7, 2023
@climbfuji climbfuji deleted the feature/ufs branch February 7, 2023 22:28
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.

Get ufs-jedi-bundle into working state
4 participants