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

(1) update MOM6 to its main branch 20220629 updating (NCAR 20220603 candidate) (2) add temperature limiter in SPPT #1302

Merged

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Jun 29, 2022

PR Checklist

  • This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.

  • This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

  • An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
    are specified below.

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.
    A wave related bug is detected and fixed in this updating which change answers for coupled jobs

  • New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsibility to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Provide a detailed description of what this PR does. What bug does it fix, or what feature does it add? Is a change of answers expected from this PR? Are any library updates included in this PR (modulefiles etc.)?

MOM6 main branch is updated on 20220629, need to make corresponding updating in UFS

Issue(s) addressed

#1301 and MOM6 issue NOAA-EMC/MOM6#94

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues must always be created before starting work on a PR branch!)

Testing

How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss2.intel Not available
  • opnReqTest for newly added/changed feature
  • CI

Dependencies

MOM6 issue NOAA-EMC/MOM6#94 and PR NOAA-EMC/MOM6#95
If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

add 3 new files in cmake list
@DeniseWorthen DeniseWorthen added Baseline Updates Current baselines will be updated. labels Jun 30, 2022
@jiandewang jiandewang changed the title update MOM6 to its main branch 20220629 updating (NCAR 20220603 candidate) (1) update MOM6 to its main branch 20220629 updating (NCAR 20220603 candidate) (2) add temperature limiter in SPPT Jul 16, 2022
@jiandewang
Copy link
Collaborator Author

@jkbk2004 I just updated my UFS branch, you can start when you have time (I know you are in the meeting now)

@jkbk2004
Copy link
Collaborator

@jiandewang cice6 c-grid pr was just merged. We can start working on this PR. Jet is still down. So we can pla to continue test until tomorrow.

@jiandewang
Copy link
Collaborator Author

@jkbk2004 sounds good

@BrianCurtis-NOAA
Copy link
Collaborator

Cactus is down today until about 4pm. Can skip.

@jiandewang
Copy link
Collaborator Author

@jkbk2004 Let me know when it's the time to change BL date and merging MOM6

@DeniseWorthen
Copy link
Collaborator

@jiandewang BL_date was changed already (62a9d9d). We'll merge this afternoon to make time for UIFCW activities.

@jiandewang
Copy link
Collaborator Author

@DeniseWorthen OK I am going to merge MOM6 and change submodule in UFS

@jiandewang
Copy link
Collaborator Author

MOM6 submodule is pointing to dev/emc now

@DeniseWorthen
Copy link
Collaborator

@jiandewang please check again for the MOM6 hash. emc/develop is at ec1d17e

@jiandewang
Copy link
Collaborator Author

@jiandewang please check again for the MOM6 hash. emc/develop is at ec1d17e

I forgot to do submodule sync

@jiandewang
Copy link
Collaborator Author

@DeniseWorthen can you check again ?

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Jul 21, 2022

I still see your ufs-weather-model branch using MOM6 hash a249742.

I think we need to be sure we ran the BL with the correct MOM6 hash. Did you add Phil's change to what you had for the MOM6 update?

@jiandewang
Copy link
Collaborator Author

I still see your ufs-weather-model branch using MOM6 hash a249742.

I think we need to be sure we ran the BL with the correct MOM6 hash. Did you add Phil's change to what you had for the MOM6 update?

what about now ? yes Phil's change is in it (hash #a24974211)

@jiandewang
Copy link
Collaborator Author

jiandewang commented Jul 21, 2022

@DeniseWorthen can you check MOM6 hash again? I think it is the correct one now.

@DeniseWorthen
Copy link
Collaborator

@jiandewang The hash is now correct (ec1d17e)

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA @DeniseWorthen @binli2337 I am back on line now. Can we go ahead to approve the PR and merge in?

@jkbk2004 jkbk2004 merged commit bb29481 into ufs-community:develop Jul 21, 2022
@jiandewang jiandewang deleted the feature/update-MOM6-20220603 branch July 24, 2023 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update MOM6 to its main branch 20220629 commit
5 participants