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 MOM6 to its main branch 20230206 updating and remove cpld_esmfthreads_p8 #1602

Closed

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Feb 7, 2023

Description

MOM6 main branch is updated on 20230206, this is based on EMC ungridded dimension pstokes PR (mom-ocean/MOM6#1591), but being added through cherry-pick the ci failure fixing from dev/gfdl.
need to make corresponding updating in dev/emc and ufs-weather-model. No answer change is expected.

Top of commit queue on: TBD

Input data additions/changes

  • No changes are expected to input data.
  • There will be new input data.
  • Input data will be updated.

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved
  • Confirm reviews completed in sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne with both Intel/GNU compilers
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

MOM6 PR NOAA-EMC/MOM6#111

Testing Day 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.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

  • RDHPCS
    • Intel
      • Hera
      • Orion
      • Jet
      • Gaea
      • Cheyenne
    • GNU
      • Hera
      • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

@jiandewang
Copy link
Collaborator Author

HERA_intel-log.pdf

@jiandewang
Copy link
Collaborator Author

HERA-gun-log.pdf

@jiandewang
Copy link
Collaborator Author

@jkbk2004 can you give a bit high priority for this PR by combining it with upcoming PR as #1599 is pending on it. It only has one line of script level change to fix MOM6 CI issue, no any code or answer change.

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Feb 7, 2023

It might be worthwhile to fix Issue #1598 with this PR since doesn't have any code changes either. All it needs is to remove the tests/cpld_esmfthreads_p8 file and remove cpld_esmfthreads_p8 from the rt.conf

@jiandewang
Copy link
Collaborator Author

It might be worthwhile to fix Issue #1598 with this PR since doesn't have any code changes either. All it needs is to remove the tests/cpld_esmfthreads_p8 file and remove cpld_esmfthreads_p8 from the rt.conf

@DeniseWorthen sure will do that

@jiandewang
Copy link
Collaborator Author

It might be worthwhile to fix Issue #1598 with this PR since doesn't have any code changes either. All it needs is to remove the tests/cpld_esmfthreads_p8 file and remove cpld_esmfthreads_p8 from the rt.conf

@DeniseWorthen sure will do that

@DeniseWorthen can you double check on what I did for Issue #1598 ?

@jiandewang jiandewang changed the title update MOM6 to its main branch 20230206 updating update MOM6 to its main branch 20230206 updating and remove cpld_esmfthreads_p8 Feb 7, 2023
@DeniseWorthen
Copy link
Collaborator

@jiandewang Looks good.

@jkbk2004 jkbk2004 added Baseline Updates Current baselines will be updated. Waiting for Reviews The PR is waiting for reviews from associated component PR's. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. labels Feb 9, 2023
@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 9, 2023

@jiandewang sounds like to resolve a conflict on fv3.

@jiandewang
Copy link
Collaborator Author

@jiandewang sounds like to resolve a conflict on fv3.

I may did the merging in the wrong order, waiting for Jun's instruction. My branch was not up to date (as you just had one commit today), while Jun's is up to date. I did the merge before sync mine

@jiandewang
Copy link
Collaborator Author

just checked Jun's branch, it turned out that neither her nor mine branch did sync before I did the merging. Things are being messed up so let me delete my branch and start from new, will ask Jun to do the same thing, then Jun can re-issue a PR to my branch.

@jiandewang jiandewang closed this Feb 9, 2023
@jiandewang jiandewang deleted the feature/update-MOM6-20230206 branch February 9, 2023 19:15
@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 9, 2023

@jiandewang
Copy link
Collaborator Author

@jiandewang I think you can reopen once @junwang-noaa update https://github.com/junwang-noaa/fv3atm/tree/hafs_movingnest

just removed old and re-issue a new (clean) PR #1606

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 9, 2023

@jiandewang I think you can reopen once @junwang-noaa update https://github.com/junwang-noaa/fv3atm/tree/hafs_movingnest

just removed old and re-issue a new (clean) PR #1606

sure!

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. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

drop cpld_esmfthreads_p8 test
4 participants