Changeset 12586 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/do_loop_substitute.h90

Timestamp:

2020-03-23T13:14:40+01:00 (4 years ago)

Author:

francesca

Message:

Add extra-halo support (jperio 3,4) - ticket #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/do_loop_substitute.h90 (modified) (3 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/do_loop_substitute.h90

@@ -59 +59 @@
 #define __kIsm1_   1
 #define __kJsm1_   1
+#
+#define __kIsmh_   jplbi
+#define __kJsmh_   jplbj
+#define __kIsmhp1_   jplbi+1
+#define __kJsmhp1_   jplbj+1
 
-#define __kIe_     jpim1
-#define __kJe_     jpjm1
+#define __kIe_     jpi-1
+#define __kJe_     jpj-1
 #define __kIep1_   jpi
 #define __kJep1_   jpj
@@ -78 +83 @@
 #define DO_2D_10_10   DO jj = __kJsm1_, __kJe_   ;   DO ji = __kIsm1_, __kIe_
 #define DO_2D_10_11   DO jj = __kJsm1_, __kJe_   ;   DO ji = __kIsm1_, __kIep1_
+#
+#define DO_2D_20_20   DO jj = __kJsmh_, __kJe_   ;   DO ji = __kIsmh_, __kIe_
+#define DO_2D_21_21   DO jj = __kJsmh_, __kJep1_   ;   DO ji = __kIsmh_, __kIep1_
+#define DO_2D_31_31   DO jj = __kJsmhp1_, __kJep1_ ;   DO ji = __kIsmhp1_, __kIep1_
+#define DO_2D_30_30   DO jj = __kJsmhp1_, __kJe_   ;   DO ji = __kIsmhp1_, __kIe_
  
 #define DO_2D_11_00   DO jj = __kJsm1_, __kJep1_   ;   DO ji = __kIs_, __kIe_
@@ -92 +102 @@
 #define DO_3D_10_10(ks,ke)   DO jk = ks, ke   ;   DO_2D_10_10
 #define DO_3D_10_11(ks,ke)   DO jk = ks, ke   ;   DO_2D_10_11
+#
+#define DO_3D_20_20(ks,ke)   DO jk = ks, ke   ;   DO_2D_20_20
+#define DO_3D_21_21(ks,ke)   DO jk = ks, ke   ;   DO_2D_21_21
+#define DO_3D_31_31(ks,ke)   DO jk = ks, ke   ;   DO_2D_31_31
+#define DO_3D_30_30(ks,ke)   DO jk = ks, ke   ;   DO_2D_30_30
  
 #define DO_3D_11_11(ks,ke)   DO jk = ks, ke   ;   DO_2D_11_11
+#define DO_3D_21_21(ks,ke)   DO jk = ks, ke   ;   DO_2D_21_21
 
 #define DO_3DS_00_00(ks,ke,ki)   DO jk = ks, ke, ki   ;   DO_2D_00_00