From eba9c09fc14b56d518ef74dc7fd20a8e04135780 Mon Sep 17 00:00:00 2001
From: Trevor Hillebrand <trhille@lanl.gov>
Date: Thu, 23 Feb 2023 16:10:59 -0700
Subject: [PATCH] Clean-up after rebase

Fix a few small issues after rebasing onto MALI-Dev/develop
---
 components/mpas-albany-landice/src/Registry.xml                | 3 ++-
 .../src/analysis_members/mpas_li_global_stats.F                | 1 -
 .../mpas-albany-landice/src/mode_forward/mpas_li_calving.F     | 2 +-
 .../src/mode_forward/mpas_li_time_integration_fe.F             | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/mpas-albany-landice/src/Registry.xml b/components/mpas-albany-landice/src/Registry.xml
index 62c54dd006c9..1510b6a61c79 100644
--- a/components/mpas-albany-landice/src/Registry.xml
+++ b/components/mpas-albany-landice/src/Registry.xml
@@ -1227,6 +1227,7 @@ is the value of that variable from the *previous* time level!
                 />
                 <var name="calvingThicknessFromThreshold" type="real" dimensions="nCells Time" units="m" time_levs="1"
                         description="thickness of ice that calves on a given timestep for only processes that generate calving based on a threshold.  This includes mask calving, damage calving, iceberg and small island detection, and velocity speed limit."
+                />
                 <var name="groundedCalvingThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
                         description="thickness of grounded ice that calves on a given timestep (less than or equal to ice thickness)"
                 />
@@ -1312,7 +1313,6 @@ is the value of that variable from the *previous* time level!
                 <var name="damageSource" type="real" dimensions="nCells Time" units="s^{-1}" time_levs="1"
                      description="damage source term"
                 />
-                />
                 <var name="basalWaterThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
                      description="thickness of basal water"
                 />
@@ -1385,6 +1385,7 @@ is the value of that variable from the *previous* time level!
                 />
                 <var name="dtFaceMeltingCFLratio" type="real" dimensions="Time" units="none" time_levs="1" default_value="0.0"
                         description="ratio of timestep being used to the maximum timestep calculated for the face-melting CFL condition.  This metric can be used to assess the accuracy of the face-melting CFL calculation being lagged by a timestep."
+                />
                 <var name="groundedFaceMeltingThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
                      description="Equivalent plan-view averaged thickness of grounded ice that melts on a given timestep from front ablation (less than or equal to ice thickness). Used in mass budget calculations."
                 />
diff --git a/components/mpas-albany-landice/src/analysis_members/mpas_li_global_stats.F b/components/mpas-albany-landice/src/analysis_members/mpas_li_global_stats.F
index a096895adbbc..961ee195ff61 100644
--- a/components/mpas-albany-landice/src/analysis_members/mpas_li_global_stats.F
+++ b/components/mpas-albany-landice/src/analysis_members/mpas_li_global_stats.F
@@ -208,7 +208,6 @@ subroutine li_compute_global_stats(domain, memberName, timeLevel, err)
       real (kind=RKIND), pointer ::  iceThicknessMax, iceThicknessMin, iceThicknessMean
       real (kind=RKIND), pointer ::  totalSfcMassBal, totalBasalMassBal
       real (kind=RKIND), pointer ::  totalGroundedSfcMassBal, totalFloatingSfcMassBal
-      real (kind=RKIND), pointer ::  totalFaceMeltingFlux
       real (kind=RKIND), pointer ::  totalGroundedBasalMassBal, totalFloatingBasalMassBal
       real (kind=RKIND), pointer ::  totalGroundedCalvingFlux, totalFloatingCalvingFlux
       real (kind=RKIND), pointer ::  totalFaceMeltingFlux, &
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 268e55789631..8e4fa86c4a9e 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
@@ -3856,7 +3856,7 @@ subroutine mask_calving(domain, err)
          dCalvingThickness(:) = 0.0_RKIND
 
          ! update mask
-         call li_calculate_mask(meshPool, velocityPool, geometryPool, err_tmp)
+         call li_calculate_mask(meshPool, velocityPool, geometryPool, domain, err_tmp)
          err = ior(err, err_tmp)
 
          localMaskCellCount = 0
diff --git a/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe.F b/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe.F
index ad42e3d7f7f4..3f19e86836e9 100644
--- a/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe.F
+++ b/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe.F
@@ -281,7 +281,6 @@ subroutine prepare_advection(domain, err)
       real (kind=RKIND), dimension(:,:), pointer :: layerNormalVelocity
       real (kind=RKIND), pointer :: calvingCFLdt, faceMeltingCFLdt
       real (kind=RKIND), dimension(:), pointer :: groundedToFloatingThickness
-      real (kind=RKIND), pointer :: calvingCFLdt
       integer, pointer :: processLimitingTimestep
       integer, dimension(:), pointer :: edgeMask