Changeset 4356 for branches/2013

Timestamp:

2014-01-20T13:12:30+01:00 (10 years ago)

Author:

hliu

Message:

a few bugs removed

File:

• branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DYN/wadlmt.F90 (modified) (3 diffs)

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DYN/wadlmt.F90

@@ -29 +29 @@
 
    PUBLIC   wad_lmt    ! routine called by step.F90
+
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
+#  include "vectopt_loop_substitute.h90"
+CONTAINS
 
    SUBROUTINE wad_lmt( kt )
@@ -119 +124 @@
                 !WRITE(numout,*) 'depth less than minimum depth, cell(ji,jj):', ji,jj
                 zdep2 = 0._wp
-                sshb(ji,jj) = rn_wad_dep1 - bathy(ji,jj)
+                sshb(ji,jj) = rn_wadmin - bathy(ji,jj)
               END IF
        
@@ -142 +147 @@
            DO jj = 2, jpjm1
               DO ji = fs_2, fs_jpim1   ! vector opt.
-               un(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, un(ji,jj,jk)   + 1._wp ) * uwdlmt(ji,jj) 
-               vn(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, vn(ji,jj,jk)   + 1._wp ) * vwdlmt(ji,jj) 
-               un(ji-1,jj,jk) = 0.5_wp * ( 1._wp - sign(1._wp, un(ji-1,jj,jk) ) * uwdlmt(ji-1,jj) 
-               vn(ji,jj-1,jk) = 0.5_wp * ( 1._wp - sign(1._wp, vn(ji,jj-1,jk) ) * vwdlmt(ji,jj-1) 
+               un(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, un(ji,jj,jk))   + 1._wp ) * uwdlmt(ji,jj) 
+               vn(ji,jj,jk)   = 0.5_wp * ( sign(1._wp, vn(ji,jj,jk))   + 1._wp ) * vwdlmt(ji,jj) 
+               un(ji-1,jj,jk) = 0.5_wp * ( 1._wp - sign(1._wp, un(ji-1,jj,jk) )) * uwdlmt(ji-1,jj) 
+               vn(ji,jj-1,jk) = 0.5_wp * ( 1._wp - sign(1._wp, vn(ji,jj-1,jk) )) * vwdlmt(ji,jj-1) 
               END DO
            END DO