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

add mynn surface scheme as opt_sfc=4 in NoahMP #1224

Merged
merged 30 commits into from
Jun 30, 2022

Conversation

HelinWei-NOAA
Copy link
Collaborator

@HelinWei-NOAA HelinWei-NOAA commented May 19, 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.

issue 920 in ccpp-physics

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.
    opt_sfc=4 will be used for some regional RTs. Results will be changed.

  • 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 responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

This PR is to add MYNN surface scheme as opt_sfc=4 in NoahMP and recode the thermal roughness scheme as a subroutine. A bug with opt_sfc=1 was fixed. 2m T/Q from NoahMP instead of sfc_diag will be used as outputs.

The update is not aimed for UFS coupled prototype 8, but for RRFS.

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!)

  • fixes #<issue_number>
  • fixes noaa-emc/fv3atm/issues/<issue_number>

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
  • opnReqTest for newly added/changed feature
  • CI

Dependencies

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

@jkbk2004
Copy link
Collaborator

@HelinWei-NOAA I think we can start working on this PR. Can you sync up your branches to develop/main: ccpp and fv3atm?

tests/rt.sh Outdated Show resolved Hide resolved
@github-actions
Copy link

@HelinWei-NOAA please bring these up to date with respective authoritative repositories

  • fv3 NOT up to date

@HelinWei-NOAA
Copy link
Collaborator Author

Which submodules are not up to date? Thanks.

@HelinWei-NOAA please bring these up to date with respective authoritative repositories

  • fv3 NOT up to date

@DeniseWorthen
Copy link
Collaborator

@SamuelTrahanNOAA Please check the changes in tests/parm/rrfs_conus13km_hrrr.nml.IN

@DusanJovic-NOAA
Copy link
Collaborator

Something is wrong with this PR. Description says it depends on fv3atm PR 537, but .gitmodules does not point to a fork with that PR, it still points to NOAA-EMC

tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
tests/parm/rrfs_conus13km_hrrr.nml.IN Outdated Show resolved Hide resolved
@SamuelTrahanNOAA
Copy link
Collaborator

Could @joeolson42 please review these changes?

@jkbk2004 jkbk2004 requested a review from DusanJovic-NOAA June 14, 2022 22:01
@jkbk2004
Copy link
Collaborator

Could @joeolson42 please review these changes?

@SamuelTrahanNOAA added @joeolson42 to the repo.

@HelinWei-NOAA
Copy link
Collaborator Author

At this moment I have reverted all opt_sfc changes. In the future we will redesign some RTs using opt_sfc=4.

@SamuelTrahanNOAA
Copy link
Collaborator

At this moment I have reverted all opt_sfc changes. In the future we will redesign some RTs using opt_sfc=4.

You have not reverted the changes to the conus13km namelist.

@jkbk2004
Copy link
Collaborator

@HelinWei-NOAA can you address the reviewers' comments above?

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: jet
Compiler: intel
Job: BL
[BL] Repo location: /lfs4/HFIP/h-nems/emc.nemspara/autort/pr/941988484/20220630030013/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /lfs4/HFIP/h-nems/emc.nemspara/autort/pr/941988484/20220630045456/ufs-weather-model
Please make changes and add the following label back: jet-intel-BL

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: orion
Compiler: intel
Job: BL
[BL] Repo location: /work/noaa/nems/emc.nemspara/autort/pr/941988484/20220630101510/ufs-weather-model
[BL] Error: Test hafs_global_1nest_atm 083 failed in run_test failed
[BL] Error: Test hafs_global_multiple_4nests_atm 084 failed in run_test failed
[BL] Error: Test hafs_regional_storm_following_1nest_atm_ocn 087 failed in run_test failed
Please make changes and add the following label back: orion-intel-BL

@jkbk2004
Copy link
Collaborator

@HelinWei-NOAA Please, resolved the conversations. @DeniseWorthen @DusanJovic-NOAA @SamuelTrahanNOAA The PR is ready for final comments and approval. All RTs passed.

@SamuelTrahanNOAA
Copy link
Collaborator

@jkbk2004 Github will not let me resolve the conversations. Perhaps only the author and people with write access can do that? I have re-reviewed and given my approval.

@DeniseWorthen
Copy link
Collaborator

I've resolved what I can see of the conversations and approved.

@HelinWei-NOAA
Copy link
Collaborator Author

@jkbk2004 I didn't see any unresolved conversions. Just waiting for Dusan's approval.

@DusanJovic-NOAA
Copy link
Collaborator

FV3 submodule still points to fork's URL/branch.

@HelinWei-NOAA
Copy link
Collaborator Author

We need to merge ccpp-physics branch first, then FV3.

FV3 submodule still points to fork's URL/branch.

@jkbk2004
Copy link
Collaborator

We need to merge ccpp-physics branch first, then FV3.

FV3 submodule still points to fork's URL/branch.

@HelinWei-NOAA can you work with @SamuelTrahanNOAA to merge in ccpp pr first?

@SamuelTrahanNOAA
Copy link
Collaborator

@jkbk2004 ccpp-physics is merged

@HelinWei-NOAA
Copy link
Collaborator Author

@SamuelTrahanNOAA Thanks. Now I need to update my FV3 branch and then someone can merge my FV3 PR.

@SamuelTrahanNOAA
Copy link
Collaborator

I cannot merge to fv3atm, but I'm sure there's someone else monitoring this who can merge.

@jkbk2004
Copy link
Collaborator

@HelinWei-NOAA can you make last update of fv3atm pointer and revert submodule pointer?

@HelinWei-NOAA
Copy link
Collaborator Author

@HelinWei-NOAA can you make last update of fv3atm pointer and revert submodule pointer?

Done.

@jkbk2004
Copy link
Collaborator

@DusanJovic-NOAA all ready to merge. Can you approve?

@jkbk2004 jkbk2004 merged commit d179ec3 into ufs-community:develop Jun 30, 2022
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants