From 31a4999e968f40e4d8f501cbaa969fad02e838d3 Mon Sep 17 00:00:00 2001 From: Trevor Ray Hillebrand Date: Tue, 1 Nov 2022 20:21:56 -0600 Subject: [PATCH] Cleanup after rebase onto MALI-Dev/develop Clean up a few items after rebasing, including changing a few instances of 'flood_fill' to 'li_flood_fill', an instance of 'nCellsSolve' to 'nCells', and removing cellMaskTemporaryField from li_advection_thickness_tracers. --- .../src/mode_forward/mpas_li_advection.F | 2 -- .../mpas-albany-landice/src/mode_forward/mpas_li_calving.F | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F b/components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F index c7309517bde1..8b2b77dbba27 100644 --- a/components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F +++ b/components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F @@ -187,7 +187,6 @@ subroutine li_advection_thickness_tracers(& basalTracersField ! scratch field containing values of basal tracers type (field1DInteger), pointer :: & - cellMaskTemporaryField, & ! scratch field containing old values of cellMask thermalCellMaskField integer, dimension(:), pointer :: & @@ -626,7 +625,6 @@ subroutine li_advection_thickness_tracers(& call mpas_deallocate_scratch_field(layerThicknessOldField, .true.) call mpas_deallocate_scratch_field(basalTracersField, .true.) call mpas_deallocate_scratch_field(surfaceTracersField, .true.) - call mpas_deallocate_scratch_field(cellMaskTemporaryField, .true.) call mpas_deallocate_scratch_field(thermalCellMaskField, .true.) ! === error check diff --git a/components/mpas-albany-landice/src/mode_forward/mpas_li_calving.F b/components/mpas-albany-landice/src/mode_forward/mpas_li_calving.F index 08ad9c1e6585..cb52179d1c7e 100644 --- a/components/mpas-albany-landice/src/mode_forward/mpas_li_calving.F +++ b/components/mpas-albany-landice/src/mode_forward/mpas_li_calving.F @@ -523,7 +523,7 @@ subroutine li_restore_calving_front(domain, err) calvingThickness = 0.0_RKIND restoreThickness = 0.0_RKIND - allocate(dCalvingThickness(nCellsSolve+1)) + allocate(dCalvingThickness(nCells+1)) ! loop over locally owned cells do iCell = 1, nCells @@ -3904,7 +3904,7 @@ subroutine remove_icebergs(domain) where ( (seedMask == 0) .and. li_mask_is_floating_ice(cellMask(:)) .and. li_mask_is_dynamic_ice(cellMask(:)) ) growMask = 1 endwhere - call flood_fill(seedMask, growMask, domain) + call li_flood_fill(seedMask, growMask, domain) ! Add floating non-dynamic fringe, but exclude dynamic ice isolated by ! non-dynamic ice, which can cause velocity solver to fail to converge. @@ -3916,7 +3916,7 @@ subroutine remove_icebergs(domain) elsewhere growMask = 0 endwhere - call flood_fill(seedMask, growMask, domain) + call li_flood_fill(seedMask, growMask, domain) ! Now remove any ice that was not flood-filled - these are icebergs block => domain % blocklist