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 repo. 20240228 updating #2166

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Mar 1, 2024

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
  • Commit 'test_changes.list' from previous step

Description:

This PR contains many non-Boussinesq related code enhancement, alone with many new features (see detail at mom-ocean/MOM6#1616 and NOAA-EMC/MOM6#127).

Commit Message:


  * MOM6 - 
update MOM6 to its main repo. 20240228 updating (which is the original GFDL 20231113 candidate PR)

Priority:

  • High: this is a longlasting PR which finally reached merging staging (after 3.5 months). Need to merge it to dev/emc and start to work on "remove compiling warning" right after this. Due to the complication of this PR, it's better to treat it as an independent PR.

Git Tracking

UFSWM:

close #2165

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Updates/Changes Baselines.

(1) cpld_control_c48: two new variables are being added in this setting (p_surf_EOS=True), this is why you will see all files are OK in cmp except ocean restart files on all platforms (except wcoss2). For wcoss2 answers are being changed.
(2) hafs_regional_storm_following_1nest_atm_ocn_wav_mom6: a bug fixing is included which changed answer in this PR

Input data Changes:

  • None.

Library Changes/Upgrades:

  • No Updates

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

    which originally is 20231113 PR candidate
  * pointing to MOM6 testing branch
  * midify MOm6 cmake list to reflect file changes
     (1) add new file src/parameterizations/lateral/MOM_self_attr_load.F90
     (2) MOM_unit_test_driver.F90 rename to test_MOM_file_parser.F90
     (3) add new files: time_MOM_EOS.F90, test_MOM_EOS.F90, test_MOM_mixedlayer_restrat.F90
                        test_MOM_string_functions.F90 and test_MOM_string_functions.F90
  * change DEFAULT_2018_ANSWERS=T to DEFAULT_ANSWER_DATE=20181231 for 025, 05 and 100 setting
@jiandewang
Copy link
Collaborator Author

jiandewang commented Mar 1, 2024

@jiandewang
Copy link
Collaborator Author

just sync-ed to latest UFSWM

@jiandewang
Copy link
Collaborator Author

got greenlight from @DeniseWorthen and @JessicaMeixner-NOAA for MOM6 PR

@jiandewang
Copy link
Collaborator Author

just added test_changes.list in my branch

@zach1221 zach1221 added 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. labels Mar 1, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

@zach1221 @jkbk2004 FYI Gaea has run into errors with the hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 test during runtime. It seems to be caused by obsolete runtime flags:
/gpfs/f5/epic/scratch/Fernando.Andrade-maldonado/FV3_RT/rt_73775/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel/err

360: FATAL from PE     0: MOM_obsolete_params: DEFAULT_2018_ANSWERS is an obsolete run-time flag, and should not be used. Instead use DEFAULT_ANSWER_DATE.

@jiandewang
Copy link
Collaborator Author

sorry my fault. I modified this in global coupled cases but forgot to modify for HAFS case. I will modify that once I get back home

@jiandewang
Copy link
Collaborator Author

just modify MOM_input_hafs, @FernandoAndrade-NOAA can you re-launch the job ?

@BrianCurtis-NOAA
Copy link
Collaborator

Acorn can be skipped. Still looking into the issues there, but they don't seem to be related to this PR.

@jiandewang
Copy link
Collaborator Author

just merged MOM6

@zach1221
Copy link
Collaborator

zach1221 commented Mar 4, 2024

just merged MOM6

Thanks, @jiandewang . Please update hash and revert the .gitmodule url.
NOAA-EMC/MOM6@10521a9

@jiandewang
Copy link
Collaborator Author

in meeting now, will do in 20min

@jiandewang
Copy link
Collaborator Author

just did submodule revert

@FernandoAndrade-NOAA FernandoAndrade-NOAA merged commit 4584860 into ufs-community:develop Mar 4, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update MOM6 to its main repository 20240228 commit
5 participants