Skip to content

Replace icplocn2atm (integer) with use_oceanuv (logical) #17

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
uturuncoglu merged 2 commits into from
Sep 17, 2025
Merged

Replace icplocn2atm (integer) with use_oceanuv (logical) #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91210c1
update sfcdiff for use_oceanuv
DeniseWorthen Aug 12, 2025
2aa4405
Merge branch 'NOAA-EMC:develop' into feature/rename_icplocn2atm
DeniseWorthen Aug 19, 2025
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
34 changes: 17 additions & 17 deletions drivers/ccpp/sfc_diff.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
& flag_iter,redrag, & !intent(in)
& flag_lakefreeze, & !intent(in)
& u10m,v10m,sfc_z0_type, & !hafs,z0 type !intent(in)
& u1,v1,usfco,vsfco,icplocn2atm, &
& u1,v1,usfco,vsfco,use_oceanuv, &
& wet,dry,icy, & !intent(in)
& thsfc_loc, & !intent(in)
& tskin_wat, tskin_lnd, tskin_ice, & !intent(in)
Expand All @@ -87,13 +87,13 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
integer, parameter :: kp = kind_phys
integer, intent(in) :: im, ivegsrc
integer, intent(in) :: sfc_z0_type ! option for calculating surface roughness length over ocean
integer, intent(in) :: icplocn2atm ! option for including ocean current in the computation of flux
logical, intent(in) :: use_oceanuv ! option for including ocean current in the computation of flux

integer, dimension(:), intent(in) :: vegtype

logical, intent(in) :: redrag ! reduced drag coeff. flag for high wind over sea (j.han)
logical, dimension(:), intent(in) :: flag_iter, dry, icy
logical, dimension(:), intent(in) :: flag_lakefreeze
logical, dimension(:), intent(in) :: flag_lakefreeze
logical, dimension(:), intent(inout) :: wet

logical, intent(in) :: thsfc_loc ! Flag for reference pressure in theta calculation
Expand Down Expand Up @@ -296,7 +296,7 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
tvs = half * (tsurf_ice(i)+tskin_ice(i)) * virtfac
else ! Use potential temperature referenced to 1000 hPa
tvs = half * (tsurf_ice(i)+tskin_ice(i))/prsik1(i)
& * virtfac
& * virtfac
endif

z0max = max(zmin, min(0.01_kp * z0rl_ice(i), z1(i)))
Expand Down Expand Up @@ -346,7 +346,7 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
! the stuff now put into "stability"

if (wet(i)) then ! Some open ocean

zvfun(i) = zero

if(thsfc_loc) then ! Use local potential temperature
Expand All @@ -356,12 +356,12 @@ subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in)
& * virtfac
endif

if (icplocn2atm == 0) then
if (.not. use_oceanuv) then
wind10m=sqrt(u10m(i)*u10m(i)+v10m(i)*v10m(i))
windrel=wind(i)
else if (icplocn2atm ==1) then
else if (use_oceanuv) then
wind10m=sqrt((u10m(i)-usfco(i))**2+(v10m(i)-vsfco(i))**2)
windrel=sqrt((u1(i)-usfco(i))**2+(v1(i)-vsfco(i))**2)
windrel=sqrt((u1(i)-usfco(i))**2+(v1(i)-vsfco(i))**2)
endif

if (sfc_z0_type == -1) then ! using wave model derived momentum roughness
Expand Down Expand Up @@ -511,8 +511,8 @@ subroutine stability &
z1i = one / z1

!
! set background diffusivities with one for gdx >= xkgdx and
! as a function of horizontal grid size for gdx < xkgdx
! set background diffusivities with one for gdx >= xkgdx and
! as a function of horizontal grid size for gdx < xkgdx
! (i.e., gdx/xkgdx for gdx < xkgdx)
!
if(gdx >= xkgdx) then
Expand Down Expand Up @@ -659,7 +659,7 @@ SUBROUTINE znot_m_v6(uref, znotm)
! For high winds, try to fit available observational data
!
! Bin Liu, NOAA/NCEP/EMC 2017
!
!
! uref(m/s) : wind speed at 10-m height
! znotm(meter): areodynamical roughness scale over water
!
Expand All @@ -679,10 +679,10 @@ SUBROUTINE znot_m_v6(uref, znotm)
& p31 = 1.255457892775006e+00, p30 = -1.663993561652530e+01,

& p40 = 4.579369142033410e-04


if (uref >= 0.0 .and. uref <= 6.5 ) then
znotm = exp(p10 + uref * (p11 + uref * (p12 + uref*p13)))
znotm = exp(p10 + uref * (p11 + uref * (p12 + uref*p13)))
elseif (uref > 6.5 .and. uref <= 15.7) then
znotm = p20 + uref * (p21 + uref * (p22 + uref * (p23
& + uref * (p24 + uref * p25))))
Expand Down Expand Up @@ -742,16 +742,16 @@ SUBROUTINE znot_t_v6(uref, znott)
znott = p10 + uref * (p11 + uref * (p12 + uref * (p13
& + uref * (p14 + uref * p15))))
elseif (uref > 15.4 .and. uref <= 21.6) then
znott = p20 + uref * (p21 + uref * (p22 + uref * (p23
znott = p20 + uref * (p21 + uref * (p22 + uref * (p23
& + uref * (p24 + uref * p25))))
elseif (uref > 21.6 .and. uref <= 42.2) then
znott = p30 + uref * (p31 + uref * (p32 + uref * (p33
znott = p30 + uref * (p31 + uref * (p32 + uref * (p33
& + uref * (p34 + uref * p35))))
elseif ( uref > 42.2 .and. uref <= 53.3) then
znott = p40 + uref * (p41 + uref * (p42 + uref * (p43
znott = p40 + uref * (p41 + uref * (p42 + uref * (p43
& + uref * (p44 + uref * p45))))
elseif ( uref > 53.3 .and. uref <= 80.0) then
znott = p50 + uref * (p51 + uref * (p52 + uref * (p53
znott = p50 + uref * (p51 + uref * (p52 + uref * (p53
& + uref * (p54 + uref * (p55 + uref * p56)))))
elseif ( uref > 80.0) then
znott = p60
Expand Down