--- MITgcm/verification/hs94.128x64x5/code/external_forcing.F	2001/02/04 14:38:52	1.3
+++ MITgcm/verification/hs94.128x64x5/code/external_forcing.F	2001/05/29 14:01:57	1.4
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.128x64x5/code/external_forcing.F,v 1.3 2001/02/04 14:38:52 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.128x64x5/code/external_forcing.F,v 1.4 2001/05/29 14:01:57 adcroft Exp $
 C $Name:  $
 
 #include "CPP_OPTIONS.h"
@@ -48,6 +48,7 @@
 C     _RL velDragHeightFac
       _RL termP,kV,kF
 
+C--   Forcing term(s)
       kF=1./86400.
       DO J=jMin,jMax
        DO I=iMin,iMax
@@ -55,8 +56,7 @@
 C        termP=0.5*( rF(kLev) + min( rF(kLev+1) ,
 C    &           min(H(I,J,bi,bj),H(I,J-1,bi,bj))            ) )
          termP=0.5*( rF(kLev) + rF(kLev+1) )
-C        termP=rC(kLev)
-         kV=kF*MAX(0., (termP*recip_H(I,J,bi,bj)-0.7)/(1.-0.7) )
+         kV=kF*MAX(0., (termP*recip_Rcol(I,J,bi,bj)-0.7)/(1.-0.7) )
          gU(i,j,kLev,bi,bj)=gU(i,j,kLev,bi,bj)
      &                      -kV*uVel(i,j,kLev,bi,bj)
         ENDIF
@@ -110,6 +110,7 @@
 C     _RL velDragHeightFac
       _RL termP,kV,kF
 
+C--   Forcing term(s)
       kF=1./86400.
       DO J=jMin,jMax
        DO I=iMin,iMax
@@ -117,8 +118,7 @@
 C        termP=0.5*( rF(kLev) + min( rF(kLev+1) ,
 C    &           min(H(I,J,bi,bj),H(I,J-1,bi,bj))            ) )
          termP=0.5*( rF(kLev) + rF(kLev+1) )
-C        termP=rC(kLev)
-         kV=kF*MAX(0., (termP*recip_H(I,J,bi,bj)-0.7)/(1.-0.7) )
+         kV=kF*MAX(0., (termP*recip_Rcol(I,J,bi,bj)-0.7)/(1.-0.7) )
          gV(i,j,kLev,bi,bj)=gV(i,j,kLev,bi,bj)
      &                      -kV*vVel(i,j,kLev,bi,bj)
         ENDIF
@@ -130,7 +130,6 @@
 CStartOfInterface
       SUBROUTINE EXTERNAL_FORCING_T(
      I           iMin, iMax, jMin, jMax,bi,bj,kLev,
-     I           maskC,
      I           myCurrentTime,myThid)
 C     /==========================================================\
 C     | S/R EXTERNAL_FORCING_T                                   |
@@ -155,7 +154,6 @@
 C     jMin
 C     jMax
 C     kLev
-      _RS maskC (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       INTEGER iMin, iMax, jMin, jMax, kLev, bi, bj
       _RL myCurrentTime
       INTEGER myThid
@@ -166,6 +164,7 @@
       INTEGER I, J
       _RL thetaLim,kT,ka,ks,term1,term2,thetaEq,termP,rSurf
 
+C--   Forcing term(s)
       rSurf=1.E5
       ka=1./(40.*86400.)
       ks=1./(4. *86400.)
@@ -173,7 +172,6 @@
        term1=60.*(sin(yC(1,J,bi,bj)*deg2rad)**2)
 C      termP=0.5*( rF(kLev) + min( rF(kLev+1) , H(I,J,bi,bj) ) )
        termP=0.5*( rF(kLev) + rF(kLev+1) )
-C      termP=rC(kLev)
        term2=10.*log(termP/rSurf)
      &          *(cos(yC(1,J,bi,bj)*deg2rad)**2)
        thetaLim = 200. / ((termP/rSurf)**(2./7.))
@@ -181,11 +179,11 @@
        thetaEq=MAX(thetaLim,thetaEq)
        DO I=iMin,iMax
         kT=ka+(ks-ka)
-     &    *MAX(0., (termP*recip_H(I,J,bi,bj)-0.7)/(1.-0.7) )
+     &    *MAX(0., (termP*recip_Rcol(I,J,bi,bj)-0.7)/(1.-0.7) )
      &    *COS((yC(1,J,bi,bj)*deg2rad))**4
          gT(i,j,kLev,bi,bj)=gT(i,j,kLev,bi,bj)
      &        - kT*( theta(I,J,kLev,bi,bj)-thetaEq )
-     &            *maskC(i,j)
+     &            *maskC(i,j,kLev,bi,bj)
        ENDDO
       ENDDO
 
@@ -194,7 +192,6 @@
 CStartOfInterface
       SUBROUTINE EXTERNAL_FORCING_S(
      I           iMin, iMax, jMin, jMax,bi,bj,kLev,
-     I           maskC,
      I           myCurrentTime,myThid)
 C     /==========================================================\
 C     | S/R EXTERNAL_FORCING_S                                   |
@@ -219,7 +216,6 @@
 C     jMin
 C     jMax
 C     kLev
-      _RS maskC (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       INTEGER iMin, iMax, jMin, jMax, kLev, bi, bj
       _RL myCurrentTime
       INTEGER myThid
@@ -229,6 +225,7 @@
 C     Loop counters
       INTEGER I, J
 
+C--   Forcing term(s)
 
       RETURN
       END