--- MITgcm/eesupp/src/eedie.F	1998/04/22 19:15:30	1.1.1.1
+++ MITgcm/eesupp/src/eedie.F	2010/09/25 23:09:54	1.10
@@ -1,24 +1,33 @@
-C $Id: eedie.F,v 1.1.1.1 1998/04/22 19:15:30 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/eedie.F,v 1.10 2010/09/25 23:09:54 mlosch Exp $
+C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
+#ifdef USE_LIBHPM
+# include "f_hpm.h"
+#endif
 
-CStartOfInterface
+CBOP
       SUBROUTINE EEDIE
-C     /==========================================================\
+C     *==========================================================*
 C     | SUBROUTINE EEDIE                                         |
 C     | o Close execution "environment", particularly perform    |
 C     |   steps to terminate parallel processing.                |
-C     |==========================================================|
+C     *==========================================================*
 C     | Note: This routine can also be compiled with CPP         |
 C     | directives set so that no multi-processing is initialised|
 C     | This is OK and should work fine.                         |
-C     \==========================================================/
+C     *==========================================================*
+      IMPLICIT NONE
 
 C     == Global variables ==
 #include "SIZE.h"
 #include "EEPARAMS.h"
 #include "EESUPPORT.h"
-CEndOfInterface
+CEOP
+
+C     !FUNCTIONS
+      INTEGER  ILNBLNK
+      EXTERNAL ILNBLNK
 
 C     == Local variables ==
 C     msgBuf       - I/O Buffer
@@ -26,7 +35,7 @@
 C     I            - Loop counter.
       CHARACTER*(MAX_LEN_MBUF) msgBuf
       INTEGER nThreadsDone
-      INTEGER I
+      INTEGER I, L
 #ifdef ALLOW_USE_MPI
 C     mpiRC            - Error code reporting variable used
 C                        with MPI.
@@ -37,23 +46,29 @@
 C     No thread should reach this loop before all threads have set
 C     threadIsComplete to TRUE. If they do then either there is a bug
 C     in the code or the behaviour of the parallel compiler directives 
-C     are not right for this code. In the latter case different directives
-C     may be available or the compiler itself may have a bug or you may
-C     need a different parallel compiler for main.F
+C     are not right for this code. In the latter case different 
+C     directives may be available or the compiler itself may have a 
+C     bug or you may need a different parallel compiler for main.F
       nThreadsDone = 0
       DO I = 1, nThreads
        IF ( threadIsComplete(I) ) nThreadsDone = nThreadsDone+1
       ENDDO
       IF ( nThreadsDone .LT. nThreads ) THEN
-       WRITE(msgBuf,'(A,I,A,I,A)')
+       WRITE(msgBuf,'(A,I5,A,I5,A)')
      & 'S/R EEDIE: Only ',nThreadsDone,
-     & ' threads have completed, ',nThreads,' are expected for this configuration!'
-       WRITE(0,*) msgBuf
-       WRITE(0,*) 'Possibly you have different values of setenv PARALLEL and nThreads?'
+     & ' threads have completed, ',nThreads,
+     & ' are expected for this configuration!'
+       L = ILNBLNK(msgBuf)
+       WRITE(*,*) msgBuf(1:L)
+       WRITE(*,*) 
+     & 'Possibly you have different setenv PARALLEL and nThreads?'
        eeEndError = .TRUE.
        fatalError = .TRUE.
       ENDIF
 
+#ifdef USE_LIBHPM
+      CALL F_HPMTERMINATE(myProcId)
+#endif
 #ifdef ALLOW_USE_MPI
 C--
 C--   MPI style multiple-process termination
@@ -61,11 +76,17 @@
 #ifndef ALWAYS_USE_MPI
       IF ( usingMPI ) THEN
 #endif
+#ifdef COMPONENT_MODULE
+       IF ( useCoupler) CALL MPI_BARRIER( MPI_COMM_WORLD, mpiRC )
+#endif
+#ifdef ALLOW_OASIS
+       IF ( useOASIS ) CALL OASIS_FINALIZE
+#endif
        CALL MPI_FINALIZE  ( mpiRC )
        IF ( mpiRC .NE. MPI_SUCCESS ) THEN
         eeEndError = .TRUE.
         fatalError = .TRUE.
-        WRITE(msgBuf,'(A,I)')
+        WRITE(msgBuf,'(A,I5)')
      &       'S/R FIN_PROCS: MPI_FINALIZE return code',
      &       mpiRC
         CALL PRINT_ERROR( msgBuf, 1 )