--- MITgcm/pkg/exch2/exch2_uv_cgrid_3d_rx.template	2009/05/12 19:44:58	1.3
+++ MITgcm/pkg/exch2/exch2_uv_cgrid_3d_rx.template	2009/06/28 00:57:51	1.4
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_uv_cgrid_3d_rx.template,v 1.3 2009/05/12 19:44:58 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_uv_cgrid_3d_rx.template,v 1.4 2009/06/28 00:57:51 jmc Exp $
 C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
@@ -35,7 +35,6 @@
 
 #include "SIZE.h"
 #include "EEPARAMS.h"
-c#include "EESUPPORT.h"
 #include "W2_EXCH2_SIZE.h"
 #include "W2_EXCH2_TOPOLOGY.h"
 #ifdef W2_FILL_NULL_REGIONS
@@ -74,9 +73,6 @@
       negOne = 1.
       IF (withSigns) negOne = -1.
 
-      IF ( useCubedSphereExchange ) THEN
-C---  using CubedSphereExchange:
-
 C--   First call the exchanges for the two components
 
        CALL EXCH2_RX1_CUBE( uPhi, 'T ',
@@ -101,6 +97,8 @@
 c      CALL EXCH2_3D_RX( uPhi, myNz, myThid )
 c      CALL EXCH2_3D_RX( vPhi, myNz, myThid )
 
+      IF ( useCubedSphereExchange ) THEN
+
 C--   Then, depending on which tile we are, we may need
 C     1) to switch u and v components and also to switch the signs
 C     2) to shift the index along the face edge.
@@ -116,7 +114,7 @@
 
 C-    Now choose what to do at each edge of the halo based on which face
 C    (we assume that bj is always=1)
-         myTile = W2_myTileList(bi)
+         myTile = W2_myTileList(bi,bj)
          myFace = exch2_myFace(myTile)
 
 C--   Loops on level index:
@@ -405,22 +403,6 @@
         ENDDO
        ENDDO
 
-C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
-
-      ELSE
-C---  not using CubedSphereExchange:
-
-#ifndef AUTODIFF_EXCH2
-       CALL EXCH_RX( uPhi,
-     I            OLw, OLe, OLs, OLn, myNz,
-     I            exchWidthX, exchWidthY,
-     I            FORWARD_SIMULATION, EXCH_UPDATE_CORNERS, myThid )
-       CALL EXCH_RX( vPhi,
-     I            OLw, OLe, OLs, OLn, myNz,
-     I            exchWidthX, exchWidthY,
-     I            FORWARD_SIMULATION, EXCH_UPDATE_CORNERS, myThid )
-#endif
-
 C---  using or not using CubedSphereExchange: end
       ENDIF