correct coupled_driver/ocean_model_MOM.F90 and other cleanup

Author: pjpegion

config_src/coupled_driver/ocean_model_MOM.F90

@@ -565,7 +565,7 @@ subroutine update_ocean_model(Ice_ocean_boundary, OS, Ocean_sfc, time_start_upda
     ! For now, the waves are only updated on the thermodynamics steps, because that is where
     ! the wave intensities are actually used to drive mixing.  At some point, the wave updates
     ! might also need to become a part of the ocean dynamics, according to B. Reichl.
-    call Update_Surface_Waves(OS%grid, OS%GV, OS%US, OS%time, ocean_coupling_time_step, OS%waves, OS%forces)
+    call Update_Surface_Waves(OS%grid, OS%GV, OS%US, OS%time, ocean_coupling_time_step, OS%waves)
   endif
 
   if ((OS%nstep==0) .and. (OS%nstep_thermo==0)) then ! This is the first call to update_ocean_model.

src/parameterizations/vertical/MOM_diabatic_driver.F90

@@ -290,7 +290,7 @@ subroutine diabatic(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, &
   integer :: i, j, k, m, is, ie, js, je, nz
   logical :: showCallTree ! If true, show the call tree
 
-  real, dimension(SZI_(G),SZJ_(G),SZK_(G))   :: h_in  ! thickenss before thermodynamics
+  real, dimension(SZI_(G),SZJ_(G),SZK_(G))   :: h_in  ! thickness before thermodynamics
   real, dimension(SZI_(G),SZJ_(G),SZK_(G))   :: t_in  ! temperature before thermodynamics
   real, dimension(SZI_(G),SZJ_(G),SZK_(G))   :: s_in  ! salinity before thermodynamics
   real :: t_tend,s_tend,h_tend                  ! holder for tendencey needed for SPPT
@@ -390,7 +390,7 @@ subroutine diabatic(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, &
 
   if (CS%useALEalgorithm .and. CS%use_legacy_diabatic) then
     call diabatic_ALE_legacy(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, &
-                      G, GV, US, CS, Waves,stochastics=stochastics)
+                      G, GV, US, CS, Waves, stochastics=stochastics)
   elseif (CS%useALEalgorithm) then
     call diabatic_ALE(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, &
                       G, GV, US, CS, Waves, stochastics=stochastics)

src/parameterizations/vertical/MOM_energetic_PBL.F90

@@ -462,9 +462,9 @@ subroutine energetic_PBL(h_3d, u_3d, v_3d, tv, fluxes, dt, Kd_int, G, GV, US, CS
       MLD_io = -1.0
       if (CS%MLD_iteration_guess .and. (CS%ML_Depth(i,j) > 0.0))  MLD_io = CS%ML_Depth(i,j)
 
-      call ePBL_column(h, u, v, T0, S0, dSV_dT_1d, dSV_dS_1d, TKE_forcing, &
-                       B_flux, absf, u_star, u_star_mean, dt, MLD_io, Kd, mixvel, mixlen, &
-                       GV, US, CS, eCD, dt_diag=dt_diag, Waves=Waves, G=G, &
+      call ePBL_column(h, u, v, T0, S0, dSV_dT_1d, dSV_dS_1d, TKE_forcing, B_flux, absf, &
+                       u_star, u_star_mean, dt, MLD_io, Kd, mixvel, mixlen, GV, &
+                       US, CS, eCD, dt_diag=dt_diag, Waves=Waves, G=G, &
                        stochastics=stochastics,i=i, j=j)
 
       ! Copy the diffusivities to a 2-d array.