--- MITgcm/pkg/exch2/exch2_uv_dgrid_3d_rx.template	2009/05/12 19:44:58	1.2
+++ MITgcm/pkg/exch2/exch2_uv_dgrid_3d_rx.template	2009/06/28 00:57:51	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_uv_dgrid_3d_rx.template,v 1.2 2009/05/12 19:44:58 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_uv_dgrid_3d_rx.template,v 1.3 2009/06/28 00:57:51 jmc Exp $
 C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
@@ -36,7 +36,6 @@
 
 #include "SIZE.h"
 #include "EEPARAMS.h"
-c#include "EESUPPORT.h"
 #include "W2_EXCH2_SIZE.h"
 #include "W2_EXCH2_TOPOLOGY.h"
 
@@ -69,9 +68,6 @@
       negOne = 1.
       IF (withSigns) negOne = -1.
 
-      IF ( useCubedSphereExchange ) THEN
-C---  using CubedSphereExchange:
-
 C--   First call the exchanges for the two components, ignoring the Sign
 C     note the order: vPhi,uPhi on D-grid are co-located with (u,v)_Cgrid
 
@@ -99,6 +95,9 @@
      I                     .FALSE., myNz, myThid )
 #endif
 
+      IF ( useCubedSphereExchange ) THEN
+C---  using CubedSphereExchange:
+
 C--   Then we may need to switch the signs depending on which cube face
 C     we are located.
 
@@ -108,7 +107,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:
@@ -201,20 +200,6 @@
         ENDDO
        ENDDO
 
-      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