--- MITgcm/pkg/exch2/exch2_recv_rx2.template	2005/07/24 01:21:36	1.4
+++ MITgcm/pkg/exch2/exch2_recv_rx2.template	2008/07/29 20:25:23	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.4 2005/07/24 01:21:36 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.5 2008/07/29 20:25:23 jmc Exp $
 C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
@@ -57,14 +57,14 @@
 C     myTiles              :: List of nt tiles that this process owns.
 C     commSetting          :: Mode of communication used to exchnage with this neighbor
 C     myThid               :: Thread number of this instance of EXCH2_RECV_RX1
-C  
+C
       INTEGER tILo, tIHi, tiStride
       INTEGER tJLo, tJHi, tjStride
       INTEGER tKLo, tKHi, tkStride
       INTEGER i1Lo, i1Hi, j1Lo, j1Hi, k1Lo, k1Hi
       INTEGER i2Lo, i2Hi, j2Lo, j2Hi, k2Lo, k2Hi
       INTEGER thisTile, nN, thisI
-      INTEGER e2BufrRecSize 
+      INTEGER e2BufrRecSize
       INTEGER mnb, nt
       _RX     e2Bufr1_RX( e2BufrRecSize, mnb, nt, 2 )
       _RX     e2Bufr2_RX( e2BufrRecSize, mnb, nt, 2 )
@@ -93,7 +93,7 @@
 C     mb, nb :: Selects e2Bufr, msgHandle record to use
 C     ir     ::
       INTEGER mb, nb, ir
-C     oN     :: Opposing send record number 
+C     oN     :: Opposing send record number
       INTEGER oN
 C     Loop counters
       INTEGER I
@@ -114,24 +114,24 @@
 #endif
 
       tt=exch2_neighbourId(nN, thisTile )
-      oN=exch2_opposingSend_record(nN, thisTile )
+      oN=exch2_opposingSend(nN, thisTile )
       itl1reduce=0
       jtl1reduce=0
       itl2reduce=0
       jtl2reduce=0
-      IF ( exch2_pi(1,oN,tt) .EQ. -1 ) itl1reduce=1
-      IF ( exch2_pj(1,oN,tt) .EQ. -1 ) itl1reduce=1
-      IF ( exch2_pi(2,oN,tt) .EQ. -1 ) jtl2reduce=1
-      IF ( exch2_pj(2,oN,tt) .EQ. -1 ) jtl2reduce=1
+      IF ( exch2_pij(1,oN,tt) .EQ. -1 ) itl1reduce=1
+      IF ( exch2_pij(3,oN,tt) .EQ. -1 ) itl1reduce=1
+      IF ( exch2_pij(2,oN,tt) .EQ. -1 ) jtl2reduce=1
+      IF ( exch2_pij(4,oN,tt) .EQ. -1 ) jtl2reduce=1
 
-C     Handle receive end data transport according to communication mechanism between 
+C     Handle receive end data transport according to communication mechanism between
 C     source and target tile
       IF     ( commSetting .EQ. 'P' ) THEN
 C      1 Need to check and spin on data ready assertion for multithreaded mode, for now do nothing i.e.
 C        assume only one thread per process.
 
 C      2 Need to set e2Bufr to use put buffer from opposing send.
-       oN = exch2_opposingSend_record(nN, thisTile )
+       oN = exch2_opposingSend(nN, thisTile )
        mb = oN
        ir = 1
        DO I=1,nt
@@ -226,7 +226,7 @@
         ENDDO
        ENDDO
       ENDDO
- 
+
       RETURN
       END