--- MITgcm/model/src/dynamics.F	2006/06/20 20:57:37	1.135
+++ MITgcm/model/src/dynamics.F	2006/07/07 20:10:35	1.136
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.135 2006/06/20 20:57:37 baylor Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.136 2006/07/07 20:10:35 jmc Exp $
 C $Name:  $
 
 #include "PACKAGES_CONFIG.h"
@@ -115,20 +115,20 @@
 C      |
 C      |-- CALC_VISCOSITY
 C      |
-C      |-- CALC_PHI_HYD  
+C      |-- CALC_PHI_HYD
 C      |
-C      |-- MOM_FLUXFORM  
+C      |-- MOM_FLUXFORM
 C      |
-C      |-- MOM_VECINV    
+C      |-- MOM_VECINV
 C      |
-C      |-- TIMESTEP      
+C      |-- TIMESTEP
 C      |
-C      |-- OBCS_APPLY_UV 
+C      |-- OBCS_APPLY_UV
 C      |
-C      |-- MOM_U_IMPLICIT_R      
-C      |-- MOM_V_IMPLICIT_R      
+C      |-- MOM_U_IMPLICIT_R
+C      |-- MOM_V_IMPLICIT_R
 C      |
-C      |-- IMPLDIFF      
+C      |-- IMPLDIFF
 C      |
 C      |-- OBCS_APPLY_UV
 C      |
@@ -193,7 +193,7 @@
       _RL tmpFac
 #endif /* ALLOW_DIAGNOSTICS */
 
- 
+
 C---    The algorithm...
 C
 C       "Correction Step"
@@ -308,10 +308,10 @@
           fVerU  (i,j,2) = 0. _d 0
           fVerV  (i,j,1) = 0. _d 0
           fVerV  (i,j,2) = 0. _d 0
-          phiHydF (i,j)  = 0. _d 0 
-          phiHydC (i,j)  = 0. _d 0 
+          phiHydF (i,j)  = 0. _d 0
+          phiHydC (i,j)  = 0. _d 0
           dPhiHydX(i,j)  = 0. _d 0
-          dPhiHydY(i,j)  = 0. _d 0 
+          dPhiHydY(i,j)  = 0. _d 0
           phiSurfX(i,j)  = 0. _d 0
           phiSurfY(i,j)  = 0. _d 0
           guDissip(i,j)  = 0. _d 0
@@ -349,7 +349,7 @@
      I         bi,bj,iMin,iMax,jMin,jMax,
      I         etaN,
      O         phiSurfX,phiSurfY,
-     I         myThid )                         
+     I         myThid )
         ENDIF
 
 #ifdef ALLOW_AUTODIFF_TAMC
@@ -539,7 +539,7 @@
 C--     Implicit Vertical advection & viscosity
 #if (defined (INCLUDE_IMPLVERTADV_CODE) && defined (ALLOW_MOM_COMMON))
         IF ( momImplVertAdv ) THEN
-          CALL MOM_U_IMPLICIT_R( kappaRU, 
+          CALL MOM_U_IMPLICIT_R( kappaRU,
      I                           bi, bj, myTime, myIter, myThid )
           CALL MOM_V_IMPLICIT_R( kappaRV,
      I                           bi, bj, myTime, myIter, myThid )
@@ -597,38 +597,39 @@
         ENDIF
 #endif    /* ALLOW_CD_CODE */
 C--     End implicit Vertical advection & viscosity
- 
-       ENDDO
-      ENDDO
-
-#ifdef ALLOW_OBCS
-      IF (useOBCS) THEN
-       CALL OBCS_PRESCRIBE_EXCHANGES(myThid)
-      ENDIF
-#endif
 
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
 
 #ifdef ALLOW_NONHYDROSTATIC
 C--   Step forward W field in N-H algorithm
-      IF ( nonHydrostatic ) THEN
+        IF ( nonHydrostatic ) THEN
 #ifdef ALLOW_DEBUG
          IF ( debugLevel .GE. debLevB )
      &     CALL DEBUG_CALL('CALC_GW', myThid )
 #endif
          CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
          CALL CALC_GW(
-     I         KappaRU, KappaRV, 
-     I         myTime, myIter, myThid )
-      ENDIF
-      IF ( nonHydrostatic.OR.implicitIntGravWave ) 
-     &   CALL TIMESTEP_WVEL( myTime, myIter, myThid )
-      IF ( nonHydrostatic )
+     I                 bi,bj, KappaRU, KappaRV,
+     I                 myTime, myIter, myThid )
+        ENDIF
+        IF ( nonHydrostatic.OR.implicitIntGravWave )
+     &   CALL TIMESTEP_WVEL( bi,bj, myTime, myIter, myThid )
+        IF ( nonHydrostatic )
      &   CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)
 #endif
 
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
 
+C-    end of bi,bj loops
+       ENDDO
+      ENDDO
+
+#ifdef ALLOW_OBCS
+      IF (useOBCS) THEN
+       CALL OBCS_PRESCRIBE_EXCHANGES(myThid)
+      ENDIF
+#endif
+
 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
@@ -652,7 +653,7 @@
 
       ENDIF
 #endif /* ALLOW_DIAGNOSTICS */
-      
+
 #ifdef ALLOW_DEBUG
       If ( debugLevel .GE. debLevB ) THEN
        CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)