Do full denominator check to avoid possible divide-by-zero. #194

mom-ocean · Jul 17, 2015 · 5f9a61f · 5f9a61f
1 parent 31ebcba
commit 5f9a61f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/parameterizations/vertical/MOM_set_diffusivity.F90 b/src/parameterizations/vertical/MOM_set_diffusivity.F90
@@ -1653,10 +1653,10 @@ subroutine add_LOTW_BBL_diffusivity(h, u, v, tv, fluxes, visc, j, N2_int, G, CS,
 
       ! Diffusivity using law of the wall, limited by rotation, at height z, in m2/s.
       ! This calculation is at the upper interface of the layer
-      if (D_minus_z /= 0.) then
-        Kd_wall = ( ( von_karm * ustar2 ) * ( z * D_minus_z ) )/( ustar_D + absf * ( z * D_minus_z ) )
-      else
+      if ( ustar_D + absf * ( z * D_minus_z ) == 0.) then
         Kd_wall = 0.
+      else
+        Kd_wall = ( ( von_karm * ustar2 ) * ( z * D_minus_z ) )/( ustar_D + absf * ( z * D_minus_z ) )
       endif
 
       ! TKE associated with Kd_wall, in m3 s-2.