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

release/p8c: it is related to ccpp-physics PBL and cumulus updates plus a bug fix to the Thompson scheme PR #882 #503

Merged
merged 9 commits into from
Apr 4, 2022
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
# url = https://github.com/NCAR/ccpp-physics
# branch = main
url = https://github.com/ChunxiZhang-NOAA/ccpp-physics
branch = feature/p8c_pbl_cp
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
7 changes: 3 additions & 4 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3478,12 +3478,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
real(kind=kind_phys) :: ral_ts = 0.0d0 !< time scale for Rayleigh damping in days

!--- mass flux deep convection
! real(kind=kind_phys) :: clam_deep = 0.1 !< c_e for deep convection (Han and Pan, 2011, eq(6))
real(kind=kind_phys) :: clam_deep = 0.07 !< c_e for deep convection (Han and Pan, 2011, eq(6))
real(kind=kind_phys) :: clam_deep = 0.1 !< c_e for deep convection (Han and Pan, 2011, eq(6))
real(kind=kind_phys) :: c0s_deep = 0.002 !< convective rain conversion parameter
real(kind=kind_phys) :: c1_deep = 0.002 !< conversion parameter of detrainment from liquid water into grid-scale cloud water
real(kind=kind_phys) :: betal_deep = 0.01 !< fraction factor of downdraft air mass reaching ground surface over land
real(kind=kind_phys) :: betas_deep = 0.01 !< fraction factor of downdraft air mass reaching ground surface over sea
real(kind=kind_phys) :: betal_deep = 0.05 !< fraction factor of downdraft air mass reaching ground surface over land
real(kind=kind_phys) :: betas_deep = 0.05 !< fraction factor of downdraft air mass reaching ground surface over sea
real(kind=kind_phys) :: evef = 0.09 !< evaporation factor from convective rain
real(kind=kind_phys) :: evfact_deep = 0.3 !< evaporation factor from convective rain
real(kind=kind_phys) :: evfactl_deep = 0.3 !< evaporation factor from convective rain over land
Expand Down