--- MITgcm/eesupp/src/eedie.F 2003/01/20 03:05:54 1.6.14.1 +++ 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.6.14.1 2003/01/20 03:05:54 dimitri 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_OPTIONS.h" +#include "CPP_EEOPTIONS.h" +#ifdef USE_LIBHPM +# include "f_hpm.h" +#endif CStartOfInterface SUBROUTINE EEDIE @@ -58,6 +61,9 @@ fatalError = .TRUE. ENDIF +#ifdef USE_LIBHPM + CALL F_HPMTERMINATE(myProcId) +#endif #ifdef ALLOW_USE_MPI C-- C-- MPI style multiple-process termination @@ -65,9 +71,9 @@ #ifndef ALWAYS_USE_MPI IF ( usingMPI ) THEN #endif - -#if !defined(COUPLED_UCLA) || defined(COUPLED_DEBUG) - +#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. @@ -77,9 +83,7 @@ & mpiRC CALL PRINT_ERROR( msgBuf, 1 ) ENDIF - -#endif COUPLED_UCLA - +C #ifndef ALWAYS_USE_MPI ENDIF #endif