Changeset 3211 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2011-12-11T16:00:26+01:00 (13 years ago)

Author:

spickles2

Message:

Stephen Pickles, 11 Dec 2011

Commit to bring the rest of the DCSE NEMO development branch
in line with the latest development version. This includes
array index re-ordering of all OPA_SRC/.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (4 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -32 +32 @@
    REAL(wp),         ALLOCATABLE, SAVE, DIMENSION(:)     ::   r2dt   ! vertical profile time-step, = 2 rdttra 
       !                                                              ! except at nit000 (=rdttra) if neuler=0
+
+   !! * Control permutation of array indices
+#  include "oce_ftrans.h90"
+#  include "dom_oce_ftrans.h90"
+#  include "sbc_oce_ftrans.h90"
+#  include "domvvl_ftrans.h90"
 
    !! * Substitutions
@@ -110 +116 @@
       END DO  
       !                                         ! Compute and mask the inverse of the local depth at T, U, V and F points
+#if defined key_z_first
+      ee_t(:,:) = 1. / ee_t(:,:) * tmask_1(:,:)
+      ee_u(:,:) = 1. / ee_u(:,:) * umask_1(:,:)
+      ee_v(:,:) = 1. / ee_v(:,:) * vmask_1(:,:)
+      DO jj = 1, jpjm1                               ! f-point case fmask cannot be used 
+         ee_f(:,jj) = 1. / ee_f(:,jj) * umask_1(:,jj) * umask_1(:,jj+1)
+      END DO
+#else
       ee_t(:,:) = 1. / ee_t(:,:) * tmask(:,:,1)
       ee_u(:,:) = 1. / ee_u(:,:) * umask(:,:,1)
@@ -116 +130 @@
          ee_f(:,jj) = 1. / ee_f(:,jj) * umask(:,jj,1) * umask(:,jj+1,1)
       END DO
+#endif
       CALL lbc_lnk( ee_f, 'F', 1. )                  ! lateral boundary condition on ee_f
       !
@@ -172 +187 @@
                                                 ! initialise before scale factors at (u/v)-points
       ! Scale factor anomaly at (u/v)-points: surface averaging of scale factor at t-points
+#if defined key_z_first
+      DO jj = 1, jpjm1
+         DO ji = 1, jpim1
+            DO jk = 1, jpkm1
+#else
       DO jk = 1, jpkm1
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
+#endif
                zv_t_ij           = zs_t(ji  ,jj  ) * fse3t_b(ji  ,jj  ,jk)
                zv_t_ip1j         = zs_t(ji+1,jj  ) * fse3t_b(ji+1,jj  ,jk)