Unified ugwp

[mdtoy]

Hello,

This PR introduces the "unified_ugwp" gravity wave drag scheme, which combines three drag schemes: 1) the "cires_ugwp" scheme, 2) the GSL drag suite "drag_suite", and 3) the new "ugwp_v1" scheme developed by Valery Yudin of CIRES. The first two schemes can be regression-tested against their original respective schemes, while the "ugwp_v1" is still under development. To activate the various options, new namelist options are required, which are available from the developers.

Regards,
Mike Toy

[DomHeinzeller]

A few comments, in addition to what I said in the ufs-weather-model review. Can we reduce the number of new suite definition files to 1 or 2?

[DomHeinzeller]

Note: for all new suite definition files, please replace

lib="ccppphys" ver="4"

with

version="1"

[DomHeinzeller]

Aren't the first four if tests redundant, because you only end up in this block if the same tests equate to .true. in lines 661-662?

Does this block do anything if Model%do_gsl_drag_ls_bl is .false.? If not, then you can simply replace lines 661-662 with 710-712 and save yourself the if tests inside the do loop.

[mdtoy]

The test on lines 710-711 are not redundant to the ones on lines 661-662. Note the grouping of parentheses in lines 710-712: the test is (3 .or. 33) .or. ((2 .or. 22) .and. do_gsl_drag_ls_bl). In lines 661-662 it's (3 .or. 33 .or. 2 .or. 22).

If do_gsl_drag_ls_bl is .false. we still want the block (lines 710-724) to be executed if (3 .or. 33) is .true.

[climbfuji]

Got it, sorry. This is so hard to see in Git diff view!

[DomHeinzeller]

Your fv3atm PR does not contain the latest code from gsd/develop. Please do (assume the remotes are configured as upstream pointing to NOAA-GSD/fv3atm, and origin to your fork):

git remote update
git pull upstream gsd/develop
# fix conflicts if there are any
...
# Then fix the GFDL_atmos_cubed_sphere and ccpp-framework submodule pointers
git submodule update ccpp/framework
git submodule update atmos_cubed_sphere
# Check that all changes are staged
git status
git commit
git push origin unified_ugwp

This should also fix the merge conflict for ccpp-physics that GitHub complains about.

[mdtoy]

I just did the update. Thanks.

[DomHeinzeller]

This PR has been pulled into #57 and will be merged automatically. Do not merge manually.