Changeset 12906 for NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/do_loop_substitute.h90

Timestamp:

2020-05-11T19:19:46+02:00 (4 years ago)

Author:

hadcv

Message:

Implement tiling trial in extended haloes development

File:

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

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/do_loop_substitute.h90

@@ -102 +102 @@
 
 ! 2D loops with 1
-
-#define DO_2D_00_00   DO jj = Njs0, Nje0   ;   DO ji = Nis0, Nie0
-#define DO_2D_00_01   DO jj = Njs0, Nje0   ;   DO ji = Nis0, Nie1
-#define DO_2D_00_10   DO jj = Njs0, Nje0   ;   DO ji = Nis1, Nie0
-#define DO_2D_00_11   DO jj = Njs0, Nje0   ;   DO ji = Nis1, Nie1
+#define Ntis0      ntsi(ntile)
+#define Ntjs0      ntsj(ntile)
+#define Ntis1      Ntis0 - 1
+#define Ntjs1      Ntjs0 - 1
+#define Ntis2      Ntis0 - nn_hls
+#define Ntjs2      Ntjs0 - nn_hls
+#define Ntie0      ntei(ntile)
+#define Ntje0      ntej(ntile)
+#define Ntie1      Ntie0 + 1
+#define Ntje1      Ntje0 + 1
+#define Ntie2      Ntie0 + nn_hls
+#define Ntje2      Ntje0 + nn_hls
+#define A2D        Ntis2:Ntie2,Ntjs2:Ntje2
+
+#define DO_2D_00_00   DO jj = Ntjs0, Ntje0   ;   DO ji = Ntis0, Ntie0
+#define DO_2D_00_01   DO jj = Ntjs0, Ntje0   ;   DO ji = Ntis0, Ntie1
+#define DO_2D_00_10   DO jj = Ntjs0, Ntje0   ;   DO ji = Ntis1, Ntie0
+#define DO_2D_00_11   DO jj = Ntjs0, Ntje0   ;   DO ji = Ntis1, Ntie1
  
-#define DO_2D_01_00   DO jj = Njs0, Nje1   ;   DO ji = Nis0, Nie0
-#define DO_2D_01_01   DO jj = Njs0, Nje1   ;   DO ji = Nis0, Nie1
-#define DO_2D_01_10   DO jj = Njs0, Nje1   ;   DO ji = Nis1, Nie0
-#define DO_2D_01_11   DO jj = Njs0, Nje1   ;   DO ji = Nis1, Nie1
+#define DO_2D_01_00   DO jj = Ntjs0, Ntje1   ;   DO ji = Ntis0, Ntie0
+#define DO_2D_01_01   DO jj = Ntjs0, Ntje1   ;   DO ji = Ntis0, Ntie1
+#define DO_2D_01_10   DO jj = Ntjs0, Ntje1   ;   DO ji = Ntis1, Ntie0
+#define DO_2D_01_11   DO jj = Ntjs0, Ntje1   ;   DO ji = Ntis1, Ntie1
  
-#define DO_2D_10_00   DO jj = Njs1, Nje0   ;   DO ji = Nis0, Nie0
-#define DO_2D_10_01   DO jj = Njs1, Nje0   ;   DO ji = Nis0, Nie1   ! not used ?
-#define DO_2D_10_10   DO jj = Njs1, Nje0   ;   DO ji = Nis1, Nie0
-#define DO_2D_10_11   DO jj = Njs1, Nje0   ;   DO ji = Nis1, Nie1
+#define DO_2D_10_00   DO jj = Ntjs1, Ntje0   ;   DO ji = Ntis0, Ntie0
+#define DO_2D_10_01   DO jj = Ntjs1, Ntje0   ;   DO ji = Ntis0, Ntie1   ! not used ?
+#define DO_2D_10_10   DO jj = Ntjs1, Ntje0   ;   DO ji = Ntis1, Ntie0
+#define DO_2D_10_11   DO jj = Ntjs1, Ntje0   ;   DO ji = Ntis1, Ntie1
  
-#define DO_2D_11_00   DO jj = Njs1, Nje1   ;   DO ji = Nis0, Nie0
-#define DO_2D_11_01   DO jj = Njs1, Nje1   ;   DO ji = Nis0, Nie1
-#define DO_2D_11_10   DO jj = Njs1, Nje1   ;   DO ji = Nis1, Nie0
-#define DO_2D_11_11   DO jj = Njs1, Nje1   ;   DO ji = Nis1, Nie1
+#define DO_2D_11_00   DO jj = Ntjs1, Ntje1   ;   DO ji = Ntis0, Ntie0
+#define DO_2D_11_01   DO jj = Ntjs1, Ntje1   ;   DO ji = Ntis0, Ntie1
+#define DO_2D_11_10   DO jj = Ntjs1, Ntje1   ;   DO ji = Ntis1, Ntie0
+#define DO_2D_11_11   DO jj = Ntjs1, Ntje1   ;   DO ji = Ntis1, Ntie1
 
 ! 2D loops with 1 following a 2/3D loop with 2