Changeset 4479 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

Timestamp:

2014-02-04T13:19:11+01:00 (10 years ago)

Author:

trackstand2

Message:

Remove jpkf as un-needed now we just reset jpk instead

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) (16 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

@@ -105 +105 @@
       DO jj = 2, jpjm1 
          DO ji = 2, jpim1
-            DO jk = 1, jpkfm1
+            DO jk = 1, jpkm1
                zcoef = - p2dt / fse3u(ji,jj,jk)
                zzwi          = zcoef * avmu (ji,jj,jk  ) / fse3uw(ji,jj,jk  )
@@ -119 +119 @@
       END DO
 #else
-      DO jk = 1, jpkfm1        ! Matrix
+      DO jk = 1, jpkm1        ! Matrix
          DO jj = 2, jpjm1 
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -160 +160 @@
             ua(ji,jj,1) = ub(ji,jj,1) + p2dt * (  ua(ji,jj,1) + 0.5_wp * ( utau_b(ji,jj) + utau(ji,jj) )   &
                &                                                       / ( fse3u(ji,jj,1) * rau0       )  )
-            DO jk = 2, jpkfm1
+            DO jk = 2, jpkm1
                zzwibd = zwi(ji,jj,jk) / zwd(ji,jj,jk-1)
                !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
@@ -169 +169 @@
             END DO
             !==  third recurrence : SOLk = ( Lk - Uk * Ek+1 ) / Dk  ==
-            ua(ji,jj,jpkfm1) = ua(ji,jj,jpkfm1) / zwd(ji,jj,jpkfm1)
-            DO jk = jpkf-2, 1, -1
+            ua(ji,jj,jpkm1) = ua(ji,jj,jpkm1) / zwd(ji,jj,jpkm1)
+            DO jk = jpk-2, 1, -1
                ua(ji,jj,jk) = ( ua(ji,jj,jk) - zws(ji,jj,jk) * ua(ji,jj,jk+1) ) / zwd(ji,jj,jk)
             END DO
             ! Normalization to obtain the general momentum trend ua
-            DO jk = 1, jpkfm1
+            DO jk = 1, jpkm1
                ua(ji,jj,jk) = ( ua(ji,jj,jk) - ub(ji,jj,jk) ) * z1_p2dt
             END DO
@@ -180 +180 @@
       END DO
 #else
-      DO jk = 2, jpkfm1        !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
+      DO jk = 2, jpkm1        !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -194 +194 @@
          END DO
       END DO
-      DO jk = 2, jpkfm1
+      DO jk = 2, jpkm1
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -205 +205 @@
       DO jj = 2, jpjm1        !==  third recurrence : SOLk = ( Lk - Uk * Ek+1 ) / Dk  ==
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            ua(ji,jj,jpkfm1) = ua(ji,jj,jpkfm1) / zwd(ji,jj,jpkfm1)
-         END DO
-      END DO
-      DO jk = jpkf-2, 1, -1
+            ua(ji,jj,jpkm1) = ua(ji,jj,jpkm1) / zwd(ji,jj,jpkm1)
+         END DO
+      END DO
+      DO jk = jpk-2, 1, -1
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -216 +216 @@
       END DO
       ! Normalization to obtain the general momentum trend ua
-      DO jk = 1, jpkfm1
+      DO jk = 1, jpkm1
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -237 +237 @@
       DO jj = 2, jpjm1   
          DO ji = 2, jpim1
-            DO jk = 1, jpkfm1        ! Matrix
+            DO jk = 1, jpkm1        ! Matrix
                zcoef = -p2dt / fse3v(ji,jj,jk)
                zzwi          = zcoef * avmv (ji,jj,jk  ) / fse3vw(ji,jj,jk  )
@@ -251 +251 @@
       END DO
 #else
-      DO jk = 1, jpkfm1        ! Matrix
+      DO jk = 1, jpkm1        ! Matrix
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -292 +292 @@
             va(ji,jj,1) = vb(ji,jj,1) + p2dt * (  va(ji,jj,1) + 0.5_wp * ( vtau_b(ji,jj) + vtau(ji,jj) )   &
                &                                                       / ( fse3v(ji,jj,1) * rau0       )  )
-            DO jk = 2, jpkfm1
+            DO jk = 2, jpkm1
                zzwibd = zwi(ji,jj,jk) / zwd(ji,jj,jk-1)
                !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
@@ -301 +301 @@
             END DO
             !==  third recurrence : SOLk = ( Lk - Uk * SOLk+1 ) / Dk  ==
-            va(ji,jj,jpkfm1) = va(ji,jj,jpkfm1) / zwd(ji,jj,jpkfm1)
-            DO jk = jpkf-2, 1, -1
+            va(ji,jj,jpkm1) = va(ji,jj,jpkm1) / zwd(ji,jj,jpkm1)
+            DO jk = jpk-2, 1, -1
                va(ji,jj,jk) = ( va(ji,jj,jk) - zws(ji,jj,jk) * va(ji,jj,jk+1) ) / zwd(ji,jj,jk)
             END DO
             ! Normalization to obtain the general momentum trend va
-            DO jk = 1, jpkfm1
+            DO jk = 1, jpkm1
                va(ji,jj,jk) = ( va(ji,jj,jk) - vb(ji,jj,jk) ) * z1_p2dt
             END DO
@@ -312 +312 @@
       END DO
 #else
-      DO jk = 2, jpkfm1        !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
+      DO jk = 2, jpkm1        !==  First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1   (increasing k)  ==
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -326 +326 @@
          END DO
       END DO
-      DO jk = 2, jpkfm1
+      DO jk = 2, jpkm1
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -337 +337 @@
       DO jj = 2, jpjm1        !==  third recurrence : SOLk = ( Lk - Uk * SOLk+1 ) / Dk  ==
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            va(ji,jj,jpkfm1) = va(ji,jj,jpkfm1) / zwd(ji,jj,jpkfm1)
-         END DO
-      END DO
-      DO jk = jpkf-2, 1, -1
+            va(ji,jj,jpkm1) = va(ji,jj,jpkm1) / zwd(ji,jj,jpkm1)
+         END DO
+      END DO
+      DO jk = jpk-2, 1, -1
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -349 +349 @@
 
       ! Normalization to obtain the general momentum trend va
-      DO jk = 1, jpkfm1
+      DO jk = 1, jpkm1
          DO jj = 2, jpjm1   
             DO ji = fs_2, fs_jpim1   ! vector opt.