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 repository 20230703 and 20230811 updating #1864

Merged

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Aug 13, 2023

PR Author Checklist:

  • I have linked PR's from all sub-components involved in section below.
  • I am confirming reviews are completed in ALL sub-component PR's.
  • I have run the full RT suite on either Hera/Cheyenne AND have attached the log to this PR below this line:
    • LOG:
  • I have added the list of all failed regression tests to "Anticipated changes" section.
  • I have filled out all sections of the template.

Description

MOM6 main repository was updated on 20230731 which is the original GFDL-candidate-20230703 (see detail at mom-ocean/MOM6#1603). Before this commit is merged to dev/emc, a gnu realted bug (see detail at mom-ocean/MOM6#1605) was reported by GMAO and a new commit was made to MOM6 main repository on 20230811. Need to update dev/emc MOM6 correspondingly for both two updating.

Linked Issues and Pull Requests

Associated UFSWM Issue to close

Close #1849

Subcomponent Pull Requests

MOM6 issue NOAA-EMC/MOM6#115, NOAA-EMC/MOM6#118 and MOM6 PR NOAA-EMC/MOM6#119

Blocking Dependencies

Subcomponents involved:

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

Anticipated Changes

Input data

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Regression Tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:
Tests effected by changes in this PR: all coupled tests include DATM

Libraries

  • Not Needed
  • Needed
    • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
    • Add issue link from JCSDA/spack-stack following this item
Code Managers Log
  • 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.
    • N/A

Testing Log:

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

  * modify mom6_files.cmake to reflect files being removed/added
@jiandewang
Copy link
Collaborator Author

jiandewang commented Aug 13, 2023

RegressionTests_hera.log.pdf
upload HERA rt.sh run log, note all the failure (NOT OK) are with MOM6 restart files

@FernandoAndrade-NOAA
Copy link
Collaborator

Hi @jiandewang, #1807 was merged in. Please go ahead and sync up your branches with the latest develop and we'll get started with testing, thank you.

@jiandewang
Copy link
Collaborator Author

Hi @jiandewang, #1807 was merged in. Please go ahead and sync up your branches with the latest develop and we'll get started with testing, thank you.

just sync-ed my branch

@FernandoAndrade-NOAA FernandoAndrade-NOAA 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. jenkins-ci Jenkins CI: ORT build/test on docker container labels Aug 14, 2023
@FernandoAndrade-NOAA
Copy link
Collaborator

All but one of the Jenkins ORTs passed. @zach1221 FYI, looks like a test failed during the stage data step, rst case for cpld_control_nowave_noaero_p8

@zach1221
Copy link
Collaborator

zach1221 commented Aug 15, 2023

@FernandoAndrade-NOAA I see. I think it's an issue with the new container. I'll verify ORT manually on Hera for now, so we can move forward with testing.
Uploading Jenkins-ci 1864 ORTs.pdf…

Here's the logs. Everything passed except for Regional_control dcp & thr. I'll run those on Hera.
Edit: adding Regional_control logs for thr and dcp. These ORTs passed.
OpnReqTests_regional_control_hera.log.txt

@zach1221 zach1221 added hera-BL Run Hera baseline creation jet-BL Run Baseline and RT on Jet labels Aug 15, 2023
@epic-cicd-jenkins epic-cicd-jenkins removed the jet-BL Run Baseline and RT on Jet label Aug 15, 2023
@epic-cicd-jenkins
Copy link
Collaborator

Automated RT Failure Notification
Machine: jet
Job: BL
Repo location: /lfs4/HFIP/hfv3gfs/role.epic/autort/pr/1473195741/20230815162218/ufs-weather-model
Please make changes and add the following label back: jet-BL

@FernandoAndrade-NOAA
Copy link
Collaborator

Automated RT Failure Notification Machine: jet Job: BL Repo location: /lfs4/HFIP/hfv3gfs/role.epic/autort/pr/1473195741/20230815162218/ufs-weather-model Please make changes and add the following label back: jet-BL

Rerunning manually. Please ignore this failure notice. It's likely a disk space quota that was reached today and is being cleared out. It could also likely be the compile_swswa_faster_intel timing out, it has regularly needed a higher build time limit.

@junwang-noaa
Copy link
Collaborator

@zach1221 The wcoss2 log file is at: /scratch1/NCEPDEV/stmp2/Jun.Wang/wcosslog/RegressionTests_wcoss2.log.

@zach1221
Copy link
Collaborator

Thanks, @junwang-noaa ! I'll get it.

@zach1221
Copy link
Collaborator

Good morning, @junwang-noaa . Are we skipping Acorn for this PR?

@junwang-noaa
Copy link
Collaborator

@zach1221 Some tests hang on acorn when creating baseline last night, I reran them, now the baseline was generated. Now I am running full RT.

@junwang-noaa
Copy link
Collaborator

@zach1221 acorn RT log file is now on hera at:
/scratch1/NCEPDEV/stmp2/Jun.Wang/wcosslog/RegressionTests_acorn.log

@zach1221
Copy link
Collaborator

@jiandewang testing is complete on this PR, so we can begin with the merging process of the sub-component PR.

@jiandewang
Copy link
Collaborator Author

@DeniseWorthen can you review MOM6 PR NOAA-EMC/MOM6#119 and let me know when it's time for me to do the submodule revert ?

@jiandewang
Copy link
Collaborator Author

just merged MOM6 PR, going to do submodule revert

@zach1221
Copy link
Collaborator

Thanks, @jiandewang . You may now update the submodule pointer and revert the .gitmodule change, following the merge of the MOM6 sub-component PR #119
MOM6 hash: 06acdc8e15ea9acf499b26f7f40c9852249c0690

@jiandewang
Copy link
Collaborator Author

MOM6 submodule reverted

@zach1221 zach1221 merged commit bb525bb into ufs-community:develop Aug 16, 2023
@jiandewang jiandewang deleted the feature/update-MOM6-20230811 branch July 22, 2024 03:47
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. hera-BL Run Hera baseline creation jenkins-ci Jenkins CI: ORT build/test on docker container 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 repo 20230731 and 20230811 commit
7 participants