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 20221112 commit, add ci test in fv3atm #1492

Merged

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Nov 14, 2022

PR 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. Please consult the ufs-weather-model wiki if you are unsure how to do this.

  • This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

  • An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
    are specified below.

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.

  • New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsibility to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Provide a detailed description of what this PR does. What bug does it fix, or what feature does it add? Is a change of answers expected from this PR? Are any library updates included in this PR (modulefiles etc.)?

need to update MOM6 to its main branch 20221112 commit (no BL change)

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues must always be created before starting work on a PR branch!)

Testing

How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss2.intel
  • acorn.intel
  • opnReqTest for newly added/changed feature
  • CI

Dependencies

MOM6 issue NOAA-EMC/MOM6#105
MOM6 PR NOAA-EMC/MOM6#106
If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

modify mom6_files.cmake to add 3 new files
…alues (by following MOM6-examples)

KAPPA_SHEAR_VERTEX_PSURF_BUG
BAROTROPIC_TIDAL_SAL_BUG
LAYER_Z_INIT_IC_EXTRAP_BUG
@DeniseWorthen
Copy link
Collaborator

@jiandewang Please add the dependent PR information (the PR which you have open for MOM6)

@DeniseWorthen DeniseWorthen added the No Baseline Change No Baseline Change label Nov 15, 2022
@jiandewang
Copy link
Collaborator Author

@jiandewang Please add the dependent PR information (the PR which you have open for MOM6)

added.

@jkbk2004
Copy link
Collaborator

@jiandewang there is a minor fv3atm pr 603. Can we combine fv3atm pr 603 to this pr? just need to use @dustinswales 's fv3atm branch and hash.

@jiandewang
Copy link
Collaborator Author

@jiandewang there is a minor fv3atm pr 603. Can we combine fv3atm pr 603 to this pr? just need to use @dustinswales 's fv3atm branch and hash.

OK I will combine that later tonight and let you know (I am not at home at this moment)

@jiandewang
Copy link
Collaborator Author

I just did the submodule switch, @dustinswales can you double check on my change ?

@jiandewang jiandewang changed the title update mom6 to its main branch 20221112 commit update mom6 to its main branch 20221112 commit, add ci test in fv3atm Nov 18, 2022
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: gaea
Compiler: intel
Job: RT
[RT] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/1121965890/20221118214505/ufs-weather-model
[RT] Error: Test compile_011 failed in run_compile failed
Please make changes and add the following label back: gaea-intel-RT

@BrianCurtis-NOAA
Copy link
Collaborator

@jkbk2004 looks like you have everything tested for merge. I will skip Acorn due to NCO running tests on Acorn and asking me to stop my acorn run last week for this PR.

@jiandewang
Copy link
Collaborator Author

@DeniseWorthen @JessicaMeixner-NOAA can you check NOAA-EMC/MOM6#106 ?

@JessicaMeixner-NOAA
Copy link
Collaborator

@jiandewang checking now

@zach1221 zach1221 added the jenkins-ci Jenkins CI: ORT build/test on docker container label Nov 21, 2022
@jiandewang
Copy link
Collaborator Author

@jkbk2004 I am going to merging MOM6 and revert its submodule, do we need review for fv3atm from someone ?

@jkbk2004
Copy link
Collaborator

@jkbk2004 I am going to merging MOM6 and revert its submodule, do we need review for fv3atm from someone ?

Sure! I asked @dustinswales to revert ccpp branch and update ccpp hash on fv3atm pr.

@jiandewang
Copy link
Collaborator Author

@jkbk2004 MOM6 submodule has been reverted to dev/emc

@jkbk2004
Copy link
Collaborator

@jiandewang can you update fv3atm hash and revert branch?

@jiandewang
Copy link
Collaborator Author

@jiandewang can you update fv3atm hash and revert branch?

so Dustin has merged fv3atm to main branch ? what's the right hash # it should be ?

@jkbk2004
Copy link
Collaborator

@jiandewang can you update fv3atm hash and revert branch?

so Dustin has merged fv3atm to main branch ? what's the right hash # it should be ?

It's NOAA-EMC/fv3atm@f765174

Copy link
Contributor

@binli2337 binli2337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@jiandewang
Copy link
Collaborator Author

@jiandewang can you update fv3atm hash and revert branch?

so Dustin has merged fv3atm to main branch ? what's the right hash # it should be ?

It's NOAA-EMC/fv3atm@f765174

fv3atm pointing to develop branch now

@jkbk2004 jkbk2004 merged commit 1c24230 into ufs-community:develop Nov 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jenkins-ci Jenkins CI: ORT build/test on docker container No Baseline Change No Baseline Change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants