diff --git a/columnphysics/icepack_atmo.F90 b/columnphysics/icepack_atmo.F90 index f85b7794..2cee353f 100644 --- a/columnphysics/icepack_atmo.F90 +++ b/columnphysics/icepack_atmo.F90 @@ -507,8 +507,7 @@ end subroutine atmo_boundary_const ! ! changes: Andrew Roberts, NPS (RASM/CESM coupling and documentation) - subroutine neutral_drag_coeffs (apnd, hpnd, & - ipnd, & + subroutine neutral_drag_coeffs (apondn, & alvl, vlvl, & aice, vice, & vsno, aicen, & @@ -526,9 +525,7 @@ subroutine neutral_drag_coeffs (apnd, hpnd, & use icepack_tracers, only: tr_pond real (kind=dbl_kind), dimension (:), intent(in) :: & - apnd ,& ! melt pond fraction of sea ice - hpnd ,& ! mean melt pond depth over sea ice - ipnd ,& ! mean ice pond depth over sea ice in cat n + apondn ,& ! melt pond fraction of sea ice category alvl ,& ! level ice area fraction (of grid cell ?) vlvl ! level ice mean thickness @@ -666,7 +663,7 @@ subroutine neutral_drag_coeffs (apnd, hpnd, & if (tr_pond) then do n = 1,ncat ! area of pond per unit area of grid cell - apond = apond+apnd(n)*aicen(n) + apond = apond+apondn(n)*aicen(n) enddo endif diff --git a/columnphysics/icepack_therm_vertical.F90 b/columnphysics/icepack_therm_vertical.F90 index bfb77008..8295df2e 100644 --- a/columnphysics/icepack_therm_vertical.F90 +++ b/columnphysics/icepack_therm_vertical.F90 @@ -2568,9 +2568,7 @@ subroutine icepack_step_therm1(dt, & !----------------------------------------------------------------- if (formdrag) then - !!!! This should take apond, not apnd, will fix in the next commit - call neutral_drag_coeffs (apnd , & - hpnd , ipnd , & + call neutral_drag_coeffs (apond , & alvl , vlvl , & aice , vice, & vsno , aicen , &