Changeset 4356


Ignore:
Timestamp:
2014-01-20T13:12:30+01:00 (7 years ago)
Author:
hliu
Message:

a few bugs removed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DYN/wadlmt.F90

    r4355 r4356  
    2929 
    3030   PUBLIC   wad_lmt    ! routine called by step.F90 
     31 
     32   !! * Substitutions 
     33#  include "domzgr_substitute.h90" 
     34#  include "vectopt_loop_substitute.h90" 
     35CONTAINS 
    3136 
    3237   SUBROUTINE wad_lmt( kt ) 
     
    119124                !WRITE(numout,*) 'depth less than minimum depth, cell(ji,jj):', ji,jj 
    120125                zdep2 = 0._wp 
    121                 sshb(ji,jj) = rn_wad_dep1 - bathy(ji,jj) 
     126                sshb(ji,jj) = rn_wadmin - bathy(ji,jj) 
    122127              END IF 
    123128        
     
    142147           DO jj = 2, jpjm1 
    143148              DO ji = fs_2, fs_jpim1   ! vector opt. 
    144                un(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, un(ji,jj,jk)   + 1._wp ) * uwdlmt(ji,jj)  
    145                vn(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, vn(ji,jj,jk)   + 1._wp ) * vwdlmt(ji,jj)  
    146                un(ji-1,jj,jk) = 0.5_wp * ( 1._wp - sign(1._wp, un(ji-1,jj,jk) ) * uwdlmt(ji-1,jj)  
    147                vn(ji,jj-1,jk) = 0.5_wp * ( 1._wp - sign(1._wp, vn(ji,jj-1,jk) ) * vwdlmt(ji,jj-1)  
     149               un(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, un(ji,jj,jk))   + 1._wp ) * uwdlmt(ji,jj)  
     150               vn(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, vn(ji,jj,jk))   + 1._wp ) * vwdlmt(ji,jj)  
     151               un(ji-1,jj,jk) = 0.5_wp * ( 1._wp - sign(1._wp, un(ji-1,jj,jk) )) * uwdlmt(ji-1,jj)  
     152               vn(ji,jj-1,jk) = 0.5_wp * ( 1._wp - sign(1._wp, vn(ji,jj-1,jk) )) * vwdlmt(ji,jj-1)  
    148153              END DO 
    149154           END DO 
Note: See TracChangeset for help on using the changeset viewer.