--- MITgcm/pkg/mom_common/mom_v_sidedrag.F	2004/11/02 23:57:29	1.4
+++ MITgcm/pkg/mom_common/mom_v_sidedrag.F	2005/09/26 15:27:11	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_common/mom_v_sidedrag.F,v 1.4 2004/11/02 23:57:29 dimitri Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_common/mom_v_sidedrag.F,v 1.5 2005/09/26 15:27:11 baylor Exp $
 C $Name:  $
 
 #include "MOM_COMMON_OPTIONS.h"
@@ -10,6 +10,8 @@
       SUBROUTINE MOM_V_SIDEDRAG(
      I        bi,bj,k,
      I        vFld, del2v, hFacZ,
+     I        viscAh_Z,viscA4_Z,
+     I        harmonic,biharmonic,useVariableViscosity,
      O        vDragTerms,
      I        myThid)
 
@@ -37,6 +39,9 @@
       _RL vFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RL del2v(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RS hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscAh_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL viscA4_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      LOGICAL harmonic,biharmonic,useVariableViscosity
       INTEGER myThid
 
 C !OUTPUT PARAMETERS: ==================================================
@@ -49,7 +54,6 @@
 C  hFacZClosedW         :: fractional open water to west
       INTEGER I,J
       _RS hFacZClosedE,hFacZClosedW
-      _RL Ahtmp,A4tmp
 CEOP
 
 C     - Laplacian  and bi-harmonic terms
@@ -57,32 +61,38 @@
        DO i=1-Olx,sNx+Olx-1
         hFacZClosedW = _hFacS(i,j,k,bi,bj) - hFacZ(i,j)
         hFacZClosedE = _hFacS(i,j,k,bi,bj) - hFacZ(i+1,j)
-        Ahtmp=min(viscAh+viscAhGrid*rAs(i,j,bi,bj)/deltaTmom,
-     &            viscAhMax)
-        A4tmp=min(viscA4+viscA4Grid*(rAs(i,j,bi,bj)**2)/deltaTmom,
-     &            viscA4Max)
-        IF (viscA4GridMax.GT.0.) THEN
-           A4tmp=min(A4tmp,viscA4GridMax*(rAw(i,j,bi,bj)**2)/deltaTmom)
-        ENDIF
-        A4tmp=max(A4tmp,viscA4GridMin*(rAw(i,j,bi,bj)**2)/deltaTmom)
         vDragTerms(i,j) =
      &   -_recip_hFacS(i,j,k,bi,bj)
      &   *recip_drF(k)*recip_rAs(i,j,bi,bj)
-     &   *( hFacZClosedW*_dyU( i ,j,bi,bj)
-     &      *_recip_dxV( i ,j,bi,bj)
-     &     +hFacZClosedE*_dyU(i+1,j,bi,bj)
-     &      *_recip_dxV(i+1,j,bi,bj) )
-     &   *drF(k)*2.*(
-     &                Ahtmp*vFld(i,j)*cosFacV(J,bi,bj)
-     &               -A4tmp*del2v(i,j)*cosFacV(J,bi,bj)
+     &   *( hFacZClosedW*_dyU( i ,j,bi,bj)*_recip_dxV( i ,j,bi,bj)
+#ifdef ISOTROPIC_COS_SCALING
+     &         *(viscAh_Z(i  ,j)*vFld(i,j)*cosFacV(J,bi,bj)
 #ifdef COSINEMETH_III
-     &               -viscA4*del2v(i,j)*sqcosFacV(J,bi,bj)
+     &           -viscA4_Z(i  ,j)*del2v(i,j)*sqcosFacV(J,bi,bj))
+#else 
+     &           -viscA4_Z(i  ,j)*del2v(i,j)*cosFacV(J,bi,bj))
+#endif
+#else
+     &         *(viscAh_Z(i  ,j)*vFld(i,j)
+     &           -viscA4_Z(i  ,j)*del2v(i,j))
+#endif
+     &     +hFacZClosedE*_dyU(i+1,j,bi,bj)*_recip_dxV(i+1,j,bi,bj) 
+#ifdef ISOTROPIC_COS_SCALING
+     &         *(viscAh_Z(i+1,j)*vFld(i,j)*cosFacV(J,bi,bj)
+#ifdef COSINEMETH_III
+     &           -viscA4_Z(i+1,j)*del2v(i,j)*sqcosFacV(J,bi,bj))
 #else
-     &               -viscA4*del2v(i,j)*cosFacV(J,bi,bj)
+     &           -viscA4_Z(i+1,j)*del2v(i,j)*cosFacV(J,bi,bj))
+#endif
+#else
+     &         *(viscAh_Z(i+1,j)*vFld(i,j)
+     &           -viscA4_Z(i+1,j)*del2v(i,j))
 #endif
      &              )
+     &   *drF(k)*2.
        ENDDO
       ENDDO
 
       RETURN
       END
+