Changeset 4401 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

Timestamp:

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

Author:

trackstand2

Message:

Put jpkf into traldf_iso and traadv_tvd (inc nonosc)

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (15 diffs)

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

@@ -168 +168 @@
          !!   I - masked horizontal derivative 
          !!----------------------------------------------------------------------
-         CALL timing_start('traldf_iso_I')
+         !CALL timing_start('traldf_iso_I')
          !!bug ajout.... why?   ( 1,jpj,:) and (jpi,1,:) should be sufficient....
 #if defined key_z_first
          DO jj=1,jpj,1
-            DO jk=1,jpk,1
+            DO jk=1,jpkf,1
                zdit(1  ,jj,jk) = 0.0_wp
                zdit(jpi,jj,jk) = 0.0_wp
@@ -180 +180 @@
          END DO
 #else
-         zdit (1,:,:) = 0.e0     ;     zdit (jpi,:,:) = 0.e0
-         zdjt (1,:,:) = 0.e0     ;     zdjt (jpi,:,:) = 0.e0
+         zdit (1,:,1:jpkf) = 0.e0     ;     zdit (jpi,:,1:jpkf) = 0.e0
+         zdjt (1,:,1:jpkf) = 0.e0     ;     zdjt (jpi,:,1:jpkf) = 0.e0
 #endif
          !!end
@@ -189 +189 @@
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
-               DO jk = 1, jpkm1
-#else
-         DO jk = 1, jpkm1
+               DO jk = 1, jpkfm1 ! jpkm1
+#else
+         DO jk = 1, jpkfm1 ! jpkm1
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -209 +209 @@
          ENDIF
          !
-         CALL timing_stop('traldf_iso_I','section')
+         !CALL timing_stop('traldf_iso_I','section')
 
          !!----------------------------------------------------------------------
          !!   II - horizontal trend  (full)
          !!----------------------------------------------------------------------
-         CALL timing_start('traldf_iso_II')
+         !CALL timing_start('traldf_iso_II')
 #if defined key_z_first
             ! 1. Vertical tracer gradient at level jk and jk+1
@@ -257 +257 @@
          DO jj = 2 , jpjm1
             DO ji = 2, jpim1
-               DO jk = 1, jpkm1
+               DO jk = 1, jpkfm1 ! jpkm1
 
                   ! 1. Vertical tracer gradient at level jk and jk+1
@@ -325 +325 @@
 !CDIR PARALLEL DO PRIVATE( zdk1t ) 
          !                                                ! ===============
-         DO jk = 1, jpkm1                                 ! Horizontal slab
+         DO jk = 1, jpkfm1 ! jpkm1                        ! Horizontal slab
             !                                             ! ===============
             ! 1. Vertical tracer gradient at level jk and jk+1
@@ -392 +392 @@
             DO jj = 2, jpjm1
                DO ji = 2, jpim1
-                  DO jk = 1, jpkm1
-#else
-            DO jk = 1, jpkm1
+                  DO jk = 1, jpkfm1 ! jpkm1
+#else
+            DO jk = 1, jpkfm1 ! jpkm1
                DO jj = 2, jpjm1
                   DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -409 +409 @@
             DO jj = 2, jpjm1
                DO ji = 2, jpim1
-                  DO jk = 1, jpkm1
-#else
-            DO jk = 1, jpkm1
+                  DO jk = 1, jpkfm1 ! jpkm1
+#else
+            DO jk = 1, jpkfm1 ! jpkm1
                DO jj = 2, jpjm1
                   DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -424 +424 @@
          END IF
 #endif
-         CALL timing_stop('traldf_iso_II','section')
-
-         !!----------------------------------------------------------------------
+         !CALL timing_stop('traldf_iso_II','section')
+
+         !!--------------------------------------------------------------------
          !!   III - vertical trend of T & S (extra diagonal terms only)
-         !!----------------------------------------------------------------------
-         CALL timing_start('traldf_iso_III')
+         !!--------------------------------------------------------------------
+         !CALL timing_start('traldf_iso_III')
          
          ! Local constant initialization
@@ -435 +435 @@
 #if defined key_z_first
          DO jj=1,jpj,1
-            DO jk=1,jpk,1
+            DO jk=1,jpkf,1
                ztfw(1  ,jj,jk) = 0.0_wp
                ztfw(jpi,jj,jk) = 0.0_wp
@@ -441 +441 @@
          END DO
 #else
-         ztfw(1,:,:) = 0.e0     ;     ztfw(jpi,:,:) = 0.e0
+         ztfw(1,:,1:jpkf) = 0.e0     ;     ztfw(jpi,:,1:jpkf) = 0.e0
 #endif
          ! Vertical fluxes
@@ -451 +451 @@
             DO jj=1,jpj,1
                ztfw(ji,jj,1  ) = 0.0_wp
-               ztfw(ji,jj,jpk) = 0.0_wp
-            END DO
-         END DO
-#else
-         ztfw(:,:, 1 ) = 0.e0      ;      ztfw(:,:,jpk) = 0.e0
+               ztfw(ji,jj,jpkf) = 0.0_wp ! ARPDBG - should this be jpk anyway
+                                         ! since may be below ocean floor?
+            END DO
+         END DO
+#else
+         ztfw(:,:, 1 ) = 0.e0      ;      ztfw(:,:,jpkf) = 0.e0
 #endif
 
@@ -462 +463 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               DO jk = 2, jpkm1
-#else
-         DO jk = 2, jpkm1
+               DO jk = 2, jpkfm1
+#else
+         DO jk = 2, jpkfm1
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -492 +493 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               DO jk = 1, jpkm1
-#else
-         DO jk = 1, jpkm1
+               DO jk = 1, jpkfm1
+#else
+         DO jk = 1, jpkfm1
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -506 +507 @@
          !
 
-         CALL timing_stop('traldf_iso_III','section')
+         !CALL timing_stop('traldf_iso_III','section')
 
       END DO