Changeset 7985


Ignore:
Timestamp:
2017-04-28T10:03:20+02:00 (3 years ago)
Author:
frrh
Message:

Met Office GMED ticket 322 refers.
Apply updates the Met Office GC3 coupled package branch in order to
accommodate developments under GMED ticket 320 which insert long
standing missing revisions of the nemo_v3_6_STABLE branch
to the Met Office GO6 package branch.

These changes are not dependent on a particular revision of the GO6
package branch and may be used with or without upgrading that branch.

Location:
branches/UKMO/dev_r5518_GC3_couple_pkg/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GC3_couple_pkg/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r6576 r7985  
    6262   USE lbcnfd         ! north fold treatment 
    6363   USE in_out_manager ! I/O manager 
    64    USE mod_oasis      ! coupling routines 
    6564 
    6665   IMPLICIT NONE 
     
    20082007   SUBROUTINE mppstop 
    20092008    
     2009   USE mod_oasis      ! coupling routines 
    20102010 
    20112011      !!---------------------------------------------------------------------- 
  • branches/UKMO/dev_r5518_GC3_couple_pkg/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

    r6576 r7985  
    7272   !!---------------------------------------------------------------------- 
    7373   USE par_oce        ! ocean parameters 
    74    USE lib_mpp 
    7574 
    7675   IMPLICIT NONE 
     
    454453   SUBROUTINE wrk_allocbase( kidim , kjdim , kkdim , kldim , kisrt , kjsrt , kksrt , klsrt ,   & 
    455454      &                      kwrk1d, kwrk2d, kwrk3d, kwrk4d, pwrk1d, pwrk2d, pwrk3d, pwrk4d    ) 
     455   USE in_out_manager, ONLY: numout 
    456456      INTEGER                              , INTENT(in   )           :: kidim, kjdim, kkdim, kldim 
    457457      INTEGER                              , INTENT(in   )           :: kisrt, kjsrt, kksrt, klsrt 
     
    484484         &      .AND. SUM( tree(ii)%ishape ) /= 0 ) 
    485485         ii = ii + 1 
    486          IF (ii > jparray) CALL ctl_stop('STOP', 'NEMO aborted wrk_allocbase') 
     486         IF (ii > jparray) THEN 
     487            WRITE(numout,*) "E R R O R: NEMO aborted wrk_allocbase" 
     488            FLUSH(numout) 
     489            STOP 'Increase the value of jparray' 
    487490                           ! increase the value of jparray (should not be needed as already very big!) 
     491         END IF 
    488492      END DO 
    489493       
Note: See TracChangeset for help on using the changeset viewer.