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

Support for cloud microphysics hail species #171

Merged
merged 16 commits into from
Mar 4, 2022
Merged

Support for cloud microphysics hail species #171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a432fc3
Incorporated Tim Supinie's updates to handle a hail category (nwat=7)
MicroTed Mar 18, 2021
a55a2fa
Added print for hail max/min (non-debug section)
MicroTed Mar 18, 2021
6737079
Add hallwat to !OMP shared variables in main loop
LarissaReames-NOAA Mar 25, 2021
4537e0b
Update to states as used in SFE2021
LarissaReames-NOAA Jun 14, 2021
17b1ddf
Cleanup after rebase
MicroTed Oct 15, 2021
fae67a7
Redo removal of alt. namelist read
MicroTed Oct 15, 2021
7540b9d
Removed tools/module_diag_hailcast.F90
MicroTed Oct 15, 2021
191760c
Fixes from Jili Dong
MicroTed Oct 26, 2021
a5adfc5
Merge remote-tracking branch 'tedsrepo/feature/nssl-base' into dev/em…
MicroTed Jan 19, 2022
84ff530
Add hailwat to tools/external_ic.F90
MicroTed Jan 27, 2022
5fb5512
Set logic in fv_regional_bc.F90 to match current code; Change logic …
MicroTed Jan 27, 2022
5e04e62
Recommended changes
MicroTed Jan 31, 2022
1aa3098
Check actual index (hailwat) instead of assuming a positive value ba…
MicroTed Jan 31, 2022
f3d071f
Split nwat=7 bits into separate loops (see if it affects nwat=6)
MicroTed Feb 4, 2022
4b51c15
Merge remote-tracking branch 'origin/dev/emc' into dev/emc-nsslmicro
MicroTed Feb 17, 2022
f579c12
Merge remote-tracking branch 'origin/dev/emc' into dev/emc-nsslmicro
MicroTed Feb 25, 2022
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
Prev Previous commit
Next Next commit
Recommended changes
  • Loading branch information
