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

Add new PBL diagnostic variables dkt and dku #607

Merged
merged 26 commits into from
Apr 21, 2021
Merged

Add new PBL diagnostic variables dkt and dku #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
100a646
Cleanup trailing whitespace for some new added/modified source code r…
BinLiu-NOAA Jun 24, 2020
a8265eb
Merge pull request #4 from hafs-community/feature/merge_hwrf_physics
climbfuji Jun 25, 2020
c13b36d
Merge pull request #2 from climbfuji/update_hafs_from_dtc_hwrf_physic…
climbfuji Jun 26, 2020
8f34789
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Jul 2, 2020
53fc0ff
In GFS_rrtmg_pre.F90, separate out the imp_physics == 6 option and le…
BinLiu-NOAA Jul 8, 2020
81b1ba2
Merge remote-tracking branch 'remotes/upstream/master' into feature/s…
BinLiu-NOAA Jul 8, 2020
643ede9
Merge remote-tracking branch 'remotes/upstream/master' into feature/s…
BinLiu-NOAA Jul 8, 2020
a1f0373
Merge branch 'feature/sync_master_20200703' of https://github.com/haf…
BinLiu-NOAA Jul 8, 2020
0a8bd93
Initialize crtlame properly in physics/samfdeepcnv.f.
BinLiu-NOAA Jul 9, 2020
b6dd33b
Merge remote-tracking branch 'remotes/upstream/master' into feature/s…
BinLiu-NOAA Jul 16, 2020
1b400f5
Follow the master branch to change the unit of radians into radian in
BinLiu-NOAA Jul 17, 2020
3a834f9
Merge remote-tracking branch 'upstream/master' into support/HAFS
BinLiu-NOAA Nov 24, 2020
d07d53b
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Dec 12, 2020
2345803
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Jan 7, 2021
746cb5b
Merge commit '13b8889' used by ufs-weather-model as of 20210120 into …
BinLiu-NOAA Jan 21, 2021
c0ac40b
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Feb 2, 2021
048d605
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Feb 16, 2021
97f409e
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Mar 12, 2021
094d39c
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA Mar 31, 2021
6f9c83e
Merge remote-tracking branch 'upstream/master' into support/HAFS
BinLiu-NOAA Apr 1, 2021
9143484
Add dkudiagnostic in moninedmf from Andy Hazelton.
BinLiu-NOAA Apr 2, 2021
2ce81df
Merge remote-tracking branch 'upstream/master' into feature/dkudiagno…
BinLiu-NOAA Apr 16, 2021
8c44643
*Rename dkudiagnostic into dku in moninedmf.f and satmedmfvdifq.F.
BinLiu-NOAA Apr 16, 2021
4c84630
Use unique standard_name for the new added dkt and dku diagnostic var…
BinLiu-NOAA Apr 16, 2021
28c815a
Unify the usage of Diag%dkt and Interstitial%dkt and change the stand…
BinLiu-NOAA Apr 20, 2021
7b7eb85
Merge remote-tracking branch 'remotes/upstream/master' into feature/d…
BinLiu-NOAA Apr 20, 2021
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
3 changes: 2 additions & 1 deletion physics/GFS_debug.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,8 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
if(Model%lradar) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%refl_10cm ', Diag%refl_10cm)
end if
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dkt ', Diag%dkt)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dku ', Diag%dku)
! CCPP/MYNNPBL only
if (Model%do_mynnedmf) then
if (Model%bl_mynn_output .ne. 0) then
Expand Down Expand Up @@ -1068,7 +1070,6 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%del ', Interstitial%del )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%del_gz ', Interstitial%del_gz )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%delr ', Interstitial%delr )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dkt ', Interstitial%dkt )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dlength ', Interstitial%dlength )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dqdt ', Interstitial%dqdt )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dqsfc1 ', Interstitial%dqsfc1 )
Expand Down
11 changes: 7 additions & 4 deletions physics/moninedmf.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ subroutine hedmf_run (im,km,ntrac,ntcw,dv,du,tau,rtg, &
& psk,rbsoil,zorl,u10m,v10m,fm,fh, &
& tsea,heat,evap,stress,spd1,kpbl, &
& prsi,del,prsl,prslk,phii,phil,delt,dspheat, &
& dusfc,dvsfc,dtsfc,dqsfc,hpbl,hgamt,hgamq,dkt, &
& dusfc,dvsfc,dtsfc,dqsfc,hpbl,hgamt,hgamq,dkt,dku, &
& kinver,xkzm_m,xkzm_h,xkzm_s,lprnt,ipr, &
& xkzminv,moninq_fac,hurr_pbl,islimsk,var_ric, &
& coef_ric_l,coef_ric_s,lssav,ldiag3d,qdiag3d,ntoz, &
Expand Down Expand Up @@ -114,7 +114,9 @@ subroutine hedmf_run (im,km,ntrac,ntcw,dv,du,tau,rtg, &
real(kind=kind_phys), intent(out) :: &
& dusfc(im), dvsfc(im), &
& dtsfc(im), dqsfc(im), &
& hpbl(im), dkt(im,km-1)
& hpbl(im)
real(kind=kind_phys), intent(out) :: &
& dkt(im,km-1), dku(im,km-1)
real(kind=kind_phys), intent(inout) :: &
& hgamt(im), hgamq(im)
!
Expand Down Expand Up @@ -148,8 +150,8 @@ subroutine hedmf_run (im,km,ntrac,ntcw,dv,du,tau,rtg, &
& zd(im), zdd(im), thlvx1(im)
!
real(kind=kind_phys) rdzt(im,km-1),dktx(im,km-1), &
& zi(im,km+1), zl(im,km), xkzo(im,km-1), &
& dku(im,km-1), xkzmo(im,km-1), &
& zi(im,km+1), zl(im,km), &
& xkzo(im,km-1), xkzmo(im,km-1), &
& cku(im,km-1), ckt(im,km-1), &
& ti(im,km-1), shr2(im,km-1), &
& al(im,km-1), ad(im,km), &
Expand Down Expand Up @@ -1402,6 +1404,7 @@ subroutine hedmf_run (im,km,ntrac,ntcw,dv,du,tau,rtg, &
!
enddo
enddo

!
! solve tridiagonal problem for momentum
!
Expand Down
11 changes: 11 additions & 0 deletions physics/moninedmf.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,15 @@
kind = kind_phys
intent = out
optional = F
[dku]
standard_name = atmosphere_momentum_diffusivity
long_name = diffusivity for momentum
units = m2 s-1
dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
type = real
kind = kind_phys
intent = out
optional = F
[kinver]
standard_name = index_of_highest_temperature_inversion
long_name = index of highest temperature inversion
Expand Down Expand Up @@ -538,6 +547,8 @@
dimensions = ()
type = real
kind = kind_phys
intent = in
optional = F
[lssav]
standard_name = flag_diagnostics
long_name = logical flag for storing diagnostics
Expand Down
8 changes: 5 additions & 3 deletions physics/satmedmfvdifq.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& snwdph_lnd,psk,rbsoil,zorl,u10m,v10m,fm,fh, &
& tsea,heat,evap,stress,spd1,kpbl, &
& prsi,del,prsl,prslk,phii,phil,delt, &
& dspheat,dusfc,dvsfc,dtsfc,dqsfc,hpbl, &
& dspheat,dusfc,dvsfc,dtsfc,dqsfc,hpbl,dkt,dku, &
& kinver,xkzm_m,xkzm_h,xkzm_s,dspfac,bl_upfr,bl_dnfr, &
& ntoz,du3dt,dv3dt,dt3dt,dq3dt,do3dt,gen_tend,ldiag3d,qdiag3d, &
& errmsg,errflg)
Expand Down Expand Up @@ -109,6 +109,8 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& dusfc(im), dvsfc(im), &
& dtsfc(im), dqsfc(im), &
& hpbl(im)
real(kind=kind_phys), intent(out) :: &
& dkt(im,km-1), dku(im,km-1)
!
logical, intent(in) :: dspheat
character(len=*), intent(out) :: errmsg
Expand All @@ -130,8 +132,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& qlx(im,km), thetae(im,km),thlx(im,km),
& slx(im,km), svx(im,km), qtx(im,km),
& tvx(im,km), pix(im,km), radx(im,km-1),
& dku(im,km-1),dkt(im,km-1), dkq(im,km-1),
& cku(im,km-1),ckt(im,km-1)
& dkq(im,km-1),cku(im,km-1), ckt(im,km-1)
!
real(kind=kind_phys) plyr(im,km), rhly(im,km), cfly(im,km),
& qstl(im,km)
Expand Down Expand Up @@ -1538,6 +1539,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
!
enddo
enddo

c
!> - Call tridi2() to solve tridiagonal problem for momentum
c
Expand Down
18 changes: 18 additions & 0 deletions physics/satmedmfvdifq.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,24 @@
kind = kind_phys
intent = out
optional = F
[dkt]
standard_name = atmosphere_heat_diffusivity
long_name = diffusivity for heat
units = m2 s-1
dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
type = real
kind = kind_phys
intent = out
optional = F
[dku]
standard_name = atmosphere_momentum_diffusivity
long_name = diffusivity for momentum
units = m2 s-1
dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
type = real
kind = kind_phys
intent = out
optional = F
[kinver]
standard_name = index_of_highest_temperature_inversion
long_name = index of highest temperature inversion
Expand Down