Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix small conservation error when using fct thickness and tracer advection #95

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Fix small conservation error when using fct thickness and tracer advection #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/mpas-albany-landice/src/mode_forward/mpas_li_advection.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ module li_advection
!-----------------------------------------------------------------------

subroutine li_advection_thickness_tracers(&
domain, &
dt, &
meshPool, &
velocityPool, &
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration_fe.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@ subroutine advection_solver(domain, err)
endif

call li_advection_thickness_tracers(&
domain, &
deltat, &
meshPool, &
velocityPool, &
Expand All @@ -733,6 +734,7 @@ subroutine advection_solver(domain, err)
endif

call li_advection_thickness_tracers(&
domain, &
deltat, &
meshPool, &
velocityPool, &
Expand Down