Skip to content

Commit

Permalink
Merge pull request #123 from hu5970/fix4rrfsbase2
Browse files Browse the repository at this point in the history 
Put several hot fix to ccpp for RRFS 2022 HWT
  • Loading branch information
@SamuelTrahanNOAA
SamuelTrahanNOAA authored Feb 28, 2022
2 parents 9877c93 + 52df888 commit b12b42f
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 18 deletions.
88 changes: 74 additions & 14 deletions physics/module_mp_thompson.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2400,11 +2400,27 @@ subroutine mp_thompson (qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, ni1d, &
!+---+-----------------------------------------------------------------+
!> - Calculate y-intercept, slope values for graupel.
!+---+-----------------------------------------------------------------+
! Ming Hu: go back to old version for Spring experiment 2021
N0_min = gonv_max
k_0 = kts
do k = kte, kts, -1
if (temp(k).ge.270.65) k_0 = MAX(k_0, k)
enddo
do k = kte, kts, -1
ygra1 = alog10(max(1.E-9, rg(k)))
zans1 = 3.0 + 2./7.*(ygra1+8.) + rand1
if (k.gt.k_0 .and. L_qr(k) .and. mvd_r(k).gt.100.E-6) then
xslw1 = 4.01 + alog10(mvd_r(k))
else
xslw1 = 0.01
endif
ygra1 = 4.31 + alog10(max(5.E-5, rg(k)))
zans1 = (3.1 +(100./(300.*xslw1*ygra1/(10./xslw1+1.+0.25*ygra1)+30.+10.*ygra1))) + rand1
if (rand1 .ne. 0.0) then
zans1 = MAX(2., MIN(zans1, 7.))
endif
N0_exp = 10.**(zans1)
N0_exp = MAX(DBLE(gonv_min), MIN(N0_exp, DBLE(gonv_max)))
N0_min = MIN(N0_exp, N0_min)
N0_exp = N0_min
lam_exp = (N0_exp*am_g*cgg(1)/rg(k))**oge1
lamg = lam_exp * (cgg(3)*ogg2*ogg1)**obmg
ilamg(k) = 1./lamg
Expand Down Expand Up @@ -3476,11 +3492,28 @@ subroutine mp_thompson (qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, ni1d, &
!+---+-----------------------------------------------------------------+
!> - Calculate y-intercept, slope values for graupel.
!+---+-----------------------------------------------------------------+
! Ming Hu: go back to old version for Spring experiment 2021

N0_min = gonv_max
k_0 = kts
do k = kte, kts, -1
if (temp(k).ge.270.65) k_0 = MAX(k_0, k)
enddo
do k = kte, kts, -1
ygra1 = alog10(max(1.E-9, rg(k)))
zans1 = 3.0 + 2./7.*(ygra1+8.) + rand1
if (k.gt.k_0 .and. L_qr(k) .and. mvd_r(k).gt.100.E-6) then
xslw1 = 4.01 + alog10(mvd_r(k))
else
xslw1 = 0.01
endif
ygra1 = 4.31 + alog10(max(5.E-5, rg(k)))
zans1 = (3.1 +(100./(300.*xslw1*ygra1/(10./xslw1+1.+0.25*ygra1)+30.+10.*ygra1))) + rand1
if (rand1 .ne. 0.0) then
zans1 = MAX(2., MIN(zans1, 7.))
endif
N0_exp = 10.**(zans1)
N0_exp = MAX(DBLE(gonv_min), MIN(N0_exp, DBLE(gonv_max)))
N0_min = MIN(N0_exp, N0_min)
N0_exp = N0_min
lam_exp = (N0_exp*am_g*cgg(1)/rg(k))**oge1
lamg = lam_exp * (cgg(3)*ogg2*ogg1)**obmg
ilamg(k) = 1./lamg
Expand Down Expand Up @@ -3835,12 +3868,15 @@ subroutine mp_thompson (qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, ni1d, &
t3_vts = Kap0*csg(1)*ils1**cse(1)
t4_vts = Kap1*Mrat**mu_s*csg(7)*ils2**cse(7)
vts = rhof(k)*av_s * (t1_vts+t2_vts)/(t3_vts+t4_vts)
if (prr_sml(k) .gt. 0.0) then
! vtsk(k) = MAX(vts*vts_boost(k), &
! & vts*((vtrk(k)-vts*vts_boost(k))/(temp(k)-T_0)))
SR = rs(k)/(rs(k)+rr(k))
vtsk(k) = vts*SR + (1.-SR)*vtrk(k)
!vtsk1(k)=vtsk(k)
if (temp(k).gt. (T_0+0.1)) then
!Ming Hu: go back to old version for Spring experiment 2021
vtsk(k) = MAX(vts*vts_boost(k), &
& vts*((vtrk(k)-vts*vts_boost(k))/(temp(k)-T_0))) !
! DH* The version below is supposed to be a better formulation,
! but gave worse results in RAPv5/HRRRv4 than the line above.
! this formulation for RAPv5/HRRRv4, reverted 20 Feb 2020
! SR = rs(k)/(rs(k)+rr(k))
! vtsk(k) = vts*SR + (1.-SR)*vtrk(k)
else
vtsk(k) = vts*vts_boost(k)
!vtsk1(k)=vtsk(k)
Expand Down Expand Up @@ -5811,7 +5847,7 @@ end subroutine calc_effectRad
!! of frozen species remaining from what initially existed at the
!! melting level interface.
subroutine calc_refl10cm (qv1d, qc1d, qr1d, nr1d, qs1d, qg1d, &
t1d, p1d, dBZ, rand1, kts, kte, ii, jj, melti, &
t1d, p1d, dBZ, rand1, kts, kte, ii, jj, melti_org, &
vt_dBZ, first_time_step)

IMPLICIT NONE
Expand Down Expand Up @@ -5846,7 +5882,8 @@ subroutine calc_refl10cm (qv1d, qc1d, qr1d, nr1d, qs1d, qg1d, &
DOUBLE PRECISION:: fmelt_s, fmelt_g

INTEGER:: i, k, k_0, kbot, n
LOGICAL, INTENT(IN):: melti
LOGICAL, INTENT(IN):: melti_org
LOGICAL :: melti
LOGICAL, DIMENSION(kts:kte):: L_qr, L_qs, L_qg

DOUBLE PRECISION:: cback, x, eta, f_d
Expand All @@ -5868,6 +5905,11 @@ subroutine calc_refl10cm (qv1d, qc1d, qr1d, nr1d, qs1d, qg1d, &
allow_wet_graupel = .true.
endif

!Ming Hu hardwired for Spring Experiment testing
allow_wet_snow = .true.
allow_wet_graupel = .false.
melti=.true.

do k = kts, kte
dBZ(k) = -35.0
enddo
Expand Down Expand Up @@ -5979,16 +6021,34 @@ subroutine calc_refl10cm (qv1d, qc1d, qr1d, nr1d, qs1d, qg1d, &
!+---+-----------------------------------------------------------------+

if (ANY(L_qg .eqv. .true.)) then
! Ming Hu: go back to old version for Spring experiment 2021

N0_min = gonv_max
k_0 = kts
do k = kte, kts, -1
ygra1 = alog10(max(1.E-9, rg(k)))
zans1 = 3.0 + 2./7.*(ygra1+8.) + rand1
if (temp(k).ge.270.65) k_0 = MAX(k_0, k)
enddo
do k = kte, kts, -1
if (k.gt.k_0 .and. L_qr(k) .and. mvd_r(k).gt.100.E-6) then
xslw1 = 4.01 + alog10(mvd_r(k))
else
xslw1 = 0.01
endif
ygra1 = 4.31 + alog10(max(5.E-5, rg(k)))
zans1 = (3.1 +(100./(300.*xslw1*ygra1/(10./xslw1+1.+0.25*ygra1)+30.+10.*ygra1))) + rand1
if (rand1 .ne. 0.0) then
zans1 = MAX(2., MIN(zans1, 7.))
endif
N0_exp = 10.**(zans1)
N0_exp = MAX(DBLE(gonv_min), MIN(N0_exp, DBLE(gonv_max)))
N0_min = MIN(N0_exp, N0_min)
N0_exp = N0_min
lam_exp = (N0_exp*am_g*cgg(1)/rg(k))**oge1
lamg = lam_exp * (cgg(3)*ogg2*ogg1)**obmg
ilamg(k) = 1./lamg
N0_g(k) = N0_exp/(cgg(2)*lam_exp) * lamg**cge(2)
enddo

endif

!+---+-----------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion physics/module_sf_mynn.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ MODULE module_sf_mynn
!1: check input
!2: everything - heavy I/O
LOGICAL, PARAMETER :: compute_diag = .false.
LOGICAL, PARAMETER :: compute_flux = .false. !shouldn't need compute
LOGICAL, PARAMETER :: compute_flux = .true. !shouldn't need compute
! these in FV3. They will be written over anyway.
! Computing the fluxes here is leftover from the WRF world.

Expand Down
3 changes: 2 additions & 1 deletion physics/module_sf_ruclsm.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2595,7 +2595,8 @@ SUBROUTINE SOIL (debug_print, &
! 3feb21 - in RRFS testing (fv3-based), ref*0.5 gives too much direct
! evaporation. Therefore , it is replaced with ref*0.7.
!fc=max(qmin,ref*0.5)
fc=max(qmin,ref*0.7)
!fc=max(qmin,ref*0.7)
fc=ref
fex_fc=1.
if((soilmois(1)+qmin) > fc .or. (qvatm-qvg) > 0.) then
soilres = 1.
Expand Down
4 changes: 2 additions & 2 deletions physics/sfc_drv_ruc.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,8 +1018,8 @@ subroutine lsm_ruc_run & ! inputs
cmm_lnd(i) = cm_lnd(i) * wind(i)
chh_lnd(i) = chs_lnd(i,j) * rho(i)
!
snowh_lnd(i,j) = snwdph_lnd(i) * 0.001 ! convert from mm to m
sneqv_lnd(i,j) = weasd_lnd(i) ! [mm]
snowh_lnd(i,j) = max(1.e-7,snwdph_lnd(i) * 0.001) ! convert from mm to m
sneqv_lnd(i,j) = max(1.e-4,weasd_lnd(i)) ! [mm]
snfallac_lnd(i,j) = snowfallac_lnd(i)
!> -- sanity checks on sneqv and snowh
if (sneqv_lnd(i,j) /= 0.0 .and. snowh_lnd(i,j) == 0.0) then
Expand Down

0 comments on commit b12b42f

Please sign in to comment.