Skip to content

Remove the use of MUT in a few physics routines #23

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
weiwangncar merged 1 commit into from
Oct 28, 2016
Merged

Remove the use of MUT in a few physics routines #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 6 additions & 19 deletions phys/module_bl_gwdo.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ subroutine gwdo(u3d,v3d,t3d,qv3d,p3d,p3di,pi3d,z, &
rublten,rvblten, &
dtaux3d,dtauy3d,dusfcg,dvsfcg, &
var2d,oc12d,oa2d1,oa2d2,oa2d3,oa2d4,ol2d1,ol2d2,ol2d3,ol2d4, &
znu,znw,mut,p_top, &
znu,znw,p_top, &
cp,g,rd,rv,ep1,pi, &
dt,dx,kpbl2d,itimestep, &
ids,ide, jds,jde, kds,kde, &
Expand Down Expand Up @@ -96,9 +96,6 @@ subroutine gwdo(u3d,v3d,t3d,qv3d,p3d,p3di,pi3d,z, &
oc12d, &
oa2d1,oa2d2,oa2d3,oa2d4, &
ol2d1,ol2d2,ol2d3,ol2d4
real, dimension( ims:ime, jms:jme ) , &
optional , &
intent(in ) :: mut
!
real, dimension( kms:kme ) , &
optional , &
Expand All @@ -121,22 +118,12 @@ subroutine gwdo(u3d,v3d,t3d,qv3d,p3d,p3di,pi3d,z, &
enddo
!
do j = jts,jte
if(present(mut))then
! For ARW we will replace p and p8w with dry hydrostatic pressure
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = mut(i,j)*znu(k) + p_top
pdhi(i,k) = mut(i,j)*znw(k) + p_top
enddo
enddo
else
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
endif
enddo
!
do k = kts,kte
do i = its,ite
Expand Down
27 changes: 6 additions & 21 deletions phys/module_bl_shinhong.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ subroutine shinhong(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
rqvblten,rqcblten,rqiblten,flag_qi, &
cp,g,rovcp,rd,rovg,ep1,ep2,karman,xlv,rv, &
dz8w,psfc, &
znu,znw,mut,p_top, &
znu,znw,p_top, &
znt,ust,hpbl,psim,psih, &
xland,hfx,qfx,wspd,br, &
dt,kpbl2d, &
Expand Down Expand Up @@ -66,7 +66,6 @@ subroutine shinhong(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
!-- psfc pressure at the surface (pa)
!-- znu eta values on half (mass) levels
!-- znw eta values on full (w) levels
!-- mut mass in column (pa)
!-- p_top pressure top of the model (pa)
!-- znt roughness length (m)
!-- ust u* in similarity theory (m/s)
Expand Down Expand Up @@ -177,8 +176,6 @@ subroutine shinhong(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
real, dimension( ims:ime, jms:jme ) , &
intent(inout), optional :: regime
!
real, dimension( ims:ime, jms:jme ) , &
intent(in ), optional :: mut
real, dimension( ims:ime, jms:jme ) , &
intent(in ), optional :: ctopo, &
ctopo2
Expand All @@ -205,24 +202,12 @@ subroutine shinhong(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
qv2d(its:ite,:) = 0.0
!
do j = jts,jte
if(present(mut))then
!
! For ARW we will replace p and p8w with dry hydrostatic pressure
!
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = mut(i,j)*znu(k) + p_top
pdhi(i,k) = mut(i,j)*znw(k) + p_top
enddo
enddo
else
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
endif
enddo
do k = kts,kte
do i = its,ite
qv2d(i,k) = qv3d(i,k,j)
Expand Down
6 changes: 1 addition & 5 deletions phys/module_bl_temf.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ subroutine temfpbl(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d,rho, &
rqvblten,rqcblten,rqiblten,flag_qi, &
g,cp,rcp,r_d,r_v,cpv, &
z,xlv,psfc, &
mut,p_top, &
p_top, &
znt,ht,ust,zol,hol,hpbl,psim,psih, &
xland,hfx,qfx,tsk,qsfc,gz1oz0,wspd,br, &
dt,dtmin,kpbl2d, &
Expand Down Expand Up @@ -200,10 +200,6 @@ subroutine temfpbl(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d,rho, &
! real, dimension( ims:ime, kms:kme, jms:jme ), &
! optional , &
! intent(inout) :: rqiblten
!
real, dimension( ims:ime, jms:jme ) , &
optional , &
intent(in ) :: mut
!
real, optional, intent(in ) :: p_top
!
Expand Down
27 changes: 6 additions & 21 deletions phys/module_bl_ysu.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ subroutine ysu(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
rqvblten,rqcblten,rqiblten,flag_qi, &
cp,g,rovcp,rd,rovg,ep1,ep2,karman,xlv,rv, &
dz8w,psfc, &
znu,znw,mut,p_top, &
znu,znw,p_top, &
znt,ust,hpbl,psim,psih, &
xland,hfx,qfx,wspd,br, &
dt,kpbl2d, &
Expand Down Expand Up @@ -192,9 +192,6 @@ subroutine ysu(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
intent(in ) :: znu, &
znw
!
real, dimension( ims:ime, jms:jme ) , &
optional , &
intent(in ) :: mut
!
real, optional, intent(in ) :: p_top
!
Expand All @@ -217,24 +214,12 @@ subroutine ysu(u3d,v3d,th3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
qv2d(its:ite,:) = 0.0
!
do j = jts,jte
if(present(mut))then
!
! For ARW we will replace p and p8w with dry hydrostatic pressure
!
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = mut(i,j)*znu(k) + p_top
pdhi(i,k) = mut(i,j)*znw(k) + p_top
enddo
enddo
else
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
do k = kts,kte+1
do i = its,ite
if(k.le.kte)pdh(i,k) = p3d(i,k,j)
pdhi(i,k) = p3di(i,k,j)
enddo
endif
enddo
do k = kts,kte
do i = its,ite
qv2d(i,k) = qv3d(i,k,j)
Expand Down
8 changes: 4 additions & 4 deletions phys/module_pbl_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ SUBROUTINE pbl_driver( &
,FLAG_QI=flag_qi &
,g=g,cp=cp,rcp=rcp,r_d=r_d,r_v=r_v,cpv=cpv &
,Z=z,XLV=XLV,PSFC=PSFC &
,MUT=mut,P_TOP=p_top &
,P_TOP=p_top &
,ZNT=znt,HT=ht,UST=ust,ZOL=zol,HOL=hol,HPBL=pblh &
,PSIM=psim,PSIH=psih,XLAND=xland &
,HFX=hfx,QFX=qfx,TSK=tskold,QSFC=qsfc,GZ1OZ0=gz1oz0 &
Expand Down Expand Up @@ -1142,7 +1142,7 @@ SUBROUTINE pbl_driver( &
,FLAG_QI=flag_qi &
,CP=cp,G=g,ROVCP=rcp,RD=r_D,ROVG=rovg &
,DZ8W=dz8w,XLV=XLV,RV=r_v,PSFC=PSFC &
,ZNU=znu,ZNW=znw,MUT=mut,P_TOP=p_top &
,ZNU=znu,ZNW=znw,P_TOP=p_top &
,ZNT=znt,UST=ust,HPBL=pblh &
,PSIM=fm,PSIH=fhh,XLAND=xland &
,HFX=hfx,QFX=qfx &
Expand Down Expand Up @@ -1219,7 +1219,7 @@ SUBROUTINE pbl_driver( &
,FLAG_QI=flag_qi &
,CP=cp,G=g,ROVCP=rcp,RD=r_D,ROVG=rovg &
,DZ8W=dz8w,XLV=XLV,RV=r_v,PSFC=PSFC &
,ZNU=znu,ZNW=znw,MUT=mut,P_TOP=p_top &
,ZNU=znu,ZNW=znw,P_TOP=p_top &
,ZNT=znt,UST=ust,HPBL=pblh &
,PSIM=fm,PSIH=fhh,XLAND=xland &
,HFX=hfx,QFX=qfx &
Expand Down Expand Up @@ -1892,7 +1892,7 @@ SUBROUTINE pbl_driver( &
,VAR2D=var2d,OC12D=oc12d &
,OA2D1=oa1,OA2D2=oa2,OA2D3=oa3,OA2D4=oa4 &
,OL2D1=ol1,OL2D2=ol2,OL2D3=ol3,OL2D4=ol4 &
,ZNU=znu,ZNW=znw,MUT=mut,P_TOP=p_top &
,ZNU=znu,ZNW=znw,P_TOP=p_top &
,CP=cp,G=g,RD=r_d &
,RV=r_v,EP1=ep_1,PI=3.141592653 &
,DT=dtbl,DX=dx,KPBL2D=kpbl,ITIMESTEP=itimestep &
Expand Down