--- MITgcm/pkg/exch2/exch2_send_rx2.template	2008/08/05 18:31:55	1.8
+++ MITgcm/pkg/exch2/exch2_send_rx2.template	2009/05/12 19:44:58	1.9
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_send_rx2.template,v 1.8 2008/08/05 18:31:55 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_send_rx2.template,v 1.9 2009/05/12 19:44:58 jmc Exp $
 C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
@@ -27,6 +27,7 @@
 #include "SIZE.h"
 #include "EEPARAMS.h"
 #include "EESUPPORT.h"
+#include "W2_EXCH2_SIZE.h"
 #include "W2_EXCH2_TOPOLOGY.h"
 
 C     === Routine arguments ===
@@ -338,8 +339,9 @@
       ELSEIF ( commSetting .EQ. 'M' ) THEN
 #ifdef ALLOW_USE_MPI
 C      Setup MPI stuff here
-       theTag1 =  (thisTile-1)*MAX_NEIGHBOURS*2 + nN-1
-       theTag2 =  (thisTile-1)*MAX_NEIGHBOURS*2 + MAX_NEIGHBOURS + nN-1
+       theTag1 =  (thisTile-1)*W2_maxNeighbours*2 + nN-1
+       theTag2 =  (thisTile-1)*W2_maxNeighbours*2
+     &         + W2_maxNeighbours + nN-1
        tProc = exch2_tProc(tt)-1
        sProc = exch2_tProc(thisTile)-1
        theType = MPI_REAL8