Fixing diagnostic mode for vortex force correction term.

- The model's Coriolis/acceleration term was incorrect when the Stokes vortex form correction was in diagnostic mode.  The correct calculations are restored so it can be run in diagnostic mode and reproduce with the model when the setting is turned off entirely.

src/core/MOM_CoriolisAdv.F90

@@ -316,12 +316,19 @@ subroutine CorAdCalc(u, v, h, uh, vh, CAu, CAv, OBC, AD, G, GV, US, CS, Waves)
                         (-Waves%us_x(I,j,k))*G%dxCu(I,j))
         enddo; enddo
       endif
-      do J=Jsq-1,Jeq+1 ; do I=Isq-1,Ieq+1
-        dvdx(I,J) = ((v(i+1,J,k)-Waves%us_y(i+1,J,k))*G%dyCv(i+1,J) - &
-                     (v(i,J,k)-Waves%us_y(i,J,k))*G%dyCv(i,J))
-        dudy(I,J) = ((u(I,j+1,k)-Waves%us_x(I,j+1,k))*G%dxCu(I,j+1) - &
-                     (u(I,j,k)-Waves%us_x(I,j,k))*G%dxCu(I,j))
-      enddo; enddo
+      if (.not. Waves%Passive_Stokes_VF) then
+        do J=Jsq-1,Jeq+1 ; do I=Isq-1,Ieq+1
+          dvdx(I,J) = ((v(i+1,J,k)-Waves%us_y(i+1,J,k))*G%dyCv(i+1,J) - &
+                       (v(i,J,k)-Waves%us_y(i,J,k))*G%dyCv(i,J))
+          dudy(I,J) = ((u(I,j+1,k)-Waves%us_x(I,j+1,k))*G%dxCu(I,j+1) - &
+                       (u(I,j,k)-Waves%us_x(I,j,k))*G%dxCu(I,j))
+        enddo; enddo
+      else
+        do J=Jsq-1,Jeq+1 ; do I=Isq-1,Ieq+1
+          dvdx(I,J) = (v(i+1,J,k)*G%dyCv(i+1,J) - v(i,J,k)*G%dyCv(i,J))
+          dudy(I,J) = (u(I,j+1,k)*G%dxCu(I,j+1) - u(I,j,k)*G%dxCu(I,j))
+        enddo; enddo
+      endif
     else
       do J=Jsq-1,Jeq+1 ; do I=Isq-1,Ieq+1
         dvdx(I,J) = (v(i+1,J,k)*G%dyCv(i+1,J) - v(i,J,k)*G%dyCv(i,J))