--- MITgcm/pkg/seaice/seaice_calc_strainrates.F	2007/04/20 18:29:58	1.1
+++ MITgcm/pkg/seaice/seaice_calc_strainrates.F	2007/06/19 12:09:36	1.6
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_calc_strainrates.F,v 1.1 2007/04/20 18:29:58 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_calc_strainrates.F,v 1.6 2007/06/19 12:09:36 mlosch Exp $
 C $Name:  $
 
 #include "SEAICE_OPTIONS.h"
@@ -44,22 +44,30 @@
 C     === Local variables ===
 C     i,j,bi,bj - Loop counters
       INTEGER i, j, bi, bj
+C  hFacU, hFacV - determine the no-slip boundary condition
+      INTEGER k
+      _RS hFacU, hFacV
 
+      k = 1
 C
       DO bj=myByLo(myThid),myByHi(myThid)
        DO bi=myBxLo(myThid),myBxHi(myThid)
-        DO j=1-Oly+1,sNy+Oly-1
-         DO i=1-Olx+1,sNx+Olx-1
-C NOW EVALUATE STRAIN RATES
-          e11(I,J,bi,bj)= _recip_dxF(I,J,bi,bj) *
+        DO j=1-Oly,sNy+Oly-1
+         DO i=1-Olx,sNx+Olx-1
+C     evaluate strain rates
+          e11(I,J,bi,bj) = _recip_dxF(I,J,bi,bj) *
      &         (uFld(I+1,J,bi,bj)-uFld(I,J,bi,bj))
      &         -HALF*
      &         (vFld(I,J,bi,bj)+vFld(I,J+1,bi,bj))
      &         * _tanPhiAtU(I,J,bi,bj)*recip_rSphere
-          e22(I,J,bi,bj)= _recip_dyF(I,J,bi,bj) *
+          e22(I,J,bi,bj) = _recip_dyF(I,J,bi,bj) *
      &         (vFld(I,J+1,bi,bj)-vFld(I,J,bi,bj))
 C     one metric term is missing
-          e12(I,J,bi,bj)=HALF*(
+         ENDDO
+        ENDDO
+        DO j=1-Oly+1,sNy+Oly
+         DO i=1-Olx+1,sNx+Olx
+          e12(I,J,bi,bj) = HALF*(
      &         (uFld(I  ,J  ,bi,bj) * _dxC(I  ,J  ,bi,bj)
      &         -uFld(I  ,J-1,bi,bj) * _dxC(I  ,J-1,bi,bj)
      &         +vFld(I  ,J  ,bi,bj) * _dyC(I  ,J  ,bi,bj)
@@ -70,20 +78,33 @@
      &         * ( _tanPhiAtU(I,J,bi,bj) + _tanPhiAtU(I,J-1,bi,bj) )
      &         *recip_rSphere
      &         )
+     &         *maskC(I  ,J  ,k,bi,bj)*maskC(I-1,J  ,k,bi,bj)
+     &         *maskC(I  ,J-1,k,bi,bj)*maskC(I-1,J-1,k,bi,bj)
 C     one metric term is missing
-CML          e12(I,J,bi,bj)=HALF*(
-CML     &         (uFld(I,J+1,bi,bj)+uFld(I+1,J+1,bi,bj)
-CML     &         -uFld(I,J-1,bi,bj)-uFld(I+1,J-1,bi,bj))
-CML     &         * 1. _d 0 / (dyC(I,J,bi,bj) + dyC(I,J-1,bi,bj))
-CML     &         +
-CML     &         (vFld(I+1,J+1,bi,bj)+vFld(I+1,J,bi,bj)
-CML     &         -vFld(I-1,J+1,bi,bj)-vFld(I-1,J,bi,bj))
-CML     &         * 1. _d 0 / (dxC(I,J,bi,bj) + dxC(I-1,J,bi,bj))
-CML     &         +HALF*
-CML     &         (uFld(I,  J,  bi,bj)+uFld(I+1,J,  bi,bj))
-CML     &         * _tanPhiAtU(I,J,bi,bj)*recip_rSphere)
          ENDDO
         ENDDO
+        IF ( SEAICE_no_slip ) THEN
+C     no slip boundary conditions apply only to e12
+         DO j=1-Oly+1,sNy+Oly
+          DO i=1-Olx+1,sNx+Olx
+           hFacU = _maskW(i,j,k,bi,bj) - _maskW(i,j-1,k,bi,bj)
+           hFacV = _maskS(i,j,k,bi,bj) - _maskS(i-1,j,k,bi,bj)
+
+           e12(I,J,bi,bj) = e12(I,J,bi,bj)
+     &          + recip_rAz(i,j,bi,bj) * 
+     &          ( hFacU * ( _dxC(i,j  ,bi,bj)*uFld(i,j  ,bi,bj)
+     &                    + _dxC(i,j-1,bi,bj)*uFld(i,j-1,bi,bj) ) 
+     &          + hFacV * ( _dyC(i  ,j,bi,bj)*vFld(i  ,j,bi,bj)
+     &                    + _dyC(i-1,j,bi,bj)*vFld(i-1,j,bi,bj) ) )
+     &         - hFacU 
+     &         * 0.25 _d 0 * (uFld(I,J,bi,bj)+uFld(I  ,J-1,bi,bj))
+     &         * ( _tanPhiAtU(I,J,bi,bj) + _tanPhiAtU(I,J-1,bi,bj) )
+     &         *recip_rSphere
+C     one metric term is missing
+          ENDDO
+         ENDDO
+
+        ENDIF
        ENDDO
       ENDDO
 #endif /* SEAICE_ALLOW_DYNAMICS */