Changeset 5675


Ignore:
Timestamp:
2015-08-10T16:39:02+02:00 (5 years ago)
Author:
dancopsey
Message:

Applied clean shutdown code imported from Met Office internal branch http://fcm2/projects/NEMO/browser/NEMO/branches/dev/frrh/vn3.5_beta_clean_shutdown

Location:
branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90

    r5674 r5675  
    124124 
    125125    CASE DEFAULT 
    126        IF(lwp) WRITE(numout,*) ' E R R O R : bad cd_type in dia_wri_dimg ' 
    127        STOP 'dia_wri_dimg' 
     126       IF(lwp) WRITE(numout,*) ' E R R O R : bad cd_type in dia_wri_dimg ',cd_type 
     127       CALL ctl_stop('STOP', 'NEMO aborted from dia_wri_dimg') 
    128128 
    129129    END SELECT 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r5674 r5675  
    10621062      ENDIF 
    10631063#endif 
     1064 
     1065      IF (cdfile_name == "output.abort") THEN 
     1066         CALL ctl_stop('STOP', 'NEMO abort from dia_wri_state') 
     1067      END IF 
    10641068        
    10651069!     IF( nn_timing == 1 )   CALL timing_stop('dia_wri_state') ! not sure this works for routines not called in first timestep 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

    r5674 r5675  
    112112    IF( inbsel >  jpk ) THEN 
    113113       IF(lwp) WRITE(numout,*)  ' STOP inbsel =',inbsel,' is larger than jpk=',jpk 
    114        STOP 
     114       CALL ctl_stop('STOP', 'NEMO aborted from dia_wri') 
    115115    ENDIF 
    116116 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r5674 r5675  
    526526      IF(lwp) WRITE(numout,*) 'dom_msk_nsa : noslip accurate boundary condition' 
    527527      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   using Schchepetkin and O Brian scheme' 
    528       IF( lk_mpp )   CALL ctl_stop( ' mpp version is not yet implemented' ) 
     528      IF( lk_mpp )   CALL ctl_stop('STOP', ' mpp version is not yet implemented' ) 
    529529 
    530530      ! mask for second order calculation of vorticity 
     
    548548         WRITE(numout,*) ' symetric boundary conditions need special' 
    549549         WRITE(numout,*) ' treatment not implemented. we stop.' 
    550          STOP 
     550         CALL ctl_stop('STOP', 'NEMO abort from dom_msk_nsa') 
    551551      ENDIF 
    552552       
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

    r5674 r5675  
    467467            IF(lwp)WRITE(numout,*) ' ldfguv: kahm= 1 or 2, here =', kahm 
    468468            IF(lwp)WRITE(numout,*) '         We stop' 
    469             STOP 'ldfguv' 
     469            CALL ctl_stop( 'STOP', 'NEMO abort ldfguv') 
    470470         ENDIF 
    471471         !                                             ! =============== 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r5674 r5675  
    20062006 
    20072007   SUBROUTINE mppstop 
     2008    
     2009#if defined key_oasis3 || defined key_oasis3mct 
     2010 
     2011#if defined key_oasis3mct 
     2012   USE mod_oasis 
     2013#endif 
     2014 
     2015#endif 
    20082016      !!---------------------------------------------------------------------- 
    20092017      !!                  ***  routine mppstop  *** 
     
    20152023      !!---------------------------------------------------------------------- 
    20162024      ! 
     2025#if defined key_oasis3 || defined key_oasis3mct 
     2026      ! If we're trying to shut down cleanly then we need to consider the fact 
     2027      ! that this could be part of an MPMD configuration - we don't want to 
     2028      ! leave other components deadlocked. 
     2029 
     2030      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort") 
     2031 
     2032#else 
     2033 
    20172034      CALL mppsync 
    20182035      CALL mpi_finalize( info ) 
    2019       ! 
     2036 
     2037#endif 
    20202038   END SUBROUTINE mppstop 
    20212039 
     
    37843802            WRITE(kout,*) 
    37853803         ENDIF 
    3786          STOP 'ctl_opn bad opening' 
     3804         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening') 
    37873805      ENDIF 
    37883806 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90

    r5674 r5675  
    332332               IF(lwp) WRITE(numout,*) ' ldfght: kaht= 1 or 2, here =', kaht 
    333333               IF(lwp) WRITE(numout,*) '         We stop' 
    334                STOP 'ldfght' 
     334               CALL ctl_stop ('STOP', 'NEMO abort ldfght') 
    335335            ENDIF 
    336336            !                                             ! =============== 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r5674 r5675  
    461461      IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments 
    462462      IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler 
     463       
     464      IF (nstop > 0) THEN 
     465        CALL CTL_STOP('STOP','Critical errors in NEMO initialisation') 
     466      END IF 
     467 
    463468      ! 
    464469   END SUBROUTINE nemo_init 
  • branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

    r5674 r5675  
    7272   !!---------------------------------------------------------------------- 
    7373   USE par_oce        ! ocean parameters 
     74   USE lib_mpp 
    7475 
    7576   IMPLICIT NONE 
     
    483484         &      .AND. SUM( tree(ii)%ishape ) /= 0 ) 
    484485         ii = ii + 1 
    485          IF (ii > jparray) STOP   ! increase the value of jparray (should not be needed as already very big!) 
     486         IF (ii > jparray) CALL ctl_stop('STOP', 'NEMO aborted wrk_allocbase') 
     487                           ! increase the value of jparray (should not be needed as already very big!) 
    486488      END DO 
    487489       
Note: See TracChangeset for help on using the changeset viewer.