Skip to content

Commit

Permalink
Updated flake physics
Browse files Browse the repository at this point in the history
  • Loading branch information
YihuaWu-NOAA committed Apr 15, 2021
1 parent 3163fbc commit 59ab0cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions physics/module_nst_water_prop.f90
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ subroutine get_dtzm_point(xt,xz,dt_cool,zc,z1,z2,dtm)
end subroutine get_dtzm_point

!>\ingroup waterprop
subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,use_flake,z1,z2,nx,ny,nth,dtm)
subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,z1,z2,nx,ny,nth,dtm)
!subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,icy,z1,z2,nx,ny,dtm)
! ===================================================================== !
! !
Expand All @@ -682,7 +682,6 @@ subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,use_flake,z1,z2,nx,ny,nth,dtm)
! dt_cool - real, sub-layer cooling amount 1 !
! zc - sub-layer cooling thickness 1 !
! wet - logical, flag for wet point (ocean or lake) 1 !
! use_flake - logical, flag for lake point only 1 !
! icy - logical, flag for ice point (ocean or lake) 1 !
! nx - integer, dimension in x-direction (zonal) 1 !
! ny - integer, dimension in y-direction (meridional) 1 !
Expand All @@ -698,7 +697,7 @@ subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,use_flake,z1,z2,nx,ny,nth,dtm)

integer, intent(in) :: nx,ny, nth
real (kind=kind_phys), dimension(nx,ny), intent(in) :: xt,xz,dt_cool,zc
logical, dimension(nx,ny), intent(in) :: wet, use_flake
logical, dimension(nx,ny), intent(in) :: wet
! logical, dimension(nx,ny), intent(in) :: wet,icy
real (kind=kind_phys), intent(in) :: z1,z2
real (kind=kind_phys), dimension(nx,ny), intent(out) :: dtm
Expand All @@ -714,7 +713,7 @@ subroutine get_dtzm_2d(xt,xz,dt_cool,zc,wet,use_flake,z1,z2,nx,ny,nth,dtm)

dtm(i,j) = zero ! initialize dtm

if ( wet(i,j) .and. .not. use_flake(i,j)) then
if ( wet(i,j)) then
!
! get the mean warming in the range of z=z1 to z=z2
!
Expand Down
7 changes: 3 additions & 4 deletions physics/sfc_nst.f
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,8 @@ subroutine sfc_nst_pre_run
!
if (cplflx) then
z_c_0 = 0.0
call get_dtzm_2d (xt, xz, dt_cool,
& z_c, wet, use_flake, zero, omz1, im, 1,
& nthreads, dtzm)
call get_dtzm_2d (xt, xz, dt_cool, z_c, wet, &
& zero, omz1, im, 1, nthreads, dtzm)
do i=1,im
if (wet(i).and.oceanfrac(i)>zero.and..not.use_flake(i)) then
! dnsst = tsfc_wat(i) - tref(i) ! retrive/get difference of Ts and Tf
Expand Down Expand Up @@ -836,7 +835,7 @@ subroutine sfc_nst_post_run &
if (nstf_name1 > 1) then
zsea1 = 0.001_kp*real(nstf_name4)
zsea2 = 0.001_kp*real(nstf_name5)
call get_dtzm_2d (xt, xz, dt_cool, z_c, wet, use_flake, &
call get_dtzm_2d (xt, xz, dt_cool, z_c, wet, &
& zsea1, zsea2, im, 1, nthreads, dtzm)
do i = 1, im
! if (wet(i) .and. .not.icy(i)) then
Expand Down

0 comments on commit 59ab0cd

Please sign in to comment.