--- MITgcm/eesupp/src/eedie.F 2003/01/20 03:05:54 1.6.14.1 +++ MITgcm/eesupp/src/eedie.F 2010/09/25 23:09:54 1.10 @@ -1,26 +1,33 @@ -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.10 2010/09/25 23:09:54 mlosch Exp $ C $Name: $ -#include "CPP_OPTIONS.h" +#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 @@ -28,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. @@ -51,13 +58,17 @@ & 'S/R EEDIE: Only ',nThreadsDone, & ' threads have completed, ',nThreads, & ' are expected for this configuration!' - WRITE(*,*) msgBuf + 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 @@ -65,9 +76,12 @@ #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 +#ifdef ALLOW_OASIS + IF ( useOASIS ) CALL OASIS_FINALIZE +#endif CALL MPI_FINALIZE ( mpiRC ) IF ( mpiRC .NE. MPI_SUCCESS ) THEN eeEndError = .TRUE. @@ -77,9 +91,7 @@ & mpiRC CALL PRINT_ERROR( msgBuf, 1 ) ENDIF - -#endif COUPLED_UCLA - +C #ifndef ALWAYS_USE_MPI ENDIF #endif