Changeset 5721


Ignore:
Timestamp:
2015-09-07T19:25:33+02:00 (5 years ago)
Author:
mathiot
Message:

patch bug ticket #1592

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

    r5656 r5721  
    188188         END IF 
    189189          
     190         ! compute bottom level of isf tbl and thickness of tbl below the ice shelf 
    190191         rhisf_tbl_0(:,:) = rhisf_tbl(:,:) 
    191  
    192          ! compute bottom level of isf tbl and thickness of tbl below the ice shelf 
    193192         DO jj = 1,jpj 
    194193            DO ji = 1,jpi 
     
    472471 
    473472                     nit = nit + 1 
    474                      IF (nit .GE. 100) THEN 
    475                         !WRITE(numout,*) "sbcisf : too many iteration ... ", zhtflx, zhtflx_b,zgammat, rn_gammat0, rn_tfri2, nn_gammablk, ji,jj 
    476                         !WRITE(numout,*) "sbcisf : too many iteration ... ", (zhtflx - zhtflx_b)/zhtflx 
    477                         CALL ctl_stop( 'STOP', 'sbc_isf_hol99 : too many iteration ...' ) 
    478                      END IF 
     473                     IF (nit .GE. 100) CALL ctl_stop( 'STOP', 'sbc_isf_hol99 : too many iteration ...' ) 
     474 
    479475! save gammat and compute zhtflx_b 
    480476                     zgammat2d(ji,jj)=zgammat 
     
    794790               ! test on tmask useless ????? 
    795791               DO jk = ikt, mbkt(ji,jj) 
    796 !                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk 
     792                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk 
    797793               END DO 
    798794               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.