update MOM6 to its main repo. 20260112 updating

[jiandewang]

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.
• Fill out all sections of this template.

---

Description:

MOM6 main repo. was updated on 20260112 which is originally GFDL's 20250925 PR. See detail at mom-ocean/MOM6#1680. We need to sync dev/emc repo correspongingly.

Note in this PR an OBC bug fixing flag is introduced which will change answer. To retain BL for current OBC setting job, we can add OBC_PROJECTION_BUG=T. But we are going to use its defaule value False in UWM which means we will need a new BL for hafs_regional_storm_following_1nest_atm_ocn_wav_mom6.

Commit Message:

* UFSWM - 
  * AQM - 
  * CDEPS - 
  * CICE - 
  * CMEPS - 
  * CMakeModules - 
  * UFSATM - 
    * ccpp-physics - 
    * atmos_cubed_sphere - 
  * GOCART - 
  * HYCOM - 
  * MOM6 - update MOM6 to its main repository 20260112 updating (originally GFDL's 20250925 PR)
  * NOAHMP - 
  * WW3 - 
  * fire_behavior
  * stochastic_physics - 

Priority:

• Critical Bugfix: Reason
• High: Reason
• Normal

Git Tracking

UFSWM:

• Closes #
  close update MOM6 to its main repo. 20260112 updating #3050

Sub component Pull Requests:

• MOM6: update MOM6 to its main repo. 20260112 updating NOAA-EMC/MOM6#169

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
  • Hera
  • Orion
  • Hercules
  • GaeaC6
  • Derecho
  • Ursa
• WCOSS2
  • Dogwood/Cactus
  • Acorn
• CI
• opnReqTest (complete task if unnecessary)

[jiandewang]

this PR has been fully tested on wcoss2, URSA, GAEA C6 and URSA and can be put in commit queue

[gspetro-NOAA]

@jiandewang Could you push the logs from a full RT run, preferably on Ursa (Hercules would also be fine)?

[jiandewang]

@jiandewang Could you push the logs from a full RT run, preferably on Ursa (Hercules would also be fine)?

@gspetro-NOAA just added hercules run log.

[gspetro-NOAA]

@gspetro-NOAA just added hercules run log.

Thanks! And just to confirm, only one RT changes baselines?

EDIT: Nvm, I can see from the logs that only one RT changes BL. :)

[jiandewang]

yes, only hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 needs a new BL

[jiandewang]

@gspetro-NOAA FYI: submodule MOM6 has been reviewed and approved.

[gspetro-NOAA]

@jiandewang Please sync with develop as soon as you have a chance. We'd like to process this PR next.

[jiandewang]

@gspetro-NOAA I am not in front of computer at this moment, will sync it once I am back home. Thanks

[gspetro-NOAA]

@gspetro-NOAA I am not in front of computer at this moment, will sync it once I am back home. Thanks

No worries--it's the weekend! I probably should have left off my usual "as soon as you can." 😉

[jiandewang]

@gspetro-NOAA I just did sync but seems not totally correct. THese are my steps (I can't do on github web as there are conflict for change-list.txt and hercules log file).

(1) git clone https://github.com/jiandewang/ufs-weather-model
(2) cd ufs-weather-model
(3) git checkout feature/update-MOM6-20260112
(4) git submodule update --init --recursive
(5) git remote add upstream https://github.com/ufs-community/ufs-weather-model
(6) git fetch upstream
(7) git merge origin feature/update-MOM6-20260112

then it shows two files are in conflict, I used
git checkout --ours tests/logs/RegressionTests_hercules.log
git checkout --ours tests/test_changes.list
git add *
git commit -m '.....'
git push origin feature/update-MOM6-20260112

apparently the above steps are not totally correct as I can see from https://github.com/ufs-community/ufs-weather-model/pull/3051/files.

This PR should only has changes in MOM6 and mom6_files.cmake

What's the step that I missed ?

[jiandewang]

@gspetro-NOAA I know the reason now, I forgot to do submodule update after the merging. Fixed it.

[FernandoAndrade-NOAA]

We should be all set with testing, leaving a note in sub PR.

[jiandewang]

MOM6 merged, hash is b4d9a232

[jiandewang]

is it the time for mt to do the submodule updating ?

[FernandoAndrade-NOAA]

is it the time for mt to do the submodule updating ?

Yes, please go ahead and resync and revert .gitmodules, thank you.

[jiandewang]

MOM6 submodule reverted