Changeset 14903

Timestamp:

2021-05-26T16:06:17+02:00 (3 years ago)

Author:

hadcv

Message:

#2600: Fix bug with A1Di/A1Dj/A2D macros, update standard tiling namelists

Location:

NEMO/trunk

Files:

• cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) (1 diff)
• cfgs/SHARED/namelist_ref (modified) (1 diff)
• src/OCE/do_loop_substitute.h90 (modified) (1 diff)

NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg

@@ -42 +42 @@
 &namtile        !   parameters of the tiling
 !-----------------------------------------------------------------------
-   ln_tile = .false.     !  Use tiling (T) or not (F)
-   nn_ltile_i = 10       !  Length of tiles in i
-   nn_ltile_j = 10       !  Length of tiles in j
 /
 !-----------------------------------------------------------------------

NEMO/trunk/cfgs/SHARED/namelist_ref

@@ -99 +99 @@
 !-----------------------------------------------------------------------
    ln_tile = .false.     !  Use tiling (T) or not (F)
-   nn_ltile_i = 10       !  Length of tiles in i
+   nn_ltile_i = 99999    !  Length of tiles in i
    nn_ltile_j = 10       !  Length of tiles in j
 /

NEMO/trunk/src/OCE/do_loop_substitute.h90

@@ -61 +61 @@
 #define DO_2D(L, R, B, T) DO jj = ntsj-(B), ntej+(T) ; DO ji = ntsi-(L), ntei+(R)
 #define DO_2D_OVR(L, R, B, T) DO_2D(L-(L+R)*nthl, R-(R+L)*nthr, B-(B+T)*nthb, T-(T+B)*ntht)
-#define A1Di(H) ntsi-H:ntei+H
-#define A1Dj(H) ntsj-H:ntej+H
+#define A1Di(H) ntsi-(H):ntei+(H)
+#define A1Dj(H) ntsj-(H):ntej+(H)
 #define A2D(H) A1Di(H),A1Dj(H)
 #define A1Di_T(T) (ntsi-nn_hls-1)*T+1: