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

Develop ugwp improvements #1488

Merged
merged 48 commits into from
Dec 22, 2022

Conversation

mdtoyNOAA
Copy link
Contributor

@mdtoyNOAA mdtoyNOAA commented Nov 10, 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.

Description

This pull request has three main components:

  1. To fix some issues with the orographic drag schemes of the "drag_suite" CCPP module which have caused model crashes to occur in GFSv17 p8 testing. These issues are described in ufs-community/ccpp-physics/Issue #20.
  2. To add optional diagnostic outputs for each of the components of the drag suite for tuning purposes. This is also described in ufs-community/ccpp-physics/Issue #20. The optional diagnostic outputs can be selected at run time by the already-existing ldiag_ugwp namelist flag.
  3. As part of the 1st component above, at the suggestion of Philip Pegion, we have added the capability to update the u and v winds in each model column based on the tendencies calculated by the mesoscale gravity wave drag and blocking schemes, and using these for the calculation of the tendencies by the small-scale gravity wave drag and turbulent orographic form drag schemes. This sequential updating of the wind profile has been shown to improve the numerical stability. The option to update the winds in this manner is controlled by a new logic flag ugwp_seq_update, which for now, is not a namelist option, but is hardwired by default to .false. in GFS_typedefs.F90. The user can change this to .true. at compile time.

Also, fixed bugs in the rap, hrrr and rrfs test descriptions (changed instances of NEW_DIAGTABLE to DIAG_TABLE) and deleted extraneous line in tests/parm/rap.nml.IN (i.e., ldiag_ugwp=.false.).

Also, updated calculation of diagnostic output variables "u-gwd_ave" and "v-gwd_ave" to include surface drag stress due to small-scale GWD and Turbulent Orographic Form Drag.

Is a change of answers expected from this PR? Yes.

Issue(s) addressed

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

  • Will the code updates change regression test baseline? Yes. Changes to CCPP unified_ugwp drag suite. Please show the baseline directory below.
    /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/REGRESSION_TEST_INTEL.2022_11_08

Dependencies

If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

https://github.com/mdtoyNOAA/ufs-weather-model/tree/develop_ugwp_improvements
https://github.com/mdtoyNOAA/ccpp-physics/tree/ufs/dev_ugwp_improvements
https://github.com/mdtoyNOAA/fv3atm/tree/develop_ugwp_improvements

CCPP-physics pull request dependency: ccpp-physics#20
FV3-ATM pull request dependency: fv3atm#600

@jkbk2004
Copy link
Collaborator

@mdtoyNOAA Can you sync up branch to resolve the conflicts? We have open schedule today. If possible, we like to start working on this pr.

@mdtoyNOAA
Copy link
Contributor Author

mdtoyNOAA commented Nov 29, 2022 via email

@jkbk2004 jkbk2004 added the Baseline Updates Current baselines will be updated. label Nov 29, 2022
@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA @mdtoyNOAA I am starting to add the labels for hera.

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: hera
Compiler: gnu
Job: BL
[BL] Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/1118181857/20221129210017/ufs-weather-model
Please make changes and add the following label back: hera-gnu-BL

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: hera
Compiler: intel
Job: BL
[BL] Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/1118181857/20221129210721/ufs-weather-model
Please make changes and add the following label back: hera-intel-BL

@jkbk2004
Copy link
Collaborator

hera/nems disk space issue. I cleaned up baselines and some people cleaned up their space as well. we are ok now
/scratch1/NCEPDEV/nems DiskInUse=37402 GB, Quota=43000 GB

@jkbk2004
Copy link
Collaborator

I agree. I was confused because I see no other environment variables depend on NEW_DIAGTABLE in develop branch. @SamuelTrahanNOAA @RatkoVasic-NOAA can we clarify about the issue?

@jkbk2004
Copy link
Collaborator

As @mdtoyNOAA points out. I see NEW_DIAGTABLE is a terminal variable. No other variables depend on NEW_DIAGTABLE. Then, question moves to accept baselines changes. I remember Mike attached a few figures to validate the result. @mdtoyNOAA can we re-confirm?

@SamuelTrahanNOAA
Copy link
Collaborator

The NEW_DIAGTABLE was an error, and I think the result is that it was using the DIAG_TABLE specified in default_vars.sh.

@jkbk2004
Copy link
Collaborator

@SamuelTrahanNOAA thanks for the comment! @mdtoyNOAA once you are happy with change result, we are good to go for final approvals.

@mdtoyNOAA
Copy link
Contributor Author

@SamuelTrahanNOAA thanks for the comment! @mdtoyNOAA once you are happy with change result, we are good to go for final approvals.

@jkbk2004 I know that the NEW_DIAGTABLE to DIAG_TABLE fix did not change the results. So I agree on getting final approvals.

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA I think new_diagtable issue is resolved. Would it be ok to skip the baseline creation and test on wcoss2?

@BrianCurtis-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA I think new_diagtable issue is resolved. Would it be ok to skip the baseline creation and test on wcoss2?

No. Let me try finishing things by tomorrow afternoon.

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA I think new_diagtable issue is resolved. Would it be ok to skip the baseline creation and test on wcoss2?

No. Let me try finishing things by tomorrow afternoon.

Sure!

@BrianCurtis-NOAA
Copy link
Collaborator

The Acorn.Intel log is on Hera at /scratch1/NCEPDEV/stmp2/Brian.Curtis/ @mdtoyNOAA please add to your PR branch.

@BrianCurtis-NOAA
Copy link
Collaborator

The Acorn.Intel log is on Hera at /scratch1/NCEPDEV/stmp2/Brian.Curtis/ @mdtoyNOAA please add to your PR branch.

@mdtoyNOAA The WCOSS2.Intel log is also on hera at the same location. Please add both to your PR branch.

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA @mdtoyNOAA I was able to push acorn and wcoss2 logs from url. Sounds like all sets.

@jkbk2004
Copy link
Collaborator

@ChunxiZhang-NOAA we can start merging in ufs-community/ccpp-physics#20

@ChunxiZhang-NOAA
Copy link
Contributor

@jkbk2004 Done.

@jkbk2004
Copy link
Collaborator

@mdtoyNOAA fv3atm pr was merged. can you update submodule to that and revert branch in gitmodules?

@mdtoyNOAA
Copy link
Contributor Author

mdtoyNOAA commented Dec 22, 2022 via email

@jkbk2004
Copy link
Collaborator

looks good!

@jkbk2004 jkbk2004 merged commit edc063e into ufs-community:develop Dec 22, 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.

Improve stability of unified drag suite and add diagnostics
9 participants