From 1a2fe1cbd7dff7af273415ac870ece01a5d5ea51 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. --- .../mpas-albany-landice/src/mode_forward/mpas_li_advection.F | 2 -- .../mpas-albany-landice/src/mode_forward/mpas_li_calving.F | 2 +- 2 files changed, 1 insertion(+), 3 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 b590164f05ab..ddf6b03aa637 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 72054f8ae6b1..96cff1ae30e4 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 @@ -592,7 +592,7 @@ subroutine li_restore_calving_front(domain, err) endif ! if preventing retreat ! Now check for marine regions that have advanced - allocate(dCalvingThickness(nCellsSolve+1)) + allocate(dCalvingThickness(nCells+1)) ! loop over locally owned cells do iCell = 1, nCells