Skip to content

Commit

Permalink
gfsphysics/GFS_layer/GFS_typedefs.*: add new control variables/flags …
Browse files Browse the repository at this point in the history 
…for CCPP for sas and satmedmfvdifq
  • Loading branch information
@climbfuji
climbfuji committed Nov 18, 2019
1 parent e95a86e commit ec11fb4
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 38 deletions.
80 changes: 60 additions & 20 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,16 +781,36 @@ module GFS_typedefs
!< 1: July 2010 version of mass-flux shallow conv scheme
!< current operational version as of 2016
!< 2: scale- & aerosol-aware mass-flux shallow conv scheme (2017)
!< 3: scale- & aerosol-aware Grell-Freitas scheme (GSD)
!< 4: New Tiedtke scheme (CAPS)
!< 0: modified Tiedtke's eddy-diffusion shallow conv scheme
!< -1: no shallow convection used
#ifdef CCPP
integer :: imfshalcnv_sas = 1 !< flag for SAS mass-flux shallow convection scheme
integer :: imfshalcnv_samf = 2 !< flag for SAMF scale- & aerosol-aware mass-flux shallow convection scheme
integer :: imfshalcnv_gf = 3 !< flag for scale- & aerosol-aware Grell-Freitas scheme (GSD)
integer :: imfshalcnv_ntiedtke = 4 !< flag for new Tiedtke scheme (CAPS)
#endif
integer :: imfdeepcnv !< flag for mass-flux deep convection scheme
!< 1: July 2010 version of SAS conv scheme
!< current operational version as of 2016
!< 2: scale- & aerosol-aware mass-flux deep conv scheme (2017)
!< 3: scale- & aerosol-aware Grell-Freitas scheme (GSD)
!< 4: New Tiedtke scheme (CAPS)
!< 0: old SAS Convection scheme before July 2010
integer :: isatmedmf !< flag for scale-aware TKE-based moist edmf scheme
#ifdef CCPP
integer :: imfdeepcnv_sas = 1 !< flag for SAS mass-flux deep convection scheme
integer :: imfdeepcnv_samf = 2 !< flag for SAMF scale- & aerosol-aware mass-flux deep convection scheme
integer :: imfdeepcnv_gf = 3 !< flag for scale- & aerosol-aware Grell-Freitas scheme (GSD)
integer :: imfdeepcnv_ntiedtke = 4 !< flag for new Tiedtke scheme (CAPS)
#endif
integer :: isatmedmf !< flag for scale-aware TKE-based moist edmf scheme
!< 0: initial version of satmedmf (Nov. 2018)
!< 1: updated version of satmedmf (as of May 2019)
#ifdef CCPP
integer :: isatmedmf_vdif = 0 !< flag for initial version of satmedmf (Nov. 2018)
integer :: isatmedmf_vdifq = 1 !< flag for updated version of satmedmf (as of May 2019)
#endif
integer :: nmtvr !< number of topographic variables such as variance etc
!< used in the GWD parameterization
integer :: jcap !< number of spectral wave trancation used only by sascnv shalcnv
Expand Down Expand Up @@ -2300,7 +2320,7 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
Sfcprop%cqs2 = clear_val
Sfcprop%lh = clear_val
end if
if (Model%imfdeepcnv == 3) then
if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then
allocate (Sfcprop%conv_act(IM))
Sfcprop%conv_act = zero
end if
Expand Down Expand Up @@ -3869,8 +3889,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
#ifdef CCPP
! Consistency check for NTDK convection: deep and shallow convection are bundled
! and cannot be combined with any other deep or shallow convection scheme
if ( (Model%imfdeepcnv == 4 .or. Model%imfshalcnv == 4) .and. &
.not. (Model%imfdeepcnv == 4 .and. Model%imfshalcnv == 4) ) then
if ( (Model%imfdeepcnv == Model%imfdeepcnv_ntiedtke .or. Model%imfshalcnv == Model%imfshalcnv_ntiedtke) .and. &
.not. (Model%imfdeepcnv == Model%imfdeepcnv_ntiedtke .and. Model%imfshalcnv == Model%imfshalcnv_ntiedtke) ) then
write(0,*) "Logic error: if NTDK deep convection is used, must also use NTDK shallow convection (and vice versa)"
stop
end if
Expand All @@ -3890,14 +3910,21 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
else
if (Model%imfdeepcnv == 0) then
print *,' old SAS Convection scheme before July 2010 used'
elseif(Model%imfdeepcnv == 1) then
#ifdef CCPP
elseif(Model%imfdeepcnv == Model%imfdeepcnv_sas) then
print *,' July 2010 version of SAS conv scheme used'
elseif(Model%imfdeepcnv == 2) then
elseif(Model%imfdeepcnv == Model%imfdeepcnv_samf) then
print *,' scale & aerosol-aware mass-flux deep conv scheme'
elseif(Model%imfdeepcnv == 3) then
elseif(Model%imfdeepcnv == Model%imfdeepcnv_gf) then
print *,' Grell-Freitas scale & aerosol-aware mass-flux deep conv scheme'
elseif(Model%imfdeepcnv == 4) then
elseif(Model%imfdeepcnv == Model%imfdeepcnv_ntiedtke) then
print *,' New Tiedtke cumulus scheme'
#else
elseif(Model%imfdeepcnv == 1) then
print *,' July 2010 version of SAS conv scheme used'
elseif(Model%imfdeepcnv == 2) then
print *,' scale & aerosol-aware mass-flux deep conv scheme'
#endif
endif
endif
else
Expand All @@ -3913,16 +3940,19 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
print*, ' Deep convection scheme disabled'
endif
if (Model%satmedmf) then
#ifdef CCPP
if (Model%isatmedmf == Model%isatmedmf_vdif) then
print *,' initial version (Nov 2018) of sale-aware TKE-based moist EDMF scheme used'
elseif(Model%isatmedmf == Model%isatmedmf_vdifq) then
print *,' update version (May 2019) of sale-aware TKE-based moist EDMF scheme used'
endif
#else
if (Model%isatmedmf == 0) then
print *,' initial version (Nov 2018) of sale-aware TKE-based moist EDMF scheme used'
elseif(Model%isatmedmf == 1) then
#ifdef CCPP
print *,' Error: updated version (May 2019) of sale-aware TKE-based moist EDMF scheme not yet available in CCPP'
stop
#else
print *,' update version (May 2019) of sale-aware TKE-based moist EDMF scheme used'
#endif
endif
#endif
elseif (Model%hybedmf) then
print *,' scale-aware hybrid edmf PBL scheme used'
elseif (Model%old_monin) then
Expand All @@ -3940,14 +3970,21 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
else
if (Model%imfshalcnv == 0) then
print *,' modified Tiedtke eddy-diffusion shallow conv scheme used'
elseif (Model%imfshalcnv == 1) then
#ifdef CCPP
elseif (Model%imfshalcnv == Model%imfshalcnv_sas) then
print *,' July 2010 version of mass-flux shallow conv scheme used'
elseif (Model%imfshalcnv == 2) then
elseif (Model%imfshalcnv == Model%imfshalcnv_samf) then
print *,' scale- & aerosol-aware mass-flux shallow conv scheme (2017)'
elseif (Model%imfshalcnv == 3) then
elseif (Model%imfshalcnv == Model%imfshalcnv_gf) then
print *,' Grell-Freitas scale- & aerosol-aware mass-flux shallow conv scheme (2013)'
elseif (Model%imfshalcnv == 4) then
elseif (Model%imfshalcnv == Model%imfshalcnv_ntiedtke) then
print *,' New Tiedtke cumulus scheme'
#else
elseif (Model%imfshalcnv == 1) then
print *,' July 2010 version of mass-flux shallow conv scheme used'
elseif (Model%imfshalcnv == 2) then
print *,' scale- & aerosol-aware mass-flux shallow conv scheme (2017)'
#endif
else
print *,' unknown mass-flux scheme in use - defaulting to no shallow convection'
Model%imfshalcnv = -1
Expand Down Expand Up @@ -4179,7 +4216,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &

