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.

Sign up for GitHub

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

Caps physics - Added the new Tiedtke cumulus, Shinhong, YSU PBL scheme #201

Merged
merged 9 commits into from
Feb 23, 2019
Merged

Caps physics - Added the new Tiedtke cumulus, Shinhong, YSU PBL scheme #201

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3bd9855
Added the new Tiedtke cumulus, Shinhong, YSU PBL scheme
Jan 28, 2019
4a220af
Merge branch 'master' into caps_physics
Jan 28, 2019
5e180cf
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into ca…
climbfuji Feb 5, 2019
5a6dfc1
physics/cu_ntiedtke.F90: add reminder to replace imported constants w…
climbfuji Feb 7, 2019
cd045f4
physics/m_micro_interstitial.F90: remove unused arguments imfdeepcnv …
climbfuji Feb 7, 2019
819d23b
Add physics/cu_ntiedtke_pre.F90 and physics/cu_ntiedtke_post.F90, sim…
climbfuji Feb 7, 2019
9a6b190
Merge pull request #1 from climbfuji/caps_physics_dom_20190205
AustinChunxi Feb 20, 2019
fbfa7ca
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji Feb 20, 2019
b17451c
Merge pull request #2 from climbfuji/caps_physics_dom_20190221
AustinChunxi Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions physics/GFS_PBL_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ end subroutine GFS_PBL_generic_post_finalize
!! | hybedmf | flag_for_hedmf | flag for hybrid edmf pbl scheme (moninedmf) | flag | 0 | logical | | in | F |
!! | do_shoc | flag_for_shoc | flag for SHOC | flag | 0 | logical | | in | F |
!! | satmedmf | flag_for_scale_aware_TKE_moist_EDMF_PBL | flag for scale-aware TKE moist EDMF PBL scheme | flag | 0 | logical | | in | F |
!! | shinhong | flag_for_scale_aware_Shinhong_PBL | flag for scale-aware Shinhong PBL scheme | flag | 0 | logical | | in | F |
!! | do_ysu | flag_for_ysu | flag for YSU PBL scheme | flag | 0 | logical | | in | F |
!! | dvdftra | tendency_of_vertically_diffused_tracer_concentration | updated tendency of the tracers due to vertical diffusion in PBL scheme | kg kg-1 s-1 | 3 | real | kind_phys | in | F |
!! | dusfc1 | instantaneous_surface_x_momentum_flux | surface momentum flux in the x-direction valid for current call | Pa | 1 | real | kind_phys | in | F |
!! | dvsfc1 | instantaneous_surface_y_momentum_flux | surface momentum flux in the y-direction valid for current call | Pa | 1 | real | kind_phys | in | F |
Expand Down Expand Up @@ -232,7 +234,7 @@ end subroutine GFS_PBL_generic_post_finalize
#endif
subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, ntoz, ntke, ntkev, &
imp_physics, imp_physics_gfdl, imp_physics_thompson, &
imp_physics_wsm6, ltaerosol, cplflx, lssav, ldiag3d, lsidea, hybedmf, do_shoc, satmedmf, &
imp_physics_wsm6, ltaerosol, cplflx, lssav, ldiag3d, lsidea, hybedmf, do_shoc, satmedmf, shinhong, do_ysu, &
dvdftra, dusfc1, dvsfc1, dtsfc1, dqsfc1, dtf, dudt, dvdt, dtdt, htrsw, htrlw, xmu, &
dqdt, dqdt_water_vapor, dqdt_liquid_cloud, dqdt_ice_cloud, dqdt_ozone, dqdt_cloud_droplet_num_conc, dqdt_ice_num_conc, &
dqdt_water_aer_num_conc, dqdt_ice_aer_num_conc, dqdt_rain, dqdt_snow, dqdt_graupel, dqdt_tke, &
Expand All @@ -247,7 +249,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, ntoz, ntke, ntkev,

integer, intent(in) :: im, levs, nvdiff, ntrac, ntoz, ntke, ntkev
integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_wsm6
logical, intent(in) :: ltaerosol, cplflx, lssav, ldiag3d, lsidea, hybedmf, do_shoc, satmedmf
logical, intent(in) :: ltaerosol, cplflx, lssav, ldiag3d, lsidea, hybedmf, do_shoc, satmedmf, shinhong, do_ysu

real(kind=kind_phys), intent(in) :: dtf
real(kind=kind_phys), dimension(im, levs, nvdiff), intent(in) :: dvdftra
Expand All @@ -271,9 +273,10 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, ntoz, ntke, ntkev,
errmsg = ''
errflg = 0
!GJF: dvdftra is only used if nvdiff != ntrac or (nvdiff == ntrac .and. )
! print*,"dqdt:",maxval(dqdt(:,:,1)),minval(dqdt(:,:,1))
if (nvdiff == ntrac .and. (hybedmf .or. do_shoc)) then
dqdt = dvdftra
elseif (nvdiff /= ntrac) then
elseif (nvdiff /= ntrac .and. .not. shinhong .and. .not. do_ysu) then
if (imp_physics == imp_physics_wsm6) then
! WSM6
do k=1,levs
Expand Down Expand Up @@ -395,7 +398,8 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, ntoz, ntke, ntkev,
! endif
do k=1,levs
do i=1,im
tem = dqdt_water_vapor(i,k) * dtf
! tem = dqdt_water_vapor(i,k) * dtf
tem = dqdt(i,k,1) * dtf
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two lines 401 and 402 should be equivalent. However, the latest version of the code does no longer have the individual components of dqdt as dqdt_water_vapor etc, so your proposed change is already in there, in form of:

              tem  = dqdt(i,k,ntqv) * dtf
              dq3dt(i,k) = dq3dt(i,k) + tem

where ntqv=Model%ntqv is set to 1 in GFS_typedefs.F90.

dq3dt(i,k) = dq3dt(i,k) + tem
enddo
enddo
Expand All @@ -410,6 +414,8 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, ntoz, ntke, ntkev,

endif ! end if_lssav

! print*,"dqdt:",shinhong, maxval(dqdt(:,:,1)),minval(dqdt(:,:,1))

end subroutine GFS_PBL_generic_post_run

end module GFS_PBL_generic_post
Loading