Changeset 4444 for branches

Timestamp:

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

Author:

trackstand2

Message:

Use of mbkmax in tra_adv_tvd

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (8 diffs)

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

@@ -130 +130 @@
       END IF
       !
-      zwi(:,:,1:jpkf) = 0.e0
+#if defined key_z_first
+      DO jj = 1, jpj, 1
+         DO ji = 1, jpi, 1
+            zwi(ji,jj,1:mbkmax(ji,jj)) = 0.e0_wp
+         END DO
+      END DO
+#else
+      zwi(:,:,1:jpk) = 0.e0_wp
+#endif
       !
       !                                                          ! ===========
@@ -139 +147 @@
          ! ARPDBG: FINISS was using jpk correct here given that it can be 
          ! below the ocean floor??
+#if defined key_z_first
+         DO jj = 1, jpj, 1
+            DO ji = 1, jpi, 1
+               zwx(ji,jj,mbkmax(ji,jj)) = 0.0_wp
+               zwy(ji,jj,mbkmax(ji,jj)) = 0.0_wp
+               zwz(ji,jj,mbkmax(ji,jj)) = 0.0_wp
+               zwi(ji,jj,mbkmax(ji,jj)) = 0.0_wp
+            END DO            
+         END DO
+#else
          zwx(:,:,jpkf) = 0.e0    ;    zwz(:,:,jpkf) = 0.e0
          zwy(:,:,jpkf) = 0.e0    ;    zwi(:,:,jpkf) = 0.e0
-
+#endif
          ! 2. upstream advection with initial mass fluxes & intermediate update
          ! --------------------------------------------------------------------
@@ -149 +167 @@
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
-               DO jk = 1, jpkfm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jk = 1, jpkfm1
@@ -177 +195 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 2, jpkfm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jk = 2, jpkfm1
@@ -196 +214 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               DO jk = 1, jpkfm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkfm1
                   z2dtt = p2dt(jk)
 #else
@@ -240 +258 @@
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
-               DO jk = 1, jpkfm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jk = 1, jpkfm1
@@ -259 +277 @@
             DO ji = 1, jpi
                zwz(ji,jj,1) = 0.e0   ! Surface value
-               DO jk = 2, jpkfm1
+               DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          zwz(:,:,1) = 0.e0           ! Surface value
@@ -291 +309 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               DO jk = 1, jpkfm1
+               DO jk = 1, mbkmax(ji,jj)-1 ! jpkfm1
 #else
          DO jk = 1, jpkfm1