Restore calving front within RK loop

Restore calving front within RK loop to prevent velocity solutions
on extended ice geometry.

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

@@ -475,6 +475,11 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
 
          call mpas_timer_stop("halo updates")
 
+         if (config_restore_calving_front) then
+            ! restore the calving front to its initial position before velocity solve.
+            call li_restore_calving_front(domain, err_tmp)
+            err = ior(err, err_tmp)
+         endif
 
          ! Update velocity for each RK step
          ! === Solve Velocity =====================
@@ -531,12 +536,6 @@ subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
       call li_calve_ice(domain, err_tmp)
       err = ior(err, err_tmp)
 
-      if (config_restore_calving_front) then
-         ! restore the calving front to its initial position; calving options are ignored
-         call li_restore_calving_front(domain, err_tmp)
-         err = ior(err, err_tmp)
-      endif
-
       call mpas_timer_stop("calve_ice")
 
       call mpas_timer_start("halo updates")