Clean up after rebase following Runge-Kutta merge

Clean up after rebase following Runge-Kutta merge

Author: trhille

components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F

@@ -81,7 +81,6 @@ subroutine li_advection_thickness_tracers(&
         geometryPool,           &
         thermalPool,            &
         scratchPool,            &
-        domain,                 &
         err,                    &
         advectTracersIn)
 
@@ -111,8 +110,6 @@ subroutine li_advection_thickness_tracers(&
       !-----------------------------------------------------------------
       type (domain_type), intent(inout) :: domain  !< Input/Output: domain object
 
-      type (domain_type), intent(inout) :: domain
-
       type (mpas_pool_type), intent(inout) :: &
            velocityPool           !< Input/output: velocity information
                                   !                (needs to be inout for li_calculate_mask call

components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe_rk.F

@@ -84,7 +84,6 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
       use li_velocity
       use li_bedtopo
       use li_mask
-      use li_advection, only: li_grounded_to_floating
 
       !-----------------------------------------------------------------
       ! input variables
@@ -377,7 +376,7 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
                                      (1.0_RKIND - rkSSPweights(rkStage)) * layerThickness(:,:)
             thickness = sum(layerThickness, 1)
             ! Calculate masks after updating thickness
-            call li_calculate_mask(meshPool, velocityPool, geometryPool, err_tmp)
+            call li_calculate_mask(meshPool, velocityPool, geometryPool, domain, err_tmp)
             err = ior(err, err_tmp)
 
             if (trim(config_thermal_solver) .ne. 'none') then
@@ -481,7 +480,7 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
 
 ! Finalize budget updates
       ! Update masks after RK integration
-      call li_calculate_mask(meshPool, velocityPool, geometryPool, err_tmp)
+      call li_calculate_mask(meshPool, velocityPool, geometryPool, domain, err_tmp)
       err = ior(err, err_tmp)
 
       call mpas_pool_get_array(geometryPool, 'cellMask', cellMask)
@@ -493,10 +492,6 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
       call mpas_dmpar_field_halo_exch(domain, 'vertexMask')
       call mpas_timer_stop("halo updates")
 
-      ! Calculate volume converted from grounded to floating
-      ! This needs to be determined after SMB/BMB are applied because those can change floating/grounded state
-      call li_grounded_to_floating(cellMaskPrev, cellMask, thickness, groundedToFloatingThickness, nCells)
-
       sfcMassBalApplied(:) = sfcMassBalAccum(:)
       groundedSfcMassBalApplied(:) = groundedSfcMassBalAccum(:)
       basalMassBalApplied(:) = basalMassBalAccum(:)
@@ -1103,7 +1098,6 @@ subroutine advection_solver(domain, err)
                  geometryPool,           &
                  thermalPool,            &
                  scratchPool,            &
-                 domain,                 &
                  err_tmp,                &
                  advectTracersIn = .true.)
 
@@ -1123,7 +1117,6 @@ subroutine advection_solver(domain, err)
                  geometryPool,           &
                  thermalPool,            &
                  scratchPool,            &
-                 domain,                 &
                  err_tmp,                &
                  advectTracersIn = .false.)