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

update GF for RRFS 2023 HWT SFE #64

Merged
merged 6 commits into from
Apr 20, 2023
Merged

update GF for RRFS 2023 HWT SFE #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9aed23f
"update to run RRFS with GF"
haiqinli Apr 13, 2023
9e4e2cb
update CODEOWNERS to replace Chunxi with Qingfu
grantfirl Apr 14, 2023
3df601e
"update to address UFS code manager's comments"
haiqinli Apr 15, 2023
40940c6
Merge branch 'ufs-community:ufs/dev' into ufs/dev-gf
haiqinli Apr 17, 2023
b1434b4
Merge branch 'ufs/dev-gf' into ufs/dev-gf_gjf
grantfirl Apr 17, 2023
7af32e6
Merge pull request #1 from grantfirl/ufs/dev-gf_gjf
haiqinli Apr 17, 2023
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
107 changes: 62 additions & 45 deletions physics/cu_gf_deep.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ subroutine cu_gf_deep_run( &
c1d(i,:)= 0. !c1 ! 0. ! c1 ! max(.003,c1+float(csum(i))*.0001)
entr_rate(i)=7.e-5 - min(20.,float(csum(i))) * 3.e-6
if(xland1(i) == 0)entr_rate(i)=7.e-5
if(dx(i)<6500.) entr_rate(i)=2.e-4
grantfirl marked this conversation as resolved.
Show resolved Hide resolved
if(imid.eq.1)entr_rate(i)=3.e-4
! if(imid.eq.1)c1d(i,:)=c1 ! comment to test warm bias 08/14/17
radius=.2/entr_rate(i)
Expand All @@ -571,6 +572,7 @@ subroutine cu_gf_deep_run( &
endif
sig(i)=(1.-frh)**2
frh_out(i) = frh
if((dx(i)<6500.).and.(forcing(i,7).eq.0.))sig(i)=1.
enddo
!$acc end kernels
sig_thresh = (1.-frh_thresh)**2
Expand Down Expand Up @@ -606,14 +608,15 @@ subroutine cu_gf_deep_run( &
!
!$acc kernels
edtmax(:)=1.
if(imid.eq.1)edtmax(:)=.15
! if(imid.eq.1)edtmax(:)=.15
edtmin(:)=.1
if(imid.eq.1)edtmin(:)=.05
! if(imid.eq.1)edtmin(:)=.05
!$acc end kernels
!
!--- minimum depth (m), clouds must have
!
depth_min=3000.
if(dx(its)<6500.)depth_min=5000.
if(imid.eq.1)depth_min=2500.
!
!--- maximum depth (mb) of capping
Expand Down Expand Up @@ -1323,9 +1326,9 @@ subroutine cu_gf_deep_run( &
do i=its,itf
if(ierr(i)/=0)cycle
beta=max(.025,.055-float(csum(i))*.0015) !.02
if(imid.eq.0 .and. xland1(i) == 0)then
edtmax(i)=max(0.1,.4-float(csum(i))*.015) !.3)
endif
! if(imid.eq.0 .and. xland1(i) == 0)then
grantfirl marked this conversation as resolved.
Show resolved Hide resolved
! edtmax(i)=max(0.1,.4-float(csum(i))*.015) !.3)
! endif
if(imid.eq.1)beta=.025
bud(i)=0.
cdd(i,1:jmin(i))=.1*entr_rate(i)
Expand Down Expand Up @@ -1508,8 +1511,8 @@ subroutine cu_gf_deep_run( &
tau_ecmwf (:) = 0.
!$acc end kernels
!- way to calculate the fraction of cape consumed by shallow convection
iversion=1 ! ecmwf
!iversion=0 ! orig
!iversion=1 ! ecmwf
iversion=0 ! orig
!
! betchold et al 2008 time-scale of cape removal
!
Expand Down Expand Up @@ -1549,6 +1552,29 @@ subroutine cu_gf_deep_run( &
endif
enddo
!$acc end kernels
!$acc kernels
!-get the profiles modified only by bl tendencies
do i=its,itf
tn_bl(i,:)=0.;qo_bl(i,:)=0.
if ( ierr(i) == 0 )then
!below kbcon -> modify profiles
tn_bl(i,1:kbcon(i)) = tn(i,1:kbcon(i))
qo_bl(i,1:kbcon(i)) = qo(i,1:kbcon(i))
!above kbcon -> keep environment profiles
tn_bl(i,kbcon(i)+1:ktf) = t(i,kbcon(i)+1:ktf)
qo_bl(i,kbcon(i)+1:ktf) = q(i,kbcon(i)+1:ktf)
endif
enddo
!$acc end kernels
!> - Call cup_env() to calculate moist static energy, heights, qes, ... only by bl tendencies
call cup_env(zo,qeso_bl,heo_bl,heso_bl,tn_bl,qo_bl,po,z1, &
psur,ierr,tcrit,-1, &
itf,ktf, its,ite, kts,kte)
!> - Call cup_env_clev() to calculate environmental values on cloud levels only by bl tendencies
call cup_env_clev(tn_bl,qeso_bl,qo_bl,heo_bl,heso_bl,zo,po,qeso_cup_bl,qo_cup_bl, &
heo_cup_bl,heso_cup_bl,zo_cup,po_cup,gammao_cup_bl,tn_cup_bl,psur, &
ierr,z1, &
itf,ktf,its,ite, kts,kte)

if(iversion == 1) then
!-- version ecmwf
Expand Down Expand Up @@ -1581,29 +1607,6 @@ subroutine cu_gf_deep_run( &

!- version for real cloud-work function

!$acc kernels
!-get the profiles modified only by bl tendencies
do i=its,itf
tn_bl(i,:)=0.;qo_bl(i,:)=0.
if ( ierr(i) == 0 )then
!below kbcon -> modify profiles
tn_bl(i,1:kbcon(i)) = tn(i,1:kbcon(i))
qo_bl(i,1:kbcon(i)) = qo(i,1:kbcon(i))
!above kbcon -> keep environment profiles
tn_bl(i,kbcon(i)+1:ktf) = t(i,kbcon(i)+1:ktf)
qo_bl(i,kbcon(i)+1:ktf) = q(i,kbcon(i)+1:ktf)
endif
enddo
!$acc end kernels
!> - Call cup_env() to calculate moist static energy, heights, qes, ... only by bl tendencies
call cup_env(zo,qeso_bl,heo_bl,heso_bl,tn_bl,qo_bl,po,z1, &
psur,ierr,tcrit,-1, &
itf,ktf, its,ite, kts,kte)
!> - Call cup_env_clev() to calculate environmental values on cloud levels only by bl tendencies
call cup_env_clev(tn_bl,qeso_bl,qo_bl,heo_bl,heso_bl,zo,po,qeso_cup_bl,qo_cup_bl, &
heo_cup_bl,heso_cup_bl,zo_cup,po_cup,gammao_cup_bl,tn_cup_bl,psur, &
ierr,z1, &
itf,ktf,its,ite, kts,kte)
!$acc kernels
do i=its,itf
if(ierr(i).eq.0)then
Expand Down Expand Up @@ -1661,7 +1664,7 @@ subroutine cu_gf_deep_run( &
aa1_bl(i) = aa1_bl(i)* tau_bl(i)/ dtime
!endif
#ifndef _OPENACC
print*,'aa0,aa1bl=',aa0(i),aa1_bl(i),aa0(i)-aa1_bl(i),tau_bl(i)!,dtime,xland(i)
! print*,'aa0,aa1bl=',aa0(i),aa1_bl(i),aa0(i)-aa1_bl(i),tau_bl(i)!,dtime,xland(i)
#endif
endif
enddo
Expand Down Expand Up @@ -2116,6 +2119,9 @@ subroutine cu_gf_deep_run( &
imid,ipr,itf,ktf, &
its,ite, kts,kte, &
dicycle,tau_ecmwf,aa1_bl,xf_dicycle)
do i=its,itf
if((dx(i)<6500.).and.(forcing(i,3).le.0.))sig(i)=1.
enddo
!
!$acc kernels
do k=kts,ktf
Expand Down Expand Up @@ -2157,6 +2163,8 @@ subroutine cu_gf_deep_run( &
xff_mid(i,1)=min(0.1,xff_mid(i,1))
endif
xff_mid(i,2)=min(0.1,.03*zws(i))
forcing(i,1)=xff_mid(i,1)
forcing(i,2)=xff_mid(i,2)
endif
enddo
!$acc end kernels
Expand All @@ -2181,6 +2189,7 @@ subroutine cu_gf_deep_run( &
!$acc kernels
do i=its,itf
if(ierr(i).eq.0 .and.pre(i).gt.0.) then
forcing(i,6)=sig(i)
pre(i)=max(pre(i),0.)
xmb_out(i)=xmb(i)
outu(i,1)=dellu(i,1)*xmb(i)
Expand Down Expand Up @@ -3308,11 +3317,11 @@ subroutine cup_forcing_ens_3d(closure_n,xland,aa0,aa1,xaa0,mbdt,dtime,ierr,ierr2
xff_ens3(4)=betajb*xff_ens3(4)
xff_ens3(5)=xff_ens3(4)
xff_ens3(6)=xff_ens3(4)
forcing(i,2)=xff_ens3(4)
if(xff_ens3(4).lt.0.)xff_ens3(4)=0.
if(xff_ens3(5).lt.0.)xff_ens3(5)=0.
if(xff_ens3(6).lt.0.)xff_ens3(6)=0.
xff_ens3(14)=xff_ens3(4)
forcing(i,2)=xff_ens3(4)
!
!--- more like krishnamurti et al.; pick max and average values
!
Expand All @@ -3328,7 +3337,8 @@ subroutine cup_forcing_ens_3d(closure_n,xland,aa0,aa1,xaa0,mbdt,dtime,ierr,ierr2
xff_ens3(11)=aa1(i)/tau_ecmwf(i)
xff_ens3(12)=aa1(i)/tau_ecmwf(i)
xff_ens3(13)=(aa1(i))/tau_ecmwf(i) !(60.*15.) !tau_ecmwf(i)
! forcing(i,4)=xff_ens3(10)
forcing(i,4)=xff_ens3(10)
! forcing(i,5)= aa1_bl(i)/tau_ecmwf(i)

!!- more like bechtold et al. (jas 2014)
!! if(dicycle == 1) xff_dicycle = max(0.,aa1_bl(i)/tau_ecmwf(i)) !(60.*30.) !tau_ecmwf(i)
Expand All @@ -3349,13 +3359,16 @@ subroutine cup_forcing_ens_3d(closure_n,xland,aa0,aa1,xaa0,mbdt,dtime,ierr,ierr2
endif ! ichoice

xk(1)=(xaa0(i,1)-aa1(i))/mbdt
forcing(i,4)=aa0(i)
forcing(i,5)=aa1(i)
forcing(i,6)=xaa0(i,1)
forcing(i,7)=xk(1)
if(xk(1).le.0.and.xk(1).gt.-.01*mbdt) &
forcing(i,8)=mbdt*xk(1)/aa1(i)
! if(forcing(i,1).lt.0. .or. forcing(i,8).gt.-4.)ierr(i)=333
! if(forcing(i,2).lt.-0.05)ierr(i)=333
! forcing(i,4)=aa0(i)
! forcing(i,5)=aa1(i)
! forcing(i,6)=xaa0(i,1)
! forcing(i,7)=xk(1)
if(xk(1).lt.0.and.xk(1).gt.-.01*mbdt) &
xk(1)=-.01*mbdt
if(xk(1).gt.0.and.xk(1).lt.1.e-2) &
if(xk(1).ge.0.and.xk(1).lt.1.e-2) &
xk(1)=1.e-2
! enddo
!
Expand Down Expand Up @@ -3446,13 +3459,13 @@ subroutine cup_forcing_ens_3d(closure_n,xland,aa0,aa1,xaa0,mbdt,dtime,ierr,ierr2
xf_ens(i,11)=xf_ens(i,11)+xf_ens(i,11)*rand_clos(i,4)
xf_ens(i,12)=xf_ens(i,12)+xf_ens(i,12)*rand_clos(i,4)
xf_ens(i,13)=xf_ens(i,13)+xf_ens(i,13)*rand_clos(i,4)
forcing(i,8)=xf_ens(i,11)
! forcing(i,8)=xf_ens(i,11)
else
xf_ens(i,10)=0.
xf_ens(i,11)=0.
xf_ens(i,12)=0.
xf_ens(i,13)=0.
forcing(i,8)=0.
!forcing(i,8)=0.
endif
!srf-begin
!! if(xk(1).lt.0.)then
Expand Down Expand Up @@ -3504,13 +3517,16 @@ subroutine cup_forcing_ens_3d(closure_n,xland,aa0,aa1,xaa0,mbdt,dtime,ierr,ierr2
if(ierr(i) /= 0)cycle

xk(1)=(xaa0(i,1)-aa1(i))/mbdt
if(xk(1).le.0.and.xk(1).gt.-.01*mbdt) xk(1)=-.01*mbdt
if(xk(1).gt.0.and.xk(1).lt.1.e-2) xk(1)=1.e-2

! forcing(i,8)=xk(1)
if(xk(1).lt.0.and.xk(1).gt.-.01*mbdt) xk(1)=-.01*mbdt
if(xk(1).ge.0.and.xk(1).lt.1.e-2) xk(1)=1.e-2

xff_dicycle = (aa1(i)-aa1_bl(i))/tau_ecmwf(i)
! forcing(i,8)=xff_dicycle
if(xk(1).lt.0) xf_dicycle(i)= max(0.,-xff_dicycle/xk(1))

xf_dicycle(i)= xf_ens(i,10)-xf_dicycle(i)
! forcing(i,6)=xf_dicycle(i)
enddo
!$acc end kernels
else
Expand Down Expand Up @@ -4146,6 +4162,7 @@ subroutine cup_output_ens_3d(xff_mid,xf_ens,ierr,dellat,dellaq,dellaqc, &
! used in cup_forcing_ens (including screening of some
! closures over water) to properly normalize xmb
clos_wei=16./max(1.,closure_n(i))
clos_wei=1.
grantfirl marked this conversation as resolved.
Show resolved Hide resolved
xmb_ave(i)=min(xmb_ave(i),100.)
xmb(i)=clos_wei*sig(i)*xmb_ave(i)

Expand Down
Loading