Changeset 14215 for NEMO/trunk/src/OCE/do_loop_substitute.h90

Timestamp:

2020-12-18T14:49:22+01:00 (3 years ago)

Author:

acc

Message:

trunk changes to swap the order of arguments to the DO LOOP macros. These changes result in a more natural i-j-k ordering as explained in #2595. SETTE is passed before and after these changes and results are unchanged. This fixes #2595

File:

• NEMO/trunk/src/OCE/do_loop_substitute.h90 (modified) (5 diffs)

NEMO/trunk/src/OCE/do_loop_substitute.h90

@@ -2 +2 @@
 ! These comments are not intended to be retained during preprocessing; i.e. do not define "show_comments"
 !!----------------------------------------------------------------------
-!! NEMO/OCE 4.0 , NEMO Consortium (2018)
+!! NEMO/OCE 4.x , NEMO Consortium (2020)
 !! Software governed by the CeCILL license (see ./LICENSE)
 !!----------------------------------------------------------------------
@@ -25 +25 @@
 ! Upper limits of jpi, jpim1 or fs_jpim1 (for ji) or jpj, jpjm1 or fs_jpjm1 (for jj)
 !
-! The macro naming convention takes the form: DO_2D( B, T, L, R) where:
+! The macro naming convention takes the form: DO_2D( L, R, B, T) where:
+!   L is the Left   offset from the PE's inner domain;
+!   R is the Right  offset from the PE's inner domain
 !   B is the Bottom offset from the PE's inner domain;
 !   T is the Top    offset from the PE's inner domain;
-!   L is the Left   offset from the PE's inner domain;
-!   R is the Right  offset from the PE's inner domain
 !
 ! So, given an inner domain of 2,jpim1 and 2,jpjm1, a typical example would replace:
@@ -42 +42 @@
 ! with:
 !
-!   DO_2D( 0, 1, 1, 0 )
+!   DO_2D( 1, 0, 0, 1 )
 !      .
 !      .
@@ -59 +59 @@
 #endif
 
-#define DO_2D(B, T, L, R) DO jj = ntsj-(B), ntej+(T)   ;   DO ji = ntsi-(L), ntei+(R)
+#define DO_2D(L, R, B, T) DO jj = ntsj-(B), ntej+(T)   ;   DO ji = ntsi-(L), ntei+(R)
 #define A1Di(H) ntsi-H:ntei+H
 #define A1Dj(H) ntsj-H:ntej+H
@@ -70 +70 @@
 #define KJPT  :
 
-#define DO_3D(B, T, L, R, ks, ke) DO jk = ks, ke   ;   DO_2D(B, T, L, R)
+#define DO_3D(L, R, B, T, ks, ke) DO jk = ks, ke   ;   DO_2D(L, R, B, T)
 
-#define DO_3DS(B, T, L, R, ks, ke, ki) DO jk = ks, ke, ki   ;   DO_2D(B, T, L, R)
+#define DO_3DS(L, R, B, T, ks, ke, ki) DO jk = ks, ke, ki   ;   DO_2D(L, R, B, T)
 
 #define END_2D   END DO   ;   END DO