Changeset 5679


Ignore:
Timestamp:
2015-08-11T12:07:15+02:00 (5 years ago)
Author:
dancopsey
Message:

Merged in extra clean shutdown stuff so that it stops with an error when NEMO crashes rather than carrying on.

Location:
branches/UKMO/dev_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r5568 r5679  
    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_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

    r5279 r5679  
    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_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r5568 r5679  
    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_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r5568 r5679  
    38003800            WRITE(kout,*) 
    38013801         ENDIF 
    3802          STOP 'ctl_opn bad opening' 
     3802         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening') 
    38033803      ENDIF 
    38043804 
  • branches/UKMO/dev_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r5631 r5679  
    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_r5107_hadgem3_mct/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

    r5568 r5679  
    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.