Merge pull request #95 from alperaltuntas/fix_debug_mode

Fixes for debug mode

src/ice_shelf/MOM_ice_shelf.F90

@@ -321,7 +321,7 @@ subroutine shelf_calc_flux(state, fluxes, Time, time_step, CS, forces)
     if (CS%mass_from_file) call update_shelf_mass(G, CS, ISS, Time)
   endif
 
-  if (CS%DEBUG) then
+  if (CS%debug) then
     call hchksum(fluxes%frac_shelf_h, "frac_shelf_h before apply melting", G%HI, haloshift=0)
     call hchksum(state%sst, "sst before apply melting", G%HI, haloshift=0)
     call hchksum(state%sss, "sss before apply melting", G%HI, haloshift=0)
@@ -650,7 +650,7 @@ subroutine shelf_calc_flux(state, fluxes, Time, time_step, CS, forces)
     endif
   endif
 
-  if (CS%DEBUG) call MOM_forcing_chksum("Before add shelf flux", fluxes, G, US, haloshift=0)
+  if (CS%debug) call MOM_forcing_chksum("Before add shelf flux", fluxes, G, haloshift=0)
 
   call add_shelf_flux(G, CS, state, fluxes)
 
@@ -692,7 +692,7 @@ subroutine shelf_calc_flux(state, fluxes, Time, time_step, CS, forces)
 
   call cpu_clock_end(id_clock_shelf)
 
-  if (CS%DEBUG) call MOM_forcing_chksum("End of shelf calc flux", fluxes, G, US, haloshift=0)
+  if (CS%debug) call MOM_forcing_chksum("End of shelf calc flux", fluxes, G, haloshift=0)
 
 end subroutine shelf_calc_flux
 
@@ -1055,8 +1055,8 @@ subroutine add_shelf_flux(G, CS, state, fluxes)
       endif
     enddo ; enddo
 
-    if (CS%DEBUG) then
-      write(mesg,*) 'Mean melt flux [kg m-2 s-1], dt = ', mean_melt_flux, CS%time_step
+    if (CS%debug) then
+      write(mesg,*) 'Mean melt flux (kg/(m^2 s)), dt = ', mean_melt_flux, CS%time_step
       call MOM_mesg(mesg)
       call MOM_forcing_chksum("After constant sea level", fluxes, G, CS%US, haloshift=0)
     endif
@@ -1514,7 +1514,7 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces, fl
     if (G%areaT(i,j) > 0.0) fluxes%frac_shelf_h(i,j) = ISS%area_shelf_h(i,j) / G%areaT(i,j)
   enddo ; enddo ; endif
 
-  if (CS%DEBUG) then
+  if (CS%debug) then
     call hchksum(fluxes%frac_shelf_h, "IS init: frac_shelf_h", G%HI, haloshift=0)
   endif
 

src/ice_shelf/MOM_ice_shelf_dynamics.F90

@@ -928,7 +928,7 @@ subroutine ice_shelf_solve_outer(CS, ISS, G, US, u, v, iters, time)
     call ice_shelf_solve_inner(CS, ISS, G, u, v, TAUDX, TAUDY, H_node, float_cond, &
                                ISS%hmask, conv_flag, iters, time, Phi, Phisub)
 
-    if (CS%DEBUG) then
+    if (CS%debug) then
       call qchksum(u, "u shelf", G%HI, haloshift=2)
       call qchksum(v, "v shelf", G%HI, haloshift=2)
     endif
@@ -3600,7 +3600,7 @@ subroutine ice_shelf_temp(CS, ISS, G, US, time_step, melt_rate, Time)
   call pass_var(CS%t_shelf, G%domain)
   call pass_var(CS%tmask, G%domain)
 
-  if (CS%DEBUG) then
+  if (CS%debug) then
     call hchksum(CS%t_shelf, "temp after front", G%HI, haloshift=3)
   endif
 

src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90

@@ -873,6 +873,7 @@ subroutine VarMix_init(Time, G, GV, US, param_file, diag, CS)
          'Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.', 's-2')
   endif
 
+  oneOrTwo = 1.0
   if (CS%Resoln_scaled_Kh .or. CS%Resoln_scaled_KhTh .or. CS%Resoln_scaled_KhTr) then
     CS%calculate_Rd_dx = .true.
     CS%calculate_res_fns = .true.
@@ -941,8 +942,6 @@ subroutine VarMix_init(Time, G, GV, US, param_file, diag, CS)
                  "is the more appropriate definition.\n", default=.false.)
     if (Gill_equatorial_Ld) then
       oneOrTwo = 2.0
-    else
-      oneOrTwo = 1.0
     endif
 
     do J=js-1,Jeq ; do I=is-1,Ieq