--- MITgcm/pkg/exch2/exch2_recv_rx2.template	2004/04/05 15:27:06	1.2
+++ MITgcm/pkg/exch2/exch2_recv_rx2.template	2005/07/22 18:21:55	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.2 2004/04/05 15:27:06 edhill Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.3 2005/07/22 18:21:55 jmc Exp $
 C $Name:  $
 
 #include "CPP_OPTIONS.h"
@@ -25,7 +25,6 @@
 #include "W2_EXCH2_TOPOLOGY.h"
 
 #include "EEPARAMS.h"
-      CHARACTER*(MAX_LEN_MBUF) messageBuffer
 C
 C     === Routine arguments ===
 C     tIlo, tIhi, tIstride :: index range in I that will be filled in target "array"
@@ -83,9 +82,9 @@
 C                    :: isl etc... source local
 C                    :: isc etc... source canonical
       INTEGER itl, jtl, ktl
-      INTEGER itc, jtc, ktc
-      INTEGER isc, jsc, ksc
-      INTEGER isl, jsl, ksl
+c     INTEGER itc, jtc, ktc
+c     INTEGER isc, jsc, ksc
+c     INTEGER isl, jsl, ksl
 C     tt         :: Target tile
 C     iBufr1     :: Buffer counter
 C     iBufr2     ::
@@ -97,19 +96,23 @@
 C     oN     :: Opposing send record number 
       INTEGER oN
 C     Loop counters
-      INTEGER I, nri1, nrj1, nrk1
-      INTEGER    nri2, nrj2, nrk2
+      INTEGER I
       INTEGER itl1reduce, jtl1reduce
       INTEGER itl2reduce, jtl2reduce
 
 C     MPI setup
 #include "SIZE.h"
 #include "EESUPPORT.h"
-      INTEGER theTag1, theSize1, theType
-      INTEGER theTag2, theSize2
-      INTEGER sProc, tProc
 #ifdef ALLOW_USE_MPI
+      INTEGER    nri1, nrj1, nrk1
+      INTEGER    nri2, nrj2, nrk2
+      INTEGER theTag1, theTag2, theType
+c     INTEGER theSize1, theSize2
+      INTEGER sProc, tProc
       INTEGER mpiStatus(MPI_STATUS_SIZE), mpiRc
+#ifdef W2_E2_DEBUG_ON
+      CHARACTER*(MAX_LEN_MBUF) messageBuffer
+#endif
 #endif
 
       tt=exch2_neighbourId(nN, thisTile )