Changeset 2450 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

Timestamp:

2010-12-04T16:20:50+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: #766 share the deepest ocean level indices continuaton

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (8 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -196 +196 @@
             DO jj = 2, jpjm1 
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zup   = mxln(ji,jj,jk) * fsdepw(ji,jj,mbathy(ji,jj))
-                  zdown = vkarmn * fsdepw(ji,jj,jk) * ( -fsdepw(ji,jj,jk) + fsdepw(ji,jj,mbathy(ji,jj)) )
+                  zup   = mxln(ji,jj,jk) * fsdepw(ji,jj,mbkt(ji,jj)+1)
+                  zdown = vkarmn * fsdepw(ji,jj,jk) * ( -fsdepw(ji,jj,jk) + fsdepw(ji,jj,mbkt(ji,jj)+1) )
                   zcoef = ( zup / MAX( zdown, rsmall ) )
                   zwall (ji,jj,jk) = ( 1._wp + re2 * zcoef*zcoef ) * tmask(ji,jj,jk)
@@ -360 +360 @@
 !CDIR NOVERRCHK
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ibot   = mbathy(ji,jj)
-               ibotm1 = ibot-1
+               ibot   = mbkt(ji,jj) + 1      ! k   bottom level of w-point
+               ibotm1 = mbkt(ji,jj)          ! k-1 bottom level of w-point but >=1
                !
                ! Bottom level Dirichlet condition:
@@ -383 +383 @@
 !CDIR NOVERRCHK
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ibot   = mbathy(ji,jj)
-               ibotm1 = ibot-1
+               ibot   = mbkt(ji,jj) + 1      ! k   bottom level of w-point
+               ibotm1 = mbkt(ji,jj)          ! k-1 bottom level of w-point but >=1
                !
                ! Bottom level Dirichlet condition:
@@ -623 +623 @@
 !CDIR NOVERRCHK
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ibot = mbathy(ji,jj)
-               ibotm1 = ibot-1
+               ibot   = mbkt(ji,jj) + 1      ! k   bottom level of w-point
+               ibotm1 = mbkt(ji,jj)          ! k-1 bottom level of w-point but >=1
                zdep(ji,jj) = vkarmn * rn_hbro
                psi (ji,jj,ibot) = rc0**rpp * en(ji,jj,ibot)**rmm * zdep(ji,jj)**rnn
@@ -646 +646 @@
 !CDIR NOVERRCHK
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ibot   = mbathy(ji,jj)
-               ibotm1 = ibot-1
+               ibot   = mbkt(ji,jj) + 1      ! k   bottom level of w-point
+               ibotm1 = mbkt(ji,jj)          ! k-1 bottom level of w-point but >=1
                !
                ! Bottom level Dirichlet condition:
@@ -825 +825 @@
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            ibot   = mbathy(ji,jj)
-            avmv(ji,jj,ibot) = zcoef
+            avmv(ji,jj,mbkt(ji,jj)+1) = zcoef
          END DO
       END DO
@@ -1216 +1215 @@
               DO jj = 2, jpjm1
                 DO ji = fs_2, fs_jpim1   ! vector opt.
-                  ikbu   = MIN( mbathy(ji+1,jj  ), mbathy(ji,jj) )
-                  ikbum1 = MAX( ikbu-1, 1 )
-                  ikbv   = MIN( mbathy(ji,jj+1), mbathy(ji,jj) )
-                  ikbvm1 = MAX( ikbv-1, 1 )
+                  ikbu   = mbku(ji,jj) + 1    ! k   bottom level of uw-point
+                  ikbum1 = mbku(ji,jj)        ! k-1 bottom level of u -point, but >=1
+                  ikbv   = mbkv(ji,jj) + 1
+                  ikbvm1 = mbkv(ji,jj)
                   cbx = avmu(ji,jj,ikbu) / fse3uw(ji,jj,ikbu)
                   cby = avmv(ji,jj,ikbv) / fse3vw(ji,jj,ikbv)
-                  wbotu(ji,jj) = -cbx * un(ji,jj,ikbum1)*umask(ji,jj,1)
-                  wbotv(ji,jj) = -cby * vn(ji,jj,ikbvm1)*vmask(ji,jj,1)
+                  wbotu(ji,jj) = -cbx * un(ji,jj,ikbum1) * umask(ji,jj,1)
+                  wbotv(ji,jj) = -cby * vn(ji,jj,ikbvm1) * vmask(ji,jj,1)
                 END DO
               END DO
@@ -1235 +1234 @@
            ! Initialize bottom stresses
            DO jj = 2, jpjm1
-             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ikbu   = MIN( mbathy(ji+1,jj  ), mbathy(ji,jj) )
-               ikbum1 = MAX( ikbu-1, 1 )
-               ikbv   = MIN( mbathy(ji,jj+1), mbathy(ji,jj) )
-               ikbvm1 = MAX( ikbv-1, 1 )
-               cbx = avmu(ji,jj,ikbu) / fse3uw(ji,jj,ikbu)
-               cby = avmv(ji,jj,ikbv) / fse3vw(ji,jj,ikbv)
-               wbotu(ji,jj) = -cbx * un(ji,jj,ikbum1)*umask(ji,jj,1)
-               wbotv(ji,jj) = -cby * vn(ji,jj,ikbvm1)*vmask(ji,jj,1)
-             END DO
+              DO ji = fs_2, fs_jpim1   ! vector opt.
+                 ikbu   = mbku(ji,jj) + 1    ! k   bottom level of uw-point
+                 ikbum1 = mbku(ji,jj)        ! k-1 bottom level of u -point, but >=1
+                 ikbv   = mbkv(ji,jj) + 1
+                 ikbvm1 = mbkv(ji,jj)
+                 cbx = avmu(ji,jj,ikbu) / fse3uw(ji,jj,ikbu)
+                 cby = avmv(ji,jj,ikbv) / fse3vw(ji,jj,ikbv)
+                 wbotu(ji,jj) = -cbx * un(ji,jj,ikbum1) * umask(ji,jj,1)
+                 wbotv(ji,jj) = -cby * vn(ji,jj,ikbvm1) * vmask(ji,jj,1)
+              END DO
            END DO
         ENDIF