Skip to content

Commit 461ef8e

Browse files
committed
Move face-melting after last RK velocity solve
Move face-melting after last velocity solve in RK loop. This is necessary to close mass budgets when using face-melting.
1 parent 991c5b6 commit 461ef8e

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,6 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
238238
err = ior(err, err_tmp)
239239
call mpas_timer_stop("advancing clock")
240240

241-
!TODO: Determine whether grounded melting should in fact be called first
242-
! === Face melting for grounded ice ===========
243-
call mpas_timer_start("face melting for grounded ice")
244-
call li_face_melt_grounded_ice(domain, err_tmp)
245-
err = ior(err, err_tmp)
246-
call mpas_timer_stop("face melting for grounded ice")
247-
248-
! *** TODO: Should basal melt rate calculation and column physics go inside RK loop? ***
249-
250241
! === Basal melting for floating ice ===========
251242
call mpas_timer_start("basal melting for floating ice")
252243
call li_basal_melt_floating_ice(domain, err_tmp)
@@ -552,6 +543,13 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
552543
call mpas_dmpar_field_halo_exch(domain, 'vertexMask')
553544
call mpas_timer_stop("halo updates")
554545
546+
!TODO: Determine whether grounded melting should in fact be called first
547+
! === Face melting for grounded ice ===========
548+
call mpas_timer_start("face melting for grounded ice")
549+
call li_face_melt_grounded_ice(domain, err_tmp)
550+
err = ior(err, err_tmp)
551+
call mpas_timer_stop("face melting for grounded ice")
552+
555553
! === Update bed topo =====================
556554
! It's not clear when the best time to do this is.
557555
! Seems cleaner to do it either before or after all of the time evolution of the ice

0 commit comments

Comments
 (0)