Changeset 4446

Timestamp:

2014-02-04T13:15:54+01:00 (10 years ago)

Author:

trackstand2

Message:

Use of mbkmax in ldf_slp->ldf_slp_mxl

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (13 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -172 +172 @@
       DO jj = 1, jpjm1           !==   i- & j-gradient of density   ==!
          DO ji = 1, jpim1
-            DO jk = 1, jpkf
+            DO jk = 1, mbkmax(ji,jj) ! jpkf
 #else
       DO jk = 1, jpkf            !==   i- & j-gradient of density   ==!
@@ -202 +202 @@
          DO ji = 1, jpi
             zdzr(ji,jj,1) = 0._wp   !==   Local vertical density gradient at T-point   == !   (evaluated from N^2)
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
                zdzr(ji,jj,jk) = zm1_g * ( prd(ji,jj,jk) + 1._wp )              &
                   &                   * ( pn2(ji,jj,jk) + pn2(ji,jj,jk+1) ) * ( 1._wp - 0.5_wp * tmask(ji,jj,jk+1) )
@@ -231 +231 @@
       DO jj = 2, jpjm1               !* Slopes at u and v points
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
       DO jk = 2, jpkfm1                            !* Slopes at u and v points
@@ -275 +275 @@
       DO jj = 2, jpjm1, MAX(1, jpj-3)                        ! rows jj=2 and =jpjm1 only
          DO ji = 2, jpim1  
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
       DO jk = 2, jpkfm1
@@ -297 +297 @@
       DO jj = 3, jpj-2                               ! other rows
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jj = 3, jpj-2                               ! other rows
@@ -319 +319 @@
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          !                                        !* decrease along coastal boundaries
@@ -340 +340 @@
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
       DO jk = 2, jpkfm1
@@ -384 +384 @@
       DO jj = 2, jpjm1, MAX(1, jpj-3)                           ! rows jj=2 and =jpjm1 only
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
       DO jk = 2, jpkfm1
@@ -407 +407 @@
       DO jj = 3, jpj-2                                  ! other rows
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jj = 3, jpj-2                               ! other rows
@@ -430 +430 @@
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
-            DO jk = 2, jpkfm1
+            DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          !                                        !* decrease along coastal boundaries
@@ -818 +818 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            DO jk = 1, jpkf          ! =1 inside the mixed layer, =0 otherwise
+            DO jk = 1, mbkmax(ji,jj) ! jpkf ! =1 inside the mixed layer, =0 otherwise
 #else
       DO jk = 1, jpkf                ! =1 inside the mixed layer, =0 otherwise
@@ -858 +858 @@
             !
             !                          !- vertical density gradient for u- and v-slopes (from dzr at T-point)
+#if defined key_z_first
+            iku = MIN(  MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , mbkmax(ji,jj)-1  ) ! ML (MAX of T-pts, bound by mbkmax(ji,jj))
+            ikv = MIN(  MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , mbkmax(ji,jj)-1  ) ! 
+#else
             iku = MIN(  MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , jpkm1  )   ! ML (MAX of T-pts, bound by jpkm1)
             ikv = MIN(  MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , jpkm1  )   ! 
+#endif
             zbu = 0.5_wp * ( p_dzr(ji,jj,iku) + p_dzr(ji+1,jj  ,iku) )
             zbv = 0.5_wp * ( p_dzr(ji,jj,ikv) + p_dzr(ji  ,jj+1,ikv) )
@@ -875 +880 @@
             !                    !==   i- & j-slopes at w-points just below the Mixed Layer   ==!
             !
+#if defined key_z_first
+            ik   = MIN( nmln(ji,jj) + 1, mbkmax(ji,jj) )
+#else
             ik   = MIN( nmln(ji,jj) + 1, jpkf )
+#endif
             ikm1 = MAX( 1, ik-1 )
             !                          !- vertical density gradient for w-slope (from N^2)