--- MITgcm/model/src/dynamics.F	2004/09/17 23:02:00	1.108
+++ MITgcm/model/src/dynamics.F	2005/01/28 01:00:13	1.113
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.108 2004/09/17 23:02:00 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.113 2005/01/28 01:00:13 jmc Exp $
 C $Name:  $
 
 #include "PACKAGES_CONFIG.h"
@@ -108,7 +108,6 @@
 C      |
 C      |-- OBCS_APPLY_UV
 C      |
-C      |-- CALL TIMEAVE_CUMUL_1T
 C      |-- CALL DEBUG_STATS_RL
 
 C     !INPUT/OUTPUT PARAMETERS:
@@ -122,10 +121,10 @@
 
 C     !LOCAL VARIABLES:
 C     == Local variables
-C     fVer[STUV]               o fVer: Vertical flux term - note fVer
-C                                      is "pipelined" in the vertical
-C                                      so we need an fVer for each
-C                                      variable.
+C     fVer[UV]               o fVer: Vertical flux term - note fVer
+C                                    is "pipelined" in the vertical
+C                                    so we need an fVer for each
+C                                    variable.
 C     phiHydC    :: hydrostatic potential anomaly at cell center
 C                   In z coords phiHyd is the hydrostatic potential
 C                      (=pressure/rho0) anomaly
@@ -134,6 +133,8 @@
 C     dPhiHydX,Y :: Gradient (X & Y directions) of hydrostatic potential anom.
 C     phiSurfX,  ::  gradient of Surface potential (Pressure/rho, ocean)
 C     phiSurfY             or geopotential (atmos) in X and Y direction
+C     guDissip   :: dissipation tendency (all explicit terms), u component
+C     gvDissip   :: dissipation tendency (all explicit terms), v component
 C     iMin, iMax     - Ranges and sub-block indices on which calculations
 C     jMin, jMax       are applied.
 C     bi, bj
@@ -148,6 +149,8 @@
       _RL dPhiHydY(1-Olx:sNx+Olx,1-Oly:sNy+Oly)
       _RL phiSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RL phiSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL guDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       _RL KappaRU (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
       _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
 
@@ -159,6 +162,13 @@
 
       LOGICAL  DIFFERENT_MULTIPLE
       EXTERNAL DIFFERENT_MULTIPLE
+
+#ifdef ALLOW_DIAGNOSTICS
+      _RL tmpFld  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+      LOGICAL  DIAGNOSTICS_IS_ON
+      EXTERNAL DIAGNOSTICS_IS_ON
+#endif /* ALLOW_DIAGNOSTICS */
+
  
 C---    The algorithm...
 C
@@ -256,10 +266,7 @@
 #ifdef ALLOW_AUTODIFF_TAMC
 cph(
 c--   need some re-initialisation here to break dependencies
-c--   totphihyd is assumed zero from ini_pressure, i.e.
-c--   avoiding iterate pressure p = integral of (g*rho(p)*dz)
 cph)
-           totPhiHyd(i,j,k,bi,bj) = 0. _d 0
            gu(i,j,k,bi,bj) = 0. _d 0
            gv(i,j,k,bi,bj) = 0. _d 0
 #endif
@@ -278,6 +285,8 @@
           dPhiHydY(i,j)  = 0. _d 0 
           phiSurfX(i,j)  = 0. _d 0
           phiSurfY(i,j)  = 0. _d 0
+          guDissip(i,j)  = 0. _d 0
+          gvDissip(i,j)  = 0. _d 0
          ENDDO
         ENDDO
 
@@ -375,11 +384,13 @@
      I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,
      I         dPhiHydX,dPhiHydY,KappaRU,KappaRV,
      U         fVerU, fVerV,
+     O         guDissip, gvDissip,
      I         myTime, myIter, myThid)
 #endif
            CALL TIMESTEP(
      I         bi,bj,iMin,iMax,jMin,jMax,k,
      I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
+     I         guDissip, gvDissip,
      I         myTime, myIter, myThid)
 
 #ifdef   ALLOW_OBCS
@@ -412,7 +423,7 @@
 #endif    /* ALLOW_AUTODIFF_TAMC */
           CALL IMPLDIFF(
      I         bi, bj, iMin, iMax, jMin, jMax,
-     I         deltaTmom, KappaRU,recip_HFacW,
+     I         0, KappaRU,recip_HFacW,
      U         gU,
      I         myThid )
 #ifdef    ALLOW_AUTODIFF_TAMC
@@ -421,7 +432,7 @@
 #endif    /* ALLOW_AUTODIFF_TAMC */
           CALL IMPLDIFF(
      I         bi, bj, iMin, iMax, jMin, jMax,
-     I         deltaTmom, KappaRV,recip_HFacS,
+     I         0, KappaRV,recip_HFacS,
      U         gV,
      I         myThid )
         ENDIF
@@ -442,7 +453,7 @@
 #endif    /* ALLOW_AUTODIFF_TAMC */
           CALL IMPLDIFF(
      I         bi, bj, iMin, iMax, jMin, jMax,
-     I         deltaTmom, KappaRU,recip_HFacW,
+     I         0, KappaRU,recip_HFacW,
      U         vVelD,
      I         myThid )
 #ifdef    ALLOW_AUTODIFF_TAMC
@@ -450,7 +461,7 @@
 #endif    /* ALLOW_AUTODIFF_TAMC */
           CALL IMPLDIFF(
      I         bi, bj, iMin, iMax, jMin, jMax,
-     I         deltaTmom, KappaRV,recip_HFacS,
+     I         0, KappaRV,recip_HFacS,
      U         uVelD,
      I         myThid )
         ENDIF
@@ -460,6 +471,14 @@
        ENDDO
       ENDDO
 
+#ifdef ALLOW_OBCS
+      IF (useOBCS) THEN
+       CALL OBCS_PRESCRIBE_EXCHANGES(myThid)
+      ENDIF
+#endif
+
+C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
+
 Cml(
 C     In order to compare the variance of phiHydLow of a p/z-coordinate
 C     run with etaH of a z/p-coordinate run the drift of phiHydLow
@@ -468,6 +487,28 @@
 C     &                'phiHydLow', myThid )
 Cml)
 
+#ifdef ALLOW_DIAGNOSTICS
+      IF ( usediagnostics ) THEN
+
+       CALL DIAGNOSTICS_FILL(totPhihyd,'PHIHYD  ',0,Nr,0,1,1,myThid)
+       CALL DIAGNOSTICS_FILL(phiHydLow,'PHIBOT  ',0,1,0,1,1,myThid)
+
+       IF ( DIAGNOSTICS_IS_ON('PHIBOTSQ',myThid) ) THEN
+        DO bj = myByLo(myThid), myByHi(myThid)
+         DO bi = myBxLo(myThid), myBxHi(myThid)
+          DO j = 1,sNy
+           DO i = 1,sNx
+             tmpFld(i,j) = phiHydLow(i,j,bi,bj)*phiHydLow(i,j,bi,bj)
+           ENDDO
+          ENDDO
+          CALL DIAGNOSTICS_FILL(tmpFld,'PHIBOTSQ',0,1,2,bi,bj,myThid)
+         ENDDO
+        ENDDO
+       ENDIF
+
+      ENDIF
+#endif /* ALLOW_DIAGNOSTICS */
+      
 #ifdef ALLOW_DEBUG
       If ( debugLevel .GE. debLevB ) THEN
        CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)