--- MITgcm/pkg/mom_fluxform/mom_fluxform.F	2004/05/24 15:15:16	1.17
+++ MITgcm/pkg/mom_fluxform/mom_fluxform.F	2004/05/24 20:03:49	1.18
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.17 2004/05/24 15:15:16 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.18 2004/05/24 20:03:49 adcroft Exp $
 C $Name:  $
 
 CBOI
@@ -122,6 +122,15 @@
       _RL  vFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RL  rTransU(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RL  rTransV(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL KE(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscAhD(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscAhZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscA4D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscA4Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL vort3(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL hDiv(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL strain(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL tension(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
 C     I,J,K - Loop counters
 C     rVelMaskOverride - Factor for imposing special surface boundary conditions
 C                        ( set according to free-surface condition ).
@@ -155,7 +164,6 @@
       INTEGER km1,kp1
       _RL wVelBottomOverride
       LOGICAL bottomDragTerms
-      _RL KE(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
 CEOP
 
       km1=MAX(1,k-1)
@@ -179,6 +187,8 @@
         fMer(i,j) = 0.
         rTransU(i,j) = 0.
         rTransV(i,j) = 0.
+        strain(i,j) = 0.
+        tension(i,j) = 0.
        ENDDO
       ENDDO
 
@@ -255,6 +265,15 @@
 
       CALL MOM_CALC_KE(bi,bj,k,3,uFld,vFld,KE,myThid)
 
+c     IF (viscAstrain.NE.0. .OR. viscAtension.NE.0.) THEN
+         CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,
+     O                         tension,
+     I                         myThid)
+         CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,
+     O                        strain,
+     I                        myThid)
+c     ENDIF
+
 C---  First call (k=1): compute vertical adv. flux fVerU(kUp) & fVerV(kUp)
       IF (momAdvection.AND.k.EQ.1) THEN
 
@@ -289,6 +308,10 @@
      I                       myTime, myIter, myThid)
       ENDIF
 
+c     IF (momViscosity) THEN
+c    &  CALL MOM_CALC_VISCOSITY(bi,bj,k,
+c    I                         uFld,vFld,
+c    O                         viscAhD,viscAhZ,myThid)
 
 C---- Zonal momentum equation starts here