--- MITgcm/eesupp/src/global_sum.F	1999/05/18 17:35:23	1.6
+++ MITgcm/eesupp/src/global_sum.F	2001/01/30 20:49:49	1.7
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/global_sum.F,v 1.6 1999/05/18 17:35:23 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/global_sum.F,v 1.7 2001/01/30 20:49:49 heimbach Exp $
 
 C--   File global_sum.F: Routines that perform global sum on an array
 C                        of thread values.
@@ -151,6 +151,84 @@
      &                   MPI_COMM_WORLD,mpiRC)
 #ifndef ALWAYS_USE_MPI
        ENDIF
+#endif
+#endif /*  ALLOW_USE_MPI */
+C--     Write solution to place where all threads can see it
+        phi(1,1) = sumPhi
+      _END_MASTER( myThid )
+
+C--   Do not leave until we are sure that the sum is done
+      _BARRIER
+
+C--   set result for every process
+      sumPhi = phi(1,1)
+
+      RETURN
+      END
+CStartOfInterface
+      SUBROUTINE GLOBAL_SUM_INT( 
+     U                       sumPhi,
+     I                       myThid )
+C     /==========================================================\
+C     | SUBROUTINE GLOBAL_SUM_INT                                |
+C     | o Handle sum for integer data.                           |
+C     |==========================================================|
+C     | Perform sum an array of one value per thread and then    |
+C     | sum result of all the processes.                         |
+C     | Notes                                                    |
+C     | =====                                                    |
+C     | Within a process only one thread does the sum, each      |
+C     | thread is assumed to have already summed its local data. |
+C     | The same thread also does the inter-process sum for      |
+C     | example with MPI and then writes the result into a shared|
+C     | location. All threads wait until the sum is avaiailable. |
+C     \==========================================================/
+      IMPLICIT NONE
+
+C     === Global data ===
+#include "SIZE.h"
+#include "EEPARAMS.h"
+#include "EESUPPORT.h"
+
+C     === Routine arguments ===
+C     sumPhi - Result of sum.
+C     myThid - My thread id.
+      INTEGER sumPhi
+      INTEGER myThid
+CEndOfInterface
+
+C     === Local variables ===
+C     phi    - Array to be summed.
+C     I      - Loop counters
+C     mpiRC  - MPI return code
+      INTEGER phi(lShare8,MAX_NO_THREADS)
+      INTEGER I
+      INTEGER  tmp
+#ifdef   ALLOW_USE_MPI
+      INTEGER mpiRC
+#endif   /* ALLOW_USE_MPI */
+
+C--   write local sum into array
+      phi(1,myThid) = sumPhi
+
+C--   Can not start until everyone is ready
+      _BARRIER
+
+C--   Sum within the process first
+      _BEGIN_MASTER( myThid )
+       tmp = 0. _d 0
+       DO I=1,nThreads
+        tmp = tmp + phi(1,I)
+       ENDDO
+       sumPhi = tmp
+#ifdef  ALLOW_USE_MPI
+#ifndef ALWAYS_USE_MPI
+       IF ( usingMPI ) THEN
+#endif
+        CALL MPI_Allreduce(tmp,sumPhi,1,MPI_INTEGER,MPI_SUM,
+     &                   MPI_COMM_WORLD,mpiRC)
+#ifndef ALWAYS_USE_MPI
+       ENDIF
 #endif
 #endif /*  ALLOW_USE_MPI */
 C--     Write solution to place where all threads can see it