Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 1 addition & 25 deletions src/core_ocean/shared/mpas_ocn_diagnostics.F
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ subroutine ocn_diagnostic_solve(dt, statePool, forcingPool, meshPool, diagnostic
! (positive points from vertex1 to vertex2)
! units: s^{-1} m^{-1}
real (kind=RKIND), dimension(:,:), allocatable :: vorticityGradientTangentialComponent


real (kind=RKIND), dimension(:), pointer :: surfaceFluxAttenuationCoefficient
real (kind=RKIND), dimension(:), pointer :: surfaceFluxAttenuationCoefficientRunoff
Expand Down Expand Up @@ -1639,30 +1639,6 @@ subroutine ocn_compute_land_ice_flux_input_fields(meshPool, statePool, &
xiN = 0.052_RKIND ! dimensionless planetary boundary layer constant


if ( trim(config_land_ice_flux_mode) .ne. 'off' ) then

! we need to compute the landiceMask regardless of which mode we're in so it can be
! added to the restart file

call mpas_pool_get_array(forcingPool, 'landIceFraction', landIceFraction)
call mpas_pool_get_array(forcingPool, 'landIceMask', landIceMask)

call mpas_pool_get_dimension(meshPool, 'nCells', nCells)
! compute landIceMask from landIceFraction
!$omp do schedule(runtime)
do iCell = 1, nCells
if (landIceFraction(iCell) >= 0.5_RKIND) then
landIceMask(iCell) = 1
else
landIceMask(iCell) = 0
! don't allow land-ice fluxes if land ice is masked out
landIceFraction(iCell) = 0.0_RKIND
end if
end do
!$omp end do

end if

if ( trim(config_land_ice_flux_mode) .ne. 'standalone' .and. trim(config_land_ice_flux_mode) .ne. 'coupled' ) then
return
end if
Expand Down