Changeset 12879 for NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/do_loop_substitute.h90

Timestamp:

2020-05-06T14:38:01+02:00 (4 years ago)

Author:

hadcv

Message:

Changes following feedback

File:

• NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/do_loop_substitute.h90 (modified) (1 diff)

NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/do_loop_substitute.h90

@@ -55 +55 @@
 !
 #endif
-#define __kIs_     ntsi
-#define __kJs_     ntsj
-#define __kIsm1_   ntsim1
-#define __kJsm1_   ntsjm1
+#define __kIs_     ntsi(ntile)
+#define __kJs_     ntsj(ntile)
+#define __kIsm1_   __kIs_ - nn_hls
+#define __kJsm1_   __kJs_ - nn_hls
 
-#define __kIe_     ntei
-#define __kJe_     ntej
-#define __kIep1_   nteip1
-#define __kJep1_   ntejp1
+#define __kIe_     ntei(ntile)
+#define __kJe_     ntej(ntile)
+#define __kIep1_   __kIe_ + nn_hls
+#define __kJep1_   __kJe_ + nn_hls
 
-#define IND_2D     __kIsm1_:__kIep1_,__kJsm1_:__kJep1_
+#define A2D        __kIsm1_:__kIep1_,__kJsm1_:__kJep1_
 
 #define DO_2D_00_00   DO jj = __kJs_, __kJe_   ;   DO ji = __kIs_, __kIe_