New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6545 for branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90 – NEMO

Ignore:
Timestamp:
2016-05-17T12:35:16+02:00 (7 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!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.