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 5034 for branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 – NEMO

Ignore:
Timestamp:
2015-01-15T14:48:42+01:00 (9 years ago)
Author:
andrewryan
Message:

merge with trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

    r4624 r5034  
    172172         DO ji = nicbdi, nicbei 
    173173            ii = nicbflddest(ji) 
    174             DO jn = 1, jpni 
    175                ! work along array until we find an empty slot 
    176                IF( nicbfldproc(jn) == -1 ) THEN 
    177                   nicbfldproc(jn) = ii 
    178                   EXIT                             !!gm EXIT should be avoided: use DO WHILE expression instead 
    179                ENDIF 
    180                ! before we find an empty slot, we may find processor number is already here so we exit 
    181                IF( nicbfldproc(jn) == ii ) EXIT 
    182             END DO 
     174            IF( ii .GT. 0 ) THEN     ! Needed because land suppression can mean 
     175                                     ! that unused points are not set in edge haloes 
     176               DO jn = 1, jpni 
     177                  ! work along array until we find an empty slot 
     178                  IF( nicbfldproc(jn) == -1 ) THEN 
     179                     nicbfldproc(jn) = ii 
     180                     EXIT                             !!gm EXIT should be avoided: use DO WHILE expression instead 
     181                  ENDIF 
     182                  ! before we find an empty slot, we may find processor number is already here so we exit 
     183                  IF( nicbfldproc(jn) == ii ) EXIT 
     184               END DO 
     185            ENDIF 
    183186         END DO 
    184187      ENDIF 
     
    210213            WRITE(numicb,*) 'north fold destination procs  ' 
    211214            WRITE(numicb,*) nicbflddest 
     215            WRITE(numicb,*) 'north fold destination proclist  ' 
     216            WRITE(numicb,*) nicbfldproc 
    212217         ENDIF 
    213218         CALL flush(numicb) 
     
    397402      ENDIF 
    398403 
    399       IF( lk_lim3 .AND. ln_icebergs ) THEN 
    400          CALL ctl_stop( 'icb_nam: the use of ICB with LIM3 not allowed. ice thickness missing in ICB' ) 
    401       ENDIF 
     404!     IF( lk_lim3 .AND. ln_icebergs ) THEN 
     405!        CALL ctl_stop( 'icb_nam: the use of ICB with LIM3 not allowed. ice thickness missing in ICB' ) 
     406!     ENDIF 
    402407 
    403408      IF(lwp) THEN                  ! control print 
Note: See TracChangeset for help on using the changeset viewer.