Model%lmfshal = (Model%shal_cnv .and. Model%imfshalcnv > 0)
#ifdef CCPP
Model%lmfdeep2 = (Model%imfdeepcnv == 2 .or. Model%imfdeepcnv == 3 .or. Model%imfdeepcnv == 4)
Model%lmfdeep2 = (Model%imfdeepcnv == Model%imfdeepcnv_sas &
.or. Model%imfdeepcnv == Model%imfdeepcnv_gf &
.or. Model%imfdeepcnv == Model%imfdeepcnv_ntiedtke)
#else
Model%lmfdeep2 = (Model%imfdeepcnv == 2)
#endif
Expand Down Expand Up @@ -4389,6 +4428,7 @@ subroutine control_print(Model)
print *, ' redrag : ', Model%redrag
print *, ' hybedmf : ', Model%hybedmf
print *, ' satmedmf : ', Model%satmedmf
print *, ' isatmedmf : ', Model%isatmedmf
print *, ' shinhong : ', Model%shinhong
print *, ' do_ysu : ', Model%do_ysu
print *, ' dspheat : ', Model%dspheat
Expand Down Expand Up @@ -4734,7 +4774,7 @@ subroutine tbd_create (Tbd, IM, Model)
Tbd%htswc = clear_val
Tbd%htsw0 = clear_val

if (Model%imfdeepcnv == 3 .or. Model%imfdeepcnv == 4) then
if (Model%imfdeepcnv == Model%imfdeepcnv_gf .or. Model%imfdeepcnv == Model%imfdeepcnv_ntiedtke) then
allocate(Tbd%forcet(IM, Model%levs))
allocate(Tbd%forceq(IM, Model%levs))
allocate(Tbd%prevst(IM, Model%levs))
Expand All @@ -4745,7 +4785,7 @@ subroutine tbd_create (Tbd, IM, Model)
Tbd%prevsq = clear_val
end if

if (Model%imfdeepcnv == 3) then
if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then
allocate(Tbd%cactiv(IM))
Tbd%cactiv = zero
end if
Expand Down
Loading

0 comments on commit ec11fb4

Please sign in to comment.