Changeset 3211 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.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/LDF/ldfeiv.F90 (modified) (6 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -31 +31 @@
    PUBLIC   ldf_eiv    ! routine called by step.F90
    
+   !! * Control permutation of array indices
+#  include "oce_ftrans.h90"
+#  include "dom_oce_ftrans.h90"
+#  include "sbc_oce_ftrans.h90"
+#  include "ldftra_oce_ftrans.h90"
+#  include "ldfslp_ftrans.h90"
+
    !! * Substitutions
 #  include "domzgr_substitute.h90"
@@ -84 +91 @@
       ! ----------------------------------------
       IF( ln_traldf_grif ) THEN
-         DO jk = 1, jpk
 #  if defined key_vectopt_loop  
+         DO jk = 1, jpk
 !CDIR NOVERRCHK 
             DO ji = 1, jpij   ! vector opt.
@@ -100 +107 @@
                zhw(ji,1) = zhw(ji,1) + ze3w
             END DO
+         END DO
 #  else
+#     if defined key_z_first
+         DO jj = 2, jpjm1
+            DO ji = 2, jpim1
+               DO jk = 1, jpk
+#     else
+         DO jk = 1, jpk
             DO jj = 2, jpjm1
 !CDIR NOVERRCHK 
                DO ji = 2, jpim1
+#     endif
                   ! Take the max of N^2 and zero then take the vertical sum 
                   ! of the square root of the resulting N^2 ( required to compute 
@@ -117 +132 @@
                END DO
             END DO
+         END DO
 #  endif
-         END DO
       ELSE
-         DO jk = 1, jpk
 #  if defined key_vectopt_loop  
+         DO jk = 1, jpk
 !CDIR NOVERRCHK 
             DO ji = 1, jpij   ! vector opt.
@@ -137 +152 @@
                zhw(ji,1) = zhw(ji,1) + ze3w
             END DO
+         END DO
 #  else
+#     if defined key_z_first
+         DO jj = 2, jpjm1
+            DO ji = 2, jpim1
+               DO jk = 1, jpk
+#     else
+         DO jk = 1, jpk
             DO jj = 2, jpjm1
 !CDIR NOVERRCHK 
                DO ji = 2, jpim1
+#     endif
                   ! Take the max of N^2 and zero then take the vertical sum 
                   ! of the square root of the resulting N^2 ( required to compute 
@@ -155 +178 @@
                END DO
             END DO
+         END DO
 #  endif
-         END DO
       END IF