Fixed logic, made ifs one-liners.

NOAA-GFDL · Aug 21, 2018 · e3ea419 · e3ea419
1 parent 9252394
commit e3ea419
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/parameterizations/vertical/MOM_vert_friction.F90 b/src/parameterizations/vertical/MOM_vert_friction.F90
@@ -219,13 +219,10 @@ subroutine vertvisc(u, v, h, forces, visc, dt, OBC, ADp, CDp, G, GV, CS, &
   !Check if Stokes mixing allowed if requested (present and associated)
   DoStokesMixing=.false.
   if (CS%StokesMixing) then
-    if (present(Waves)) then
-      DoStokesMixing = associated(Waves)
-      if (.not. DoStokesMixing) then
-        call MOM_error(FATAL,"Stokes Mixing called without allocated"//&
-                       "Waves Control Structure")
-      endif
-    endif
+    if (present(Waves)) DoStokesMixing = associated(Waves)
+    if (.not. DoStokesMixing) &
+      call MOM_error(FATAL,"Stokes Mixing called without allocated"//&
+                     "Waves Control Structure")
   endif
 
   do k=1,nz ; do i=Isq,Ieq ; Ray(i,k) = 0.0 ; enddo ; enddo