Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,12 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
err = ior(err, err_tmp)
call mpas_timer_stop("advancing clock")

!TODO: Determine whether grounded melting should in fact be called first
! === Ocean forcing extrapolation into ice-shelf cavities ===========
call mpas_timer_start("ocean forcing extrapolation")
call li_ocean_extrap_solve(domain, err_tmp)
err = ior(err, err_tmp)
call mpas_timer_stop("ocean forcing extrapolation")

! === Face melting for grounded ice ===========
call mpas_timer_start("face melting for grounded ice")
call li_face_melt_grounded_ice(domain, err_tmp)
err = ior(err, err_tmp)
call mpas_timer_stop("face melting for grounded ice")

! === Basal melting for floating ice ===========
call mpas_timer_start("basal melting for floating ice")
call li_basal_melt_floating_ice(domain, err_tmp)
Expand Down Expand Up @@ -611,6 +604,12 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
call mpas_dmpar_field_halo_exch(domain, 'vertexMask')
call mpas_timer_stop("halo updates")

! === Face melting for grounded ice ===========
call mpas_timer_start("face melting for grounded ice")
call li_face_melt_grounded_ice(domain, err_tmp)
err = ior(err, err_tmp)
call mpas_timer_stop("face melting for grounded ice")

! === Update bed topo =====================
! It's not clear when the best time to do this is.
! Seems cleaner to do it either before or after all of the time evolution of the ice
Expand Down