Changeset 5720


Ignore:
Timestamp:
2015-09-07T17:49:54+02:00 (5 years ago)
Author:
mathiot
Message:

patch bug ticket #1592

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

    r5628 r5720  
    195195         END IF 
    196196          
     197         ! compute bottom level of isf tbl and thickness of tbl below the ice shelf 
    197198         rhisf_tbl_0(:,:) = rhisf_tbl(:,:) 
    198  
    199          ! compute bottom level of isf tbl and thickness of tbl below the ice shelf 
    200199         DO jj = 1,jpj 
    201200            DO ji = 1,jpi 
     
    479478 
    480479                     nit = nit + 1 
    481                      IF (nit .GE. 100) THEN 
    482                         !WRITE(numout,*) "sbcisf : too many iteration ... ", zhtflx, zhtflx_b,zgammat, rn_gammat0, rn_tfri2, nn_gammablk, ji,jj 
    483                         !WRITE(numout,*) "sbcisf : too many iteration ... ", (zhtflx - zhtflx_b)/zhtflx 
    484                         CALL ctl_stop( 'STOP', 'sbc_isf_hol99 : too many iteration ...' ) 
    485                      END IF 
     480                     IF (nit .GE. 100) CALL ctl_stop( 'STOP', 'sbc_isf_hol99 : too many iteration ...' ) 
     481 
    486482! save gammat and compute zhtflx_b 
    487483                     zgammat2d(ji,jj)=zgammat 
     
    801797               ! test on tmask useless ????? 
    802798               DO jk = ikt, mbkt(ji,jj) 
    803 !                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk 
     799                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk 
    804800               END DO 
    805801               rhisf_tbl(ji,jj) = MIN(rhisf_tbl(ji,jj), SUM(fse3t(ji,jj,ikt:ikb)))  ! limit the tbl to water thickness. 
Note: See TracChangeset for help on using the changeset viewer.