Changeset 4431 for branches

Timestamp:

2014-02-04T13:14:23+01:00 (10 years ago)

Author:

trackstand2

Message:

Use of mbkmax in eosbn2 and trazdf_imp

Location:

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• eosbn2.F90 (modified) (11 diffs)
• trazdf_imp.F90 (modified) (1 diff)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -142 +142 @@
          zrau0r = 1.e0 / rau0
 !CDIR NOVERRCHK
+#if defined key_z_first
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               DO jk = 1, mbkmax(ji,jj)
+                  zws(ji,jj,jk) = SQRT( ABS( pts(ji,jj,jk,jp_sal) ) )
+               END DO
+            END DO
+         END DO
+#else
          zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) )
+#endif
          !  
 #if defined key_z_first
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
 #else
          DO jk = 1, jpkm1
@@ -196 +206 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
                   prd(ji,jj,jk) = ( 0.0285_wp - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk)
                END DO
@@ -211 +221 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
                   prd(ji,jj,jk) = ( rn_beta  * pts(ji,jj,jk,jp_sal) - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk)
                END DO
@@ -316 +326 @@
          zrau0r = 1.e0 / rau0
 !CDIR NOVERRCHK
+#if defined key_z_first
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               DO jk = 1, mbkmax(ji,jj)
+                  zws(ji,jj,jk) = SQRT( ABS( pts(ji,jj,jk,jp_sal) ) )
+               END DO
+            END DO
+         END DO
+#else
          zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) )
+#endif
          !  
 #if defined key_z_first
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
 #else
          DO jk = 1, jpkm1
@@ -373 +393 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
                   prd  (ji,jj,jk) = ( 0.0285_wp - rn_alpha * pts(ji,jj,jk,jp_tem) )        * tmask(ji,jj,jk)
                   prhop(ji,jj,jk) = ( 1.e0_wp   +            prd(ji,jj,jk)        ) * rau0 * tmask(ji,jj,jk)
@@ -390 +410 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpkm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1
                   prd  (ji,jj,jk) = ( rn_beta  * pts(ji,jj,jk,jp_sal) - rn_alpha * pts(ji,jj,jk,jp_tem) )        * tmask(ji,jj,jk)
                   prhop(ji,jj,jk) = ( 1.e0_wp  + prd(ji,jj,jk)                                          ) * rau0 * tmask(ji,jj,jk)
@@ -619 +639 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 2, jpkm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1
 #else
          DO jk = 2, jpkm1
@@ -672 +692 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 2, jpkm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1
                   pn2(ji,jj,jk) = grav * rn_alpha * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) &
                      &                 / fse3w(ji,jj,jk) * tmask(ji,jj,jk)
@@ -688 +708 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 2, jpkm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1
                   pn2(ji,jj,jk) = grav * (  rn_alpha * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) )      &
                      &                    - rn_beta  * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) )  )   &
@@ -706 +726 @@
          DO jj = 1, jpj                                   ! Rrau = (alpha / beta) (dk[t] / dk[s])
             DO ji = 1, jpi
-               DO jk = 2, jpkm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1
 #else
          DO jk = 2, jpkm1                                 ! Rrau = (alpha / beta) (dk[t] / dk[s])
@@ -778 +798 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpk
+               DO jk = 1, mbkmax(ji,jj) ! jpk
 #else
          DO jk = 1, jpk

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -307 +307 @@
          ! third recurrence:    Xk = (Zk - Sk Xk+1 ) / Tk   (result is the after tracer)
 #if defined key_z_first
-               pta(ji,jj,jpkm1,jn) = pta(ji,jj,jpkm1,jn) / zwt(ji,jj,jpkm1) * tmask(ji,jj,jpkm1)
-               DO jk = mbkmax(ji,jj)-2, 1, -1 ! jpk-2
-                  pta(ji,jj,jk,jn) = ( pta(ji,jj,jk,jn) - zws(ji,jj,jk) * pta(ji,jj,jk+1,jn) )   &
+!               pta(ji,jj,jpkm1,jn) = pta(ji,jj,jpkm1,jn) / zwt(ji,jj,jpkm1) * tmask(ji,jj,jpkm1)
+               jk = mbkmax(ji,jj)-1
+               IF(jk>0)THEN
+                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) / zwt(ji,jj,jk) * tmask(ji,jj,jk)
+                  DO jk = mbkmax(ji,jj)-2, 1, -1 ! jpk-2
+                     pta(ji,jj,jk,jn) = ( pta(ji,jj,jk,jn) - zws(ji,jj,jk) * pta(ji,jj,jk+1,jn) )   &
                      &             / zwt(ji,jj,jk) * tmask(ji,jj,jk)
-               END DO
+                  END DO
+               END IF
             END DO
          END DO