resolve conflict

NOAA-GFDL · Apr 19, 2018 · b280bfd · b280bfd
2 parents 0e4dce5 + 01578c5
commit b280bfd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/parameterizations/vertical/MOM_tidal_mixing.F90 b/src/parameterizations/vertical/MOM_tidal_mixing.F90
@@ -245,7 +245,7 @@ logical function tidal_mixing_init(Time, G, GV, param_file, diag, diag_to_Z_CSp,
                  "drive diapycnal mixing, along the lines of St. Laurent \n"//&
                  "et al. (2002) and Simmons et al. (2004).", default=CS%use_cvmix_tidal)
 
-  ! check if tidal mixing is active
+  ! return if tidal mixing is inactive
   tidal_mixing_init = CS%int_tide_dissipation
   if (.not. tidal_mixing_init) return