--- MITgcm/eesupp/src/eedie.F 2003/01/20 03:05:54 1.6.14.1 +++ MITgcm/eesupp/src/eedie.F 2003/12/15 02:02:39 1.7 @@ -1,7 +1,7 @@ -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.7 2003/12/15 02:02:39 jmc Exp $ C $Name: $ -#include "CPP_OPTIONS.h" +#include "CPP_EEOPTIONS.h" CStartOfInterface SUBROUTINE EEDIE @@ -65,9 +65,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 +77,7 @@ & mpiRC CALL PRINT_ERROR( msgBuf, 1 ) ENDIF - -#endif COUPLED_UCLA - +C #ifndef ALWAYS_USE_MPI ENDIF #endif