Merge branch 'trhille/fix_fct_tracer_conservation_bug' into MALI-Dev/…

…develop Add a halo update on layerThicknessEdgeFlux to fix a small tracer conservation error when using fct thickness and tracer advection.
MALI-Dev · Oct 27, 2023 · 81b36a9 · 81b36a9
2 parents 1343d1d + 7df9b12
commit 81b36a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 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
@@ -74,6 +74,7 @@ module li_advection
 !-----------------------------------------------------------------------
 
    subroutine li_advection_thickness_tracers(&
+        domain,                 &
         dt,                     &
         meshPool,               &
         velocityPool,           &
@@ -107,6 +108,7 @@ subroutine li_advection_thickness_tracers(&
       ! input/output variables
       !
       !-----------------------------------------------------------------
+      type (domain_type), intent(inout) :: domain  !< Input/Output: domain object
 
       type (mpas_pool_type), intent(inout) :: &
            velocityPool           !< Input/output: velocity information
@@ -494,6 +496,10 @@ subroutine li_advection_thickness_tracers(&
              ! This does conserve mass:
              layerThickness(:,:) = layerThickness(:,:) + tend(nTracers,:,:) * dt
 
+             call mpas_timer_start("halo updates")
+             call mpas_dmpar_field_halo_exch(domain, 'layerThicknessEdgeFlux')
+             call mpas_timer_stop("halo updates")
+
              if (trim(config_tracer_advection) .eq. 'fct') then
                 ! Call fct for tracers, using layerThicknessEdgeFlux
                 ! from fct thickness advection as normalThicknessFlux

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
@@ -715,6 +715,7 @@ subroutine advection_solver(domain, err)
             endif
 
             call li_advection_thickness_tracers(&
+                 domain,                 &
                  deltat,                 &
                  meshPool,               &
                  velocityPool,           &
@@ -733,6 +734,7 @@ subroutine advection_solver(domain, err)
             endif
 
             call li_advection_thickness_tracers(&
+                 domain,                 &
                  deltat,                 &
                  meshPool,               &
                  velocityPool,           &