Ignore:
Timestamp:
2019-06-13T18:20:13+02:00 (18 months ago)
Author:
dancopsey
Message:

Merged in changes from dev_merge_2017_GC_couple_pkg branch except for zotx1 and zoty1 changes in sbccpl.F90.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/LBC/lib_mpp.F90

    r10888 r11105  
    896896 
    897897   SUBROUTINE mppstop( ldfinal, ld_force_abort )  
     898    
     899   USE mod_oasis      ! coupling routines 
     900 
    898901      !!---------------------------------------------------------------------- 
    899902      !!                  ***  routine mppstop  *** 
     
    912915      IF( PRESENT(ld_force_abort) ) ll_force_abort = ld_force_abort 
    913916      ! 
     917       
     918#if defined key_oasis3 
     919      ! If we're trying to shut down cleanly then we need to consider the fact 
     920      ! that this could be part of an MPMD configuration - we don't want to 
     921      ! leave other components deadlocked. 
     922 
     923      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort") 
     924 
     925 
     926#else 
    914927      IF(ll_force_abort) THEN 
    915928         CALL mpi_abort( MPI_COMM_WORLD ) 
     
    920933      IF( .NOT. llfinal ) STOP 123 
    921934      ! 
     935#endif 
    922936   END SUBROUTINE mppstop 
    923937 
     
    20212035         ENDIF 
    20222036         CALL FLUSH( kout )  
    2023          STOP 'ctl_opn bad opening' 
     2037         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening') 
    20242038      ENDIF 
    20252039      ! 
Note: See TracChangeset for help on using the changeset viewer.