Changeset 6545


Ignore:
Timestamp:
2016-05-17T12:35:16+02:00 (6 years ago)
Author:
frrh
Message:

Apply relevant changes by hand from
fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_mct revisions 5569 to 6355 inclusive
since svn merge DOES NOT WORK!

Note the presence in the NEMO code of key_oamct_v3 which, one assumes is for
specific use with OASIS3-MCT version 3… i.e. there are syntax changes in
OASIS calls to be dealt with! We must remember to deal with this when upgrading to
OASIS3-MCT vn3.0 then!

Location:
branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC
Files:
7 edited

Legend:

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

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

    r6542 r6545  
    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_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r6542 r6545  
    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 aborted from dia_wri') 
    551551      ENDIF 
    552552       
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r6544 r6545  
    37853785100   CONTINUE 
    37863786      IF( iost /= 0 ) THEN 
    3787          IF(ldwp) THEN 
    3788             WRITE(kout,*) 
    3789             WRITE(kout,*) ' ===>>>> : bad opening file: ', clfile 
    3790             WRITE(kout,*) ' =======   ===  ' 
    3791             WRITE(kout,*) '           unit   = ', knum 
    3792             WRITE(kout,*) '           status = ', cdstat 
    3793             WRITE(kout,*) '           form   = ', cdform 
    3794             WRITE(kout,*) '           access = ', cdacce 
    3795             WRITE(kout,*) '           iostat = ', iost 
    3796             WRITE(kout,*) '           we stop. verify the file ' 
    3797             WRITE(kout,*) 
    3798          ENDIF 
    3799          STOP 'ctl_opn bad opening' 
     3787         ! If the run is about to fail we ALWAYS want to know 
     3788         ! the full details! This must not be hidden behind 
     3789         ! "IF(ldwp)" or other irrelevant conditional tests. 
     3790         WRITE(kout,*) 
     3791         WRITE(kout,*) ' ===>>>> : bad opening file: ', clfile 
     3792         WRITE(kout,*) ' =======   ===  ' 
     3793         WRITE(kout,*) '           unit   = ', knum 
     3794         WRITE(kout,*) '           status = ', cdstat 
     3795         WRITE(kout,*) '           form   = ', cdform 
     3796         WRITE(kout,*) '           access = ', cdacce 
     3797         WRITE(kout,*) '           iostat = ', iost 
     3798         WRITE(kout,*) '           we stop. verify the file ' 
     3799         WRITE(kout,*) 
     3800         
     3801         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening') 
    38003802      ENDIF 
    38013803 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r6542 r6545  
    196196      ENDIF 
    197197       
    198       CALL oasis_def_partition ( id_part, paral, nerror ) 
     198      CALL oasis_def_partition ( id_part, paral, nerror, jpiglo*jpjglo) 
    199199      ! 
    200200      ! ... Announce send variables.  
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r6543 r6545  
    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_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

    r6542 r6545  
    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       END DO 
     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!)      END DO 
    487488       
    488489      IF( SUM( tree(ii)%ishape ) == 0 ) THEN                    ! create a new branch  
Note: See TracChangeset for help on using the changeset viewer.