Changeset 10763 for NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

Timestamp:

2019-03-15T13:10:04+01:00 (5 years ago)

Author:

jcastill

Message:

Remove svn keywords properly

File:

• NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (4 diffs)

NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -173 +173 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: lib_mpp.F90 7753 2017-03-03 11:46:59Z mocavero $
+   !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -2406 +2406 @@
 
    SUBROUTINE mppstop
-      USE mod_oasis      ! coupling routines
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -2416 +2415 @@
       !!----------------------------------------------------------------------
       !
-#if defined key_oasis3 
-      ! If we're trying to shut down cleanly then we need to consider the fact 
-      ! that this could be part of an MPMD configuration - we don't want to 
-      ! leave other components deadlocked. 
-      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort") 
-#else
       CALL mppsync
       CALL mpi_finalize( info )
-#endif
       !
    END SUBROUTINE mppstop
@@ -4341 +4333 @@
          ENDIF
          CALL FLUSH(kout) 
-         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
+         STOP 'ctl_opn bad opening'
       ENDIF
       !