Skip to content

Update mom6 to its main repo. 20260828 commit - #3344

Open
jiandewang wants to merge 13 commits into
ufs-community:developfrom
jiandewang:feature/update-MOM6-20260828
Open

Update mom6 to its main repo. 20260828 commit#3344
jiandewang wants to merge 13 commits into
ufs-community:developfrom
jiandewang:feature/update-MOM6-20260828

Conversation

@jiandewang

@jiandewang jiandewang commented Aug 30, 2026

Copy link
Copy Markdown
Collaborator

Commit Queue Requirements:

  • This PR addresses a relevant WM issue (if not, create an issue).
  • All subcomponent pull requests (if any) have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines), preferably on Ursa (Derecho or Hercules are acceptable alternatives). Exceptions: documentation-only PRs, CI-only PRs, etc.
    • Commit log file w/full results from RT suite run (if applicable).
    • Verify that test_changes.list indicates which tests, if any, are changed by this PR. Commit test_changes.list, even if it is empty.
  • Transparency in the use of generative AI is required by NOAA policy. Was GenAI used in this work?
    • No.
    • Yes. [Generative AI tool (insert name, if any)] was used to assist with developing this code.
      • The code has been reviewed, edited, and validated by NWS staff. (Note: If the code has not yet been reviewed by NWS staff, leave unchecked, and OMD CMs will review as part of the PR review process.)
  • Fill out all sections of this template.

Description:

MOM6 main was updated on 20260828 which is originally GFDL's 20260727 PR https://github.com/mom-ocean/MOM6/pull/1708. Need to sync to dev/emc and UFS

Commit Message:

* UFSWM - Update MOM6 to its main repo. 20260828 commit (GFDL's 20260727 PR)
  * MOM6 - Update MOM6 to its main repo. 20260828 commit (GFDL's 20260727 PR)

Priority:

  • Critical Bugfix: Reason
  • High: Reason
  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • Blocked by #
  • None

Documentation:

  • Documentation update required.
    • Relevant updates are included with this PR.
    • A WM issue has been opened to track the need for a documentation update; a person responsible for submitting the update has been assigned to the issue (link issue).
  • Documentation update NOT required.
    • Explanation:

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Adds New Tests/Baselines.
  • PR Updates/Changes Baselines.
  • No Baseline Changes.

Input data Changes:

  • None.
  • PR adds input data.
  • PR changes existing input data.

Library Changes/Upgrades:

  • Required
    • Library names w/versions:
    • Git Stack Issue (JCSDA/spack-stack#)
  • No Updates

Testing Log:

  • RDHPCS
    • Orion
    • Hercules
    • GaeaC6
    • Derecho
    • Ursa
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

Testing Remarks:

@jiandewang

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA I ran my branch on both hercules and URSA but only checked in hercules run log and test_change.list. There are several test cases (cpld and datm) that also need new baseline but they are excluded from hercules runs. For unknown reason my run on URSA failed to generate run log and test_change.list although all jobs were run

@jiandewang
jiandewang marked this pull request as ready for review August 30, 2026 02:27
@gspetro-NOAA

Copy link
Copy Markdown
Collaborator

@gspetro-NOAA I ran my branch on both hercules and URSA but only checked in hercules run log and test_change.list. There are several test cases (cpld and datm) that also need new baseline but they are excluded from hercules runs. For unknown reason my run on URSA failed to generate run log and test_change.list although all jobs were run

I'll give it a try on my end today so that we can get the complete test_changes.list.

@gspetro-NOAA gspetro-NOAA moved this from Evaluating to Pre-testing required in PRs to Process Aug 31, 2026
@gspetro-NOAA gspetro-NOAA added Baseline Updates Current baselines will be updated. MOM There are changes to the MOM6 component repository. labels Aug 31, 2026
@gspetro-NOAA gspetro-NOAA moved this from Pre-testing required to Review in PRs to Process Aug 31, 2026
@jiandewang

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA thanks for running on URSA to have the full change list.

@gspetro-NOAA gspetro-NOAA moved this from Review to Schedule in PRs to Process Sep 2, 2026
@gspetro-NOAA

Copy link
Copy Markdown
Collaborator

Noting here that the failed check for an increase in warnings/remarks is due to an increase of 3 remark 10448 ifort deprecation. These can be ignored.

@gspetro-NOAA gspetro-NOAA added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Sep 2, 2026
@jiandewang

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA thanks for the explanation on warning flag, I was puzzled on that previously.

@gspetro-NOAA

Copy link
Copy Markdown
Collaborator

@gspetro-NOAA thanks for the explanation on warning flag, I was puzzled on that previously.

Np! Once we move to spack-stack 2.x, there should be no more remarks, but for now, we like to track them to make sure nothing unexpected comes up.

@gspetro-NOAA

Copy link
Copy Markdown
Collaborator

@jiandewang Please sync w/develop. We'd like to process this PR next. :)

@jiandewang

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA do you think you can finishe all the platforms' run by the end of Firday ? I will be out of town from Saturday until next Thursday.

@jiandewang

jiandewang commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA If you have write permission to my branch (revert MOM6 branch), then you can start my PR. @sanAkel can do the MOM6 merging.
I just sync-ed my branch.

@gspetro-NOAA

Copy link
Copy Markdown
Collaborator

@uturuncoglu If you have write permission to my branch (revert MOM6 branch), then you can start my PR. @sanAkel can do the MOM6 merging. I just sync-ed my branch.

@jiandewang I believe I have write permissions (having pushed the Ursa log), so when we get to that point in the process, I'm happy to revert .gitmodules and update the hash if you will be away. As long as @sanAkel can merge the MOM6 PR after we run the RTs, we should be okay. I expect the testing process may take a while anyway because Derecho is still out and won't be back from maintenance till tomorrow.

@jiandewang

Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA then you can start my PR and signal @sanAkel to merging MOM6 by the time.
@sanAkel please help me on this and make sure do NOT use squash merging.

@gspetro-NOAA gspetro-NOAA added the In Testing The PR that is currently in testing stages label Sep 3, 2026
@BrianCurtis-NOAA BrianCurtis-NOAA linked an issue Sep 3, 2026 that may be closed by this pull request
@gspetro-NOAA gspetro-NOAA added hercules-RT Run Hercules regression testing orion-RT Run regression tests on Orion labels Sep 4, 2026
@epic-cicd-jenkins epic-cicd-jenkins removed hercules-CI_RUNNING hercules-RT Run Hercules regression testing labels Sep 4, 2026
@epic-cicd-jenkins epic-cicd-jenkins removed orion-CI_RUNNING orion-RT Run regression tests on Orion labels Sep 4, 2026
@sanAkel

sanAkel commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

@sanAkel please help me on this and make sure do NOT use squash merging.

@jiandewang please txt me when you need me to do ⬆️

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. In Testing The PR that is currently in testing stages MOM There are changes to the MOM6 component repository. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.

Projects

Status: Schedule

Development

Successfully merging this pull request may close these issues.

update MOM6 to its maon repo. 20260828 commit WCOSS2 Testing PR #3344

6 participants