Changeset 4427 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

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

Author:

trackstand2

Message:

First files changed on last FINISS work package. Stephen's work although
commited by Andy P.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (6 diffs)

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

@@ -94 +94 @@
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
+#if defined key_z_first
+      INTEGER  ::   klim         ! upper bound on k loop
+#endif
       REAL(wp) ::   zcoefu, zcoefv, zcoeff, z2dt, z1_2dt, z1_rau0   ! local scalars
       !!----------------------------------------------------------------------
@@ -107 +110 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~ '
          !
+#if defined key_z_first
+         DO jj=1,jpj
+            DO ji=1,jpi
+               DO jk=mbkmax(ji,jj), jpk
+                  wn(ji,jj,jk) = 0._wp
+               END DO
+            END DO
+         END DO
+#else
          wn(:,:,jpk) = 0._wp                  ! bottom boundary condition: w=0 (set once for all)
+#endif
          !
          IF( lk_vvl ) THEN                    ! before and now Sea SSH at u-, v-, f-points (vvl case only)
@@ -161 +174 @@
             ! gdept_1(1:jpkm1,:,:) = (gdept(1:jpkm1,:,:)*(1.+sshn(:,:)*mut(1:jpkm1,:,:))) 
             ! which contains non-conforming array expressions.
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fsdept(ji,jj,jk) = fsdept_n(ji,jj,jk)   ! now local depths stored in fsdep. arrays
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fsdepw(ji,jj,jk) = fsdepw_n(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fsde3w(ji,jj,jk) = fsde3w_n(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-            !
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3t (ji,jj,jk) = fse3t_n (ji,jj,jk)   ! vertical scale factors stored in fse3. arrays
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3u (ji,jj,jk) = fse3u_n (ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3v (ji,jj,jk) = fse3v_n (ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3f (ji,jj,jk) = fse3f_n (ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3w (ji,jj,jk) = fse3w_n (ji,jj,jk)
-               END DO
-            END DO
-         END DO
-
-
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3uw(ji,jj,jk) = fse3uw_n(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-
-         DO jj=1,jpj,1
-            DO ji=1,jpi,1
-               DO jk=1,jpk,1
-                  fse3vw(ji,jj,jk) = fse3vw_n(ji,jj,jk)
-               END DO
+         DO jj=1,jpj
+            DO ji=1,jpi
+               klim=mbkmax(ji,jj)
+               ! now local depths stored in fsdep. arrays
+               fsdept(ji,jj,1:klim) = fsdept_n(ji,jj,1:klim)
+               fsdepw(ji,jj,1:klim) = fsdepw_n(ji,jj,1:klim)
+               fsde3w(ji,jj,1:klim) = fsde3w_n(ji,jj,1:klim)
+               ! vertical scale factors stored in fse3. arrays
+               fse3t (ji,jj,1:klim) = fse3t_n (ji,jj,1:klim)
+               fse3u (ji,jj,1:klim) = fse3u_n (ji,jj,1:klim)
+               fse3v (ji,jj,1:klim) = fse3v_n (ji,jj,1:klim)
+               fse3f (ji,jj,1:klim) = fse3f_n (ji,jj,1:klim)
+               fse3w (ji,jj,1:klim) = fse3w_n (ji,jj,1:klim)
+               fse3uw(ji,jj,1:klim) = fse3uw_n(ji,jj,1:klim)
+               fse3vw(ji,jj,1:klim) = fse3vw_n(ji,jj,1:klim)
             END DO
          END DO
@@ -279 +235 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            DO jk = 1, jpkm1                           ! Horizontal divergence of barotropic transports
+            DO jk = 1, mbkmax(ji,jj)-1                 ! Horizontal divergence of barotropic transports
                zhdiv(ji,jj) = zhdiv(ji,jj) + fse3t(ji,jj,jk) * hdivn(ji,jj,jk)
             END DO
@@ -355 +311 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            DO jk = jpkm1, 1, -1                      ! integrate from the bottom the hor. divergence
+            DO jk = mbkmax(ji,jj)-1, 1, -1                      ! integrate from the bottom the hor. divergence
                 wn(ji,jj,jk) = wn(ji,jj,jk+1)                               &
                    &         -   fse3t_n(ji,jj,jk) * hdivn(ji,jj,jk)        &
@@ -390 +346 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               DO jk = 1, jpk
+               DO jk = 1, mbkmax(ji,jj)
                   z3d(ji,jj,jk) = wn(ji,jj,jk) * z2d(ji,jj)
                END DO