Update Names of routines

Author: Theresa Morrison

src/core/MOM.F90

@@ -861,8 +861,8 @@ subroutine step_MOM(forces_in, fluxes_in, sfc_state, Time_start, time_int_in, CS
       call step_MOM_thermo(CS, G, GV, US, u, v, h, CS%tv, fluxes, dtdia, &
                            end_time_thermo, .true., Waves=Waves)
       if ( CS%use_ALE_algorithm ) &
-        call ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, CS%tv, dtdia, Time_local)
-      call update_tracers_after_ALE(CS, G, GV, US, u, v, h, CS%tv)
+        call ALE_regridding_and_remapping(CS, G, GV, US, u, v, h, CS%tv, dtdia, Time_local)
+      call post_diabatic_halo_updates(CS, G, GV, US, u, v, h, CS%tv)
       CS%time_in_thermo_cycle = CS%time_in_thermo_cycle + dtdia
 
       ! The diabatic processes are now ahead of the dynamics by dtdia.
@@ -967,8 +967,8 @@ subroutine step_MOM(forces_in, fluxes_in, sfc_state, Time_start, time_int_in, CS
       call step_MOM_thermo(CS, G, GV, US, u, v, h, CS%tv, fluxes, dtdia, &
                            Time_local, .false., Waves=Waves)
       if ( CS%use_ALE_algorithm ) &
-        call ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, CS%tv, dtdia, Time_local)
-      call update_tracers_after_ALE(CS, G, GV, US, u, v, h, CS%tv)
+        call ALE_regridding_and_remapping(CS, G, GV, US, u, v, h, CS%tv, dtdia, Time_local)
+      call post_diabatic_halo_updates(CS, G, GV, US, u, v, h, CS%tv)
       CS%time_in_thermo_cycle = CS%time_in_thermo_cycle + dtdia
 
       if ((CS%t_dyn_rel_thermo==0.0) .and. .not.do_dyn) then
@@ -1519,7 +1519,7 @@ subroutine step_MOM_tracer_dyn(CS, G, GV, US, h, Time_local)
 end subroutine step_MOM_tracer_dyn
 
 !> MOM_step_thermo orchestrates the thermodynamic time stepping and vertical
-!! remapping, via calls to diabatic (or adiabatic) and ALE_regrid.
+!! remapping, via calls to diabatic (or adiabatic).
 subroutine step_MOM_thermo(CS, G, GV, US, u, v, h, tv, fluxes, dtdia, &
                            Time_end_thermo, update_BBL, Waves)
   type(MOM_control_struct), intent(inout) :: CS     !< Master MOM control structure
@@ -1667,7 +1667,9 @@ subroutine step_MOM_thermo(CS, G, GV, US, u, v, h, tv, fluxes, dtdia, &
 
 end subroutine step_MOM_thermo
 
-subroutine ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_end_thermo)
+!> ALE_regridding_and_remapping does regridding (the generation of a new grid) and remapping
+! (from the old grid to the new grid). This is done after the themrodynamic step.
+subroutine ALE_regridding_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_end_thermo)
   type(MOM_control_struct), intent(inout) :: CS     !< Master MOM control structure
   type(ocean_grid_type),    intent(inout) :: G      !< ocean grid structure
   type(verticalGrid_type),  intent(inout) :: GV     !< ocean vertical grid structure
@@ -1704,7 +1706,7 @@ subroutine ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_end
 
   is = G%isc ; ie = G%iec ; js = G%jsc ; je = G%jec ; nz = GV%ke
   showCallTree = callTree_showQuery()
-  if (showCallTree) call callTree_enter("ALE_gridgen_and_remapping(), MOM.F90")
+  if (showCallTree) call callTree_enter("ALE_regridding_and_remapping(), MOM.F90")
   if (CS%debug) call query_debugging_checks(do_redundant=debug_redundant)
 
   call cpu_clock_begin(id_clock_remap)
@@ -1793,12 +1795,16 @@ subroutine ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_end
     h(i,j,k) = h_new(i,j,k)
   enddo ; enddo ; enddo
 
+  if (showCallTree) call callTree_waypoint("finished ALE_regrid (ALE_regridding_and_remapping)")
+  call cpu_clock_end(id_clock_ALE)
+
+  ! Whenever thickness changes let the diag manager know, target grids
+  ! for vertical remapping may need to be regenerated. This needs to
+  ! happen after the H update and before the next post_data.
   call diag_update_remap_grids(CS%diag)
+
   call postALE_tracer_diagnostics(CS%tracer_Reg, G, GV, CS%diag, dtdia)
 
-  if (showCallTree) call callTree_waypoint("finished ALE_regrid (step_MOM_thermo)")
-  call cpu_clock_end(id_clock_ALE)
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   if (CS%debug .and. CS%use_ALE_algorithm) then
     call MOM_state_chksum("Post-ALE ", u, v, h, CS%uh, CS%vh, G, GV, US)
     call hchksum(tv%T, "Post-ALE T", G%HI, haloshift=1, unscale=US%C_to_degC)
@@ -1827,11 +1833,14 @@ subroutine ALE_gridgen_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_end
 
   call cpu_clock_end(id_clock_remap)
 
-  if (showCallTree) call callTree_leave("ALE_gridgen_and_remapping(), MOM.F90")
+  if (showCallTree) call callTree_leave("ALE_regridding_and_remapping(), MOM.F90")
 
-end subroutine ALE_gridgen_and_remapping
+end subroutine ALE_regridding_and_remapping
 
-subroutine update_tracers_after_ALE(CS, G, GV, US, u, v, h, tv)
+!> post_diabatic_halo_updates does halo updates and calculates derived thermodynamic quantities 
+! (e.g. specific volume). This must be done after the diabatic step regardless of is ALE 
+! cooridinates are used or not.
+subroutine post_diabatic_halo_updates(CS, G, GV, US, u, v, h, tv)
   type(MOM_control_struct), intent(inout) :: CS     !< Master MOM control structure
   type(ocean_grid_type),    intent(inout) :: G      !< ocean grid structure
   type(verticalGrid_type),  intent(inout) :: GV     !< ocean vertical grid structure
@@ -1873,7 +1882,7 @@ subroutine update_tracers_after_ALE(CS, G, GV, US, u, v, h, tv)
   if (allocated(tv%SpV_avg)) then
     call calc_derived_thermo(tv, h, G, GV, US, halo=dynamics_stencil, debug=CS%debug)
   endif
-end subroutine update_tracers_after_ALE
+end subroutine post_diabatic_halo_updates 
 
 !> step_offline is the main driver for running tracers offline in MOM6. This has been primarily
 !! developed with ALE configurations in mind. Some work has been done in isopycnal configuration, but