--- MITgcm/eesupp/src/eedie.F	2001/02/04 14:38:43	1.5
+++ MITgcm/eesupp/src/eedie.F	2005/12/22 00:56:49	1.8
@@ -1,7 +1,10 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/eesupp/src/eedie.F,v 1.5 2001/02/04 14:38:43 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
@@ -51,13 +54,16 @@
      & '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
@@ -65,6 +71,9 @@
 #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.