--- MITgcm/pkg/exch2/exch2_recv_rx2.template	2008/08/05 18:31:55	1.7
+++ MITgcm/pkg/exch2/exch2_recv_rx2.template	2009/05/20 21:01:45	1.9
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.7 2008/08/05 18:31:55 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx2.template,v 1.9 2009/05/20 21:01:45 jmc Exp $
 C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
@@ -24,6 +24,7 @@
 #include "SIZE.h"
 #include "EEPARAMS.h"
 #include "EESUPPORT.h"
+#include "W2_EXCH2_SIZE.h"
 #include "W2_EXCH2_TOPOLOGY.h"
 
 C     === Routine arguments ===
@@ -131,11 +132,11 @@
        nb = thisI
        mb = nN
        ir = 2
-       theTag1 =  (tt-1)*MAX_NEIGHBOURS*2 + oN-1
-       theTag2 =  (tt-1)*MAX_NEIGHBOURS*2 + MAX_NEIGHBOURS + oN-1
+       theTag1 =  (tt-1)*W2_maxNeighbours*2 + oN-1
+       theTag2 =  (tt-1)*W2_maxNeighbours*2 + W2_maxNeighbours + oN-1
        tProc = exch2_tProc(thisTile)-1
        sProc = exch2_tProc(tt)-1
-       theType = MPI_REAL8
+       theType = _MPI_TYPE_RX
        nri1 = (tIhi1-tIlo1+1)/tiStride
        nrj1 = (tJhi1-tJlo1+1)/tjStride
        nrk1 = (tKhi-tKlo+1)/tkStride