Skip to content

Ntiedtke wrf mpas unify updates - addition of dx2d variable to clean up module #810

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

Merged
kkeene44 merged 2 commits into from
Mar 13, 2019
Merged

Ntiedtke wrf mpas unify updates - addition of dx2d variable to clean up module #810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c389b
addition of dx2d variable to more-cleanly unify ntiedtke for wrf/mpas
kkeene44 Mar 13, 2019
17da67a
removed unnecessary space - line 706
kkeene44 Mar 13, 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
29 changes: 15 additions & 14 deletions phys/module_cu_ntiedtke.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,9 @@ subroutine cu_ntiedtke( &
rcs, &
rn, &
evap, &
heatflux
heatflux, &
dx2d

integer , dimension(its:ite) :: slimsk


Expand Down Expand Up @@ -376,6 +378,16 @@ subroutine cu_ntiedtke( &
slimsk(i)=int(abs(xland(i,j)-2.))
enddo

#if defined(mpas)
do i=its,ite
dx2d(i) = dx(i,j)
enddo
#else
do i=its,ite
dx2d(i) = dx
enddo
#endif

do k=kts,kte
kp=k+1
do i=its,ite
Expand Down Expand Up @@ -424,7 +436,7 @@ subroutine cu_ntiedtke( &
!
!########################################################################
call tiecnvn(u1,v1,t1,q1,q2,q3,q1b,t1b,ghtl,ghti,omg,prsl,prsi,evap,heatflux, &
rn,slimsk,im,kx,kx1,delt,dx)
rn,slimsk,im,kx,kx1,delt,dx2d)

do i=its,ite
raincv(i,j)=rn(i)/stepcu
Expand Down Expand Up @@ -574,11 +586,8 @@ subroutine tiecnvn(pu,pv,pt,pqv,pqc,pqi,pqvf,ptf,poz,pzz,pomg, &
& zlu(lq,km), zlude(lq,km), zmfu(lq,km), zmfd(lq,km), &
& zqsat(lq,km), pqc(lq,km), pqi(lq,km), zrain(lq)
real pqvf(lq,km), ptf(lq,km)
#if defined(mpas)
real dx(lq)
#elif defined(wrfmodel)
real dx
#endif

integer icbot(lq), ictop(lq), ktype(lq), lndj(lq)
logical locum(lq)
!
Expand Down Expand Up @@ -790,11 +799,7 @@ subroutine cumastrn &
real wup(klon), zdqcv(klon)
real wbase(klon), zmfuub(klon)
real upbl(klon)
#if defined(mpas)
real dx(klon)
#elif defined(wrfmodel)
real dx
#endif
real pmfude_rate(klon,klev), pmfdde_rate(klon,klev)
real zmfuus(klon,klev), zmfdus(klon,klev)
real zuv2(klon,klev),ztenu(klon,klev),ztenv(klon,klev)
Expand Down Expand Up @@ -1022,11 +1027,7 @@ subroutine cumastrn &
if(ldcum(jl).and.ktype(jl).eq.1) then
ikb = kcbot(jl)
ikt = kctop(jl)
#if defined(mpas)
ztau = ztauc(jl) * (1.+1.33e-5*dx(jl))
#elif defined(wrfmodel)
ztau = ztauc(jl) * (1.+1.33e-5*dx)
#endif
ztau = max(ztmst,ztau)
ztau = max(360.,ztau)
ztau = min(10800.,ztau)
Expand Down