--- MITgcm/eesupp/src/eedie.F 1998/04/23 20:37:30 1.2 +++ 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.2 1998/04/23 20:37:30 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" @@ -37,23 +42,28 @@ 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!' + 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 @@ -61,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 )