@MicroTed
MicroTed committed Jan 31, 2022
commit 5e04e628750a489fbeaae901e6075bcbb2cf9087
48 changes: 4 additions & 44 deletions model/fv_regional_bc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,7 +3768,10 @@ subroutine remap_scalar_nggps_regional_bc(Atm &
! and may not provide a very good result
!
if ( .not. data_source_fv3gfs ) then
if ( Atm%flagstruct%nwat .eq. 6 ) then
if ( Atm%flagstruct%nwat .eq. 6 .or. Atm%flagstruct%nwat .eq. 7 ) then
if ( Atm%flagstruct%nwat .eq. 7 ) then
BC_side%q_BC(is:ie,j,1:npz,hailwat) = 0.
endif
do k=1,npz
do i=is,ie
qn1(i,k) = BC_side%q_BC(i,j,k,liq_wat)
Expand Down Expand Up @@ -3805,49 +3808,6 @@ subroutine remap_scalar_nggps_regional_bc(Atm &
endif
endif
endif
#endif
call mp_auto_conversion(BC_side%q_BC(i,j,k,liq_wat), BC_side%q_BC(i,j,k,rainwat), &
BC_side%q_BC(i,j,k,ice_wat), BC_side%q_BC(i,j,k,snowwat) )
enddo
enddo
endif
if ( Atm%flagstruct%nwat .eq. 7 ) then
do k=1,npz
do i=is,ie
qn1(i,k) = BC_side%q_BC(i,j,k,liq_wat)
BC_side%q_BC(i,j,k,rainwat) = 0.
BC_side%q_BC(i,j,k,snowwat) = 0.
BC_side%q_BC(i,j,k,graupel) = 0.
BC_side%q_BC(i,j,k,hailwat) = 0.
if ( BC_side%pt_BC(i,j,k) > 273.16 ) then ! > 0C all liq_wat
BC_side%q_BC(i,j,k,liq_wat) = qn1(i,k)
BC_side%q_BC(i,j,k,ice_wat) = 0.
#ifdef ORIG_CLOUDS_PART
else if ( BC_side%pt_BC(i,j,k) < 258.16 ) then ! < -15C all ice_wat
BC_side%q_BC(i,j,k,liq_wat) = 0.
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k)
else ! between -15~0C: linear interpolation
BC_side%q_BC(i,j,k,liq_wat) = qn1(i,k)*((BC_side%pt_BC(i,j,k)-258.16)/15.)
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k) - BC_side%q_BC(i,j,k,liq_wat)
endif
#else
else if ( BC_side%pt_BC(i,j,k) < 233.16 ) then ! < -40C all ice_wat
BC_side%q_BC(i,j,k,liq_wat) = 0.
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k)
else
if ( k.eq.1 ) then ! between [-40,0]: linear interpolation
BC_side%q_BC(i,j,k,liq_wat) = qn1(i,k)*((BC_side%pt_BC(i,j,k)-233.16)/40.)
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k) - BC_side%q_BC(i,j,k,liq_wat)
else
if (BC_side%pt_BC(i,j,k)<258.16 .and. BC_side%q_BC(i,j,k-1,ice_wat)>1.e-5 ) then
BC_side%q_BC(i,j,k,liq_wat) = 0.
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k)
else ! between [-40,0]: linear interpolation
BC_side%q_BC(i,j,k,liq_wat) = qn1(i,k)*((BC_side%pt_BC(i,j,k)-233.16)/40.)
BC_side%q_BC(i,j,k,ice_wat) = qn1(i,k) - BC_side%q_BC(i,j,k,liq_wat)
endif
endif
endif
#endif
call mp_auto_conversion(BC_side%q_BC(i,j,k,liq_wat), BC_side%q_BC(i,j,k,rainwat), &
BC_side%q_BC(i,j,k,ice_wat), BC_side%q_BC(i,j,k,snowwat) )
Expand Down
20 changes: 1 addition & 19 deletions tools/external_ic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,13 +804,6 @@ subroutine get_nggps_ic (Atm, fv_domain)
Atm%q(i,j,k,rainwat) + &
Atm%q(i,j,k,snowwat) + &
Atm%q(i,j,k,graupel)))
elseif ( Atm%flagstruct%nwat == 7 ) then ! may not need this. 'else' should cover both 6 and 7?
qt = wt/(1. - (Atm%q(i,j,k,liq_wat) + &
Atm%q(i,j,k,ice_wat) + &
Atm%q(i,j,k,rainwat) + &
Atm%q(i,j,k,snowwat) + &
Atm%q(i,j,k,graupel) + &
Atm%q(i,j,k,hailwat)))
else ! all other values of nwat
qt = wt/(1. - sum(Atm%q(i,j,k,2:Atm%flagstruct%nwat)))
endif
Expand All @@ -832,13 +825,6 @@ subroutine get_nggps_ic (Atm, fv_domain)
Atm%q(i,j,k,rainwat) + &
Atm%q(i,j,k,snowwat) + &
Atm%q(i,j,k,graupel))
elseif ( Atm%flagstruct%nwat == 7 ) then ! may not need this. 'else' should cover both 6 and 7?
qt = wt*(1. + Atm%q(i,j,k,liq_wat) + &
Atm%q(i,j,k,ice_wat) + &
Atm%q(i,j,k,rainwat) + &
Atm%q(i,j,k,snowwat) + &
Atm%q(i,j,k,graupel) + &
Atm%q(i,j,k,hailwat))
else ! all other values of nwat
qt = wt*(1. + sum(Atm%q(i,j,k,2:Atm%flagstruct%nwat)))
endif
Expand Down Expand Up @@ -958,11 +944,7 @@ subroutine read_gfs_ic()

do nt = 1, ntracers

IF ( .not. ( nt == Atm%flagstruct%nwat .and. Atm%flagstruct%nwat == 7 ) ) THEN
q(:,:,:,nt) = -999.99
ELSE
q(:,:,:,nt) = 0 ! nonzero values can cause problems for water mass tracers not in the input (like hail mixing ratio; hailwat not defined at this point)
ENDIF

call get_tracer_names(MODEL_ATMOS, nt, tracer_name)
call register_restart_field(GFS_restart, trim(tracer_name), q(:,:,:,nt), dim_names_3d3, is_optional=.true.)
Expand Down Expand Up @@ -3117,7 +3099,7 @@ subroutine remap_scalar(Atm, km, npz, ncnst, ak0, bk0, psc, qa, zh, omga, t_in)

! map tracers
do iq=1,ncnst
! if (floor(qa(is,j,1,iq)) == -1000) cycle !skip missing scalars [floor(-999.99) is -1000]
if (floor(qa(is,j,1,iq)) == -1000) cycle !skip missing scalars [floor(-999.99) is -1000]
do k=1,km
do i=is,ie
qp(i,k) = qa(i,j,k,iq)
Expand Down