--- MITgcm/eesupp/src/eedie.F	1998/10/28 03:11:34	1.3
+++ MITgcm/eesupp/src/eedie.F	2005/12/22 00:56:49	1.8
@@ -1,6 +1,10 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/eedie.F,v 1.3 1998/10/28 03:11:34 cnh Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/eedie.F,v 1.8 2005/12/22 00:56:49 ce107 Exp $
+C $Name:  $
 
 #include "CPP_EEOPTIONS.h"
+#ifdef USE_LIBHPM
+# include "f_hpm.h"
+#endif
 
 CStartOfInterface
       SUBROUTINE EEDIE
@@ -13,6 +17,7 @@
 C     | directives set so that no multi-processing is initialised|
 C     | This is OK and should work fine.                         |
 C     \==========================================================/
+      IMPLICIT NONE
 
 C     == Global variables ==
 #include "SIZE.h"
@@ -45,17 +50,20 @@
        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,*) 
+       WRITE(*,*) msgBuf
+       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
@@ -63,11 +71,14 @@
 #ifndef ALWAYS_USE_MPI
       IF ( usingMPI ) THEN
 #endif
+#ifdef COMPONENT_MODULE
+       IF ( useCoupler) CALL MPI_BARRIER( MPI_COMM_WORLD, mpiRC )
+#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 )