Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9b81508
Deal with sea ice points properly in HAFS FV3-HYCOM coupling without …
BinLiu-NOAA Apr 8, 2021
02aee9a
Merge remote-tracking branch 'upstream/master' into support/HAFS
BinLiu-NOAA Apr 16, 2021
152fd8e
Merge branch 'support/HAFS' into feature/hafsv0.2_phase2
BinLiu-NOAA Apr 16, 2021
bd89cbc
*Rename dkudiagnostic into dku in moninedmf.f and satmedmfvdifq.F.
BinLiu-NOAA Apr 16, 2021
ac764c8
Merge branch 'feature/dkudiagnostic' into support/HAFS
BinLiu-NOAA Apr 16, 2021
ad4884f
Merge branch 'feature/dkudiagnostic' into support/HAFS
BinLiu-NOAA Apr 16, 2021
1f19023
Merge remote-tracking branch 'remotes/origin/feature/dkudiagnostic' i…
BinLiu-NOAA Apr 16, 2021
bee676f
Merge branch 'feature/dkudiagnostic' into support/HAFS
BinLiu-NOAA Apr 20, 2021
adb02ca
Merge remote-tracking branch 'remotes/upstream/master' into support/HAFS
BinLiu-NOAA May 11, 2021
91e26e6
Add a cplice namelist option to deal with the situation that HAFS FV3…
BinLiu-NOAA May 19, 2021
de283ee
fix for cmeps coupling
May 21, 2021
d7d4e64
Convert the parameter variables rlmx and elmx (maximum allowed mixing…
BinLiu-NOAA May 26, 2021
7c7644b
Merge remote-tracking branch 'remotes/origin/support/HAFS' into featu…
BinLiu-NOAA May 27, 2021
14e51d9
*Add WeiguoWang-NOAA's modification of near-surface mixing length in …
BinLiu-NOAA Jun 15, 2021
c836d26
Merge remote-tracking branch 'remotes/origin/support/HAFS' into featu…
BinLiu-NOAA Jun 21, 2021
5b9d0f4
Merge commit 'f8e883632dcdd3c1aaec8b90adb72b3f6aff4b9d' into feature/…
BinLiu-NOAA Jul 9, 2021
5ff534b
Merge remote-tracking branch 'remotes/upstream/main' into feature/haf…
BinLiu-NOAA Jul 13, 2021
08c519c
Merge remote-tracking branch 'remotes/origin/support/HAFS' into featu…
BinLiu-NOAA Jul 14, 2021
e12a7a1
Merge remote-tracking branch 'remotes/upstream/main' into feature/haf…
BinLiu-NOAA Jul 16, 2021
d167e24
Merge remote-tracking branch 'remotes/origin/support/HAFS' into featu…
BinLiu-NOAA Jul 17, 2021
6af3fae
Merge remote-tracking branch 'remotes/upstream/main' into support/HAFS
BinLiu-NOAA Jul 25, 2021
3349c8c
Add some comments to describe the cplice related if condition situati…
BinLiu-NOAA Jul 30, 2021
fd62877
Merge remote-tracking branch 'remotes/upstream/main' into feature/haf…
BinLiu-NOAA Jul 30, 2021
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
19 changes: 15 additions & 4 deletions physics/GFS_surface_composites.F90
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end subroutine GFS_surface_composites_pre_finalize
!! \htmlinclude GFS_surface_composites_pre_run.html
!!
subroutine GFS_surface_composites_pre_run (im, flag_init, flag_restart, lkm, lsm, lsm_noahmp, lsm_ruc, frac_grid, &
flag_cice, cplflx, cplwav2atm, landfrac, lakefrac, lakedepth, oceanfrac, frland, &
flag_cice, cplflx, cplice, cplwav2atm, landfrac, lakefrac, lakedepth, oceanfrac, frland, &
dry, icy, lake, use_flake, ocean, wet, hice, cice, zorlo, zorll, zorli, &
snowd, snowd_lnd, snowd_ice, tprcp, tprcp_wat, &
tprcp_lnd, tprcp_ice, uustar, uustar_wat, uustar_lnd, uustar_ice, &
Expand All @@ -43,7 +43,7 @@ subroutine GFS_surface_composites_pre_run (im, flag_init, flag_restart, lkm, lsm
! Interface variables
integer, intent(in ) :: im, lkm, kdt
integer, intent(in ) :: lsm, lsm_noahmp, lsm_ruc
logical, intent(in ) :: flag_init, flag_restart, frac_grid, cplflx, cplwav2atm
logical, intent(in ) :: flag_init, flag_restart, frac_grid, cplflx, cplice, cplwav2atm
logical, dimension(:), intent(inout) :: flag_cice
logical, dimension(:), intent(inout) :: dry, icy, lake, use_flake, ocean, wet
real(kind=kind_phys), dimension(:), intent(in ) :: landfrac, lakefrac, lakedepth, oceanfrac
Expand Down Expand Up @@ -155,7 +155,14 @@ subroutine GFS_surface_composites_pre_run (im, flag_init, flag_restart, lkm, lsm
if (cice(i) >= min_seaice) then
icy(i) = .true.
tisfc(i) = max(timin, min(tisfc(i), tgice))
if (cplflx) then
! This cplice namelist option was added to deal with the
! situation of the FV3ATM-HYCOM coupling without an active sea
! ice (e.g., CICE6) component. By default, the cplice is true
! when cplflx is .true. (e.g., for the S2S application).
! Whereas, for the HAFS FV3ATM-HYCOM coupling, cplice is set as
! .false.. In the future HAFS FV3ATM-MOM6 coupling, the cplflx
! could be .true., while cplice being .false..
if (cplice .and. cplflx) then
Comment thread
BinLiu-NOAA marked this conversation as resolved.
islmsk_cice(i) = 4
flag_cice(i) = .true.
else
Expand All @@ -173,7 +180,11 @@ subroutine GFS_surface_composites_pre_run (im, flag_init, flag_restart, lkm, lsm
endif
if (cice(i) < one) then
wet(i) = .true. ! some open ocean
if (.not. cplflx .and. icy(i)) tsfco(i) = max(tisfc(i), tgice)
if (cplice) then
if (.not. cplflx .and. icy(i)) tsfco(i) = max(tisfc(i), tgice)
Comment thread
BinLiu-NOAA marked this conversation as resolved.
else
if (icy(i)) tsfco(i) = max(tisfc(i), tgice)
endif
endif
else
if (cice(i) >= min_lakeice) then
Expand Down
8 changes: 8 additions & 0 deletions physics/GFS_surface_composites.meta
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@
type = logical
intent = in
optional = F
[cplice]
standard_name = flag_for_sea_ice_coupling
long_name = flag controlling cplice collection (default on)
units = flag
dimensions = ()
type = logical
intent = in
optional = F
[cplwav2atm]
standard_name = flag_for_one_way_ocean_wave_coupling_to_atmosphere
long_name = flag controlling ocean wave coupling to the atmosphere (default off)
Expand Down
11 changes: 9 additions & 2 deletions physics/satmedmfvdifq.F
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& prsi,del,prsl,prslk,phii,phil,delt, &
& dspheat,dusfc,dvsfc,dtsfc,dqsfc,hpbl,dkt,dku, &
& kinver,xkzm_m,xkzm_h,xkzm_s,dspfac,bl_upfr,bl_dnfr, &
& rlmx,elmx,sfc_rlm, &
& ntoz,ntqv,dtend,dtidx,index_of_temperature,index_of_x_wind, &
& index_of_y_wind,index_of_process_pbl,gen_tend,ldiag3d, &
& errmsg,errflg)
Expand All @@ -86,6 +87,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
!
!----------------------------------------------------------------------
integer, intent(in) :: im, km, ntrac, ntcw, ntiw, ntke, ntoz,ntqv
integer, intent(in) :: sfc_rlm
integer, intent(in) :: kinver(:)
integer, intent(out) :: kpbl(:)
logical, intent(in) :: gen_tend,ldiag3d
Expand All @@ -94,6 +96,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& eps,epsm1
real(kind=kind_phys), intent(in) :: delt, xkzm_m, xkzm_h, xkzm_s
real(kind=kind_phys), intent(in) :: dspfac, bl_upfr, bl_dnfr
real(kind=kind_phys), intent(in) :: rlmx, elmx
real(kind=kind_phys), intent(inout) :: dv(:,:), du(:,:), &
& tdt(:,:), rtg(:,:,:)
real(kind=kind_phys), intent(in) :: &
Expand Down Expand Up @@ -212,7 +215,6 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
& rdt, rdz, qmin, qlmin,
& rimin, rbcr, rbint, tdzmin,
& rlmn, rlmn0, rlmn1, rlmn2,
& rlmx, elmx,
& ttend, utend, vtend, qtend,
& zfac, zfmin, vk, spdk2,
& tkmin, tkbmx, xkgdx,
Expand All @@ -232,7 +234,6 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
parameter(vk=0.4,rimin=-100.)
parameter(rbcr=0.25,zolcru=-0.02,tdzmin=1.e-3)
parameter(rlmn=30.,rlmn0=5.,rlmn1=5.,rlmn2=10.)
parameter(rlmx=300.,elmx=300.)
parameter(prmin=0.25,prmax=4.0)
parameter(pr0=1.0,prtke=1.0,prscu=0.67)
parameter(f0=1.e-4,crbmin=0.15,crbmax=0.35)
Expand Down Expand Up @@ -1029,6 +1030,12 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntiw,ntke, &
zk = tem / ptem
endif
elm(i,k) = zk*rlam(i,k)/(rlam(i,k)+zk)

!> - If sfc_rlm=1, use zk for elm within surface layer
Comment thread
BinLiu-NOAA marked this conversation as resolved.
if ( sfc_rlm == 1 ) then
if ( sfcflg(i) .and.
& zl(i,k) < min(100.0,hpbl(i)*0.05) ) elm(i,k)=zk
endif
!
dz = zi(i,k+1) - zi(i,k)
tem = max(gdx(i),dz)
Expand Down
26 changes: 26 additions & 0 deletions physics/satmedmfvdifq.meta
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,32 @@
kind = kind_phys
intent = in
optional = F
[rlmx]
standard_name = maximum_allowed_mixing_length_in_boundary_layer_mass_flux_scheme
long_name = maximum allowed mixing length in boundary layer mass flux scheme
units = m
dimensions = ()
type = real
kind = kind_phys
intent = in
optional = F
[elmx]
standard_name = maximum_allowed_dissipation_mixing_length_in_boundary_layer_mass_flux_scheme
long_name = maximum allowed dissipation mixing length in boundary layer mass flux scheme
units = m
dimensions = ()
type = real
kind = kind_phys
intent = in
optional = F
[sfc_rlm]
standard_name = choice_of_near_surface_mixing_length_in_boundary_layer_mass_flux_scheme
long_name = choice of near surface mixing length in boundary layer mass flux scheme
units = none
dimensions = ()
type = integer
intent = in
optional = F
[ntoz]
standard_name = index_of_ozone_mixing_ratio_in_tracer_concentration_array
long_name = tracer index for ozone mixing ratio
Expand Down
3 changes: 2 additions & 1 deletion physics/sfc_diff.f
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,8 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
z0rl_wat(i) = 1.0e-4_kp
endif

elseif (z0rl_wav(i) <= 1.0e-7_kp) then
elseif (z0rl_wav(i) <= 1.0e-7_kp .or. &
& z0rl_wav(i) > 1.0_kp) then
! z0 = (charnock / grav) * ustar_wat(i) * ustar_wat(i)
tem1 = 0.11 * vis / ustar_wat(i)
z0 = tem1 + (charnock/grav)*ustar_wat(i)*ustar_wat(i)
Expand Down