Changeset 650 for codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

Timestamp:

12/22/17 01:35:23 (6 years ago)

Author:

dubos

Message:

devel/unstructured : more loop unrolling

File:

• codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90 (modified) (8 diffs)

codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

@@ -8 +8 @@
 CONTAINS
 
+#define DBL REAL(C_DOUBLE)
+
 #define INDICES1 ij,l,iq,iedge,edge,ivertex,vertex,ij_left,ij_right
 #define INDICES2 ij_up,ij_down,itrisk,edge_trisk,kup,kdown
+#define EDGES edge1,edge2,edge3,edge4,edge5,edge6
+#define VERTICES vertex1,vertex2,vertex3,vertex4,vertex5,vertex6
+#define SIGNS sign1,sign2,sign3,sign4,sign5,sign6
+#define EDGE_ENDS ij_up1,ij_up2,ij_up3,ij_up4,ij_up5,ij_up6,ij_down1,ij_down2,ij_down3,ij_down4,ij_down5,ij_down6
+#define LENGTHS le_de1,le_de2,le_de3,le_de4,le_de5,le_de6
 #define DECLARE_INDICES INTEGER INDICES1,INDICES2
+#define DECLARE_EDGES DBL SIGNS,LENGTHS ; INTEGER EDGES, EDGE_ENDS
+#define DECLARE_VERTICES INTEGER VERTICES
 #define PHI_BOT(ij) Phi_bot
 #define PHI_BOT_VAR 0.
@@ -17 +26 @@
 #define BINDC(thename) BINDC_(dynamico_ ## thename)
 
-#define DBL REAL(C_DOUBLE)
 #define DOUBLE1(m) DBL, DIMENSION(m)
 #define DOUBLE2(m,n) DBL, DIMENSION(m,n)
@@ -49 +57 @@
   FIELD_UL     :: DePhil, v_el, G_el, F_el ! LOCAL
   DECLARE_INDICES
+  DECLARE_EDGES
   DBL :: W_el, W2_el, gPhi2, dP, divG, u2, uu
 #include "../kernels_unst/caldyn_slow_NH.k90"
@@ -90 +99 @@
   FIELD_U     :: u,hflux,du ! IN, OUT, OUT
   DECLARE_INDICES
+  DECLARE_EDGES
   LOGICAL, PARAMETER :: zero=.TRUE.
   DBL :: ke, uu
@@ -118 +128 @@
   FIELD_THETA :: theta, dtheta_rhodz
   DECLARE_INDICES
+  DECLARE_EDGES
   DBL :: divF, du_trisk
 #include "../kernels_unst/coriolis.k90"
@@ -136 +147 @@
   FIELD_Z    :: qv
   DECLARE_INDICES
+  DECLARE_EDGES
+  DECLARE_VERTICES
   DBL :: etav, hv
 #include "../kernels_unst/pvort_only.k90"
@@ -147 +160 @@
   FIELD_U      :: u,du      ! INOUT,INOUT
   DECLARE_INDICES
+  DECLARE_EDGES
   DBL          :: due
 
@@ -166 +180 @@
   DOUBLE2(llm,edge_num)  :: u
   DECLARE_INDICES
+  DECLARE_EDGES
   DBL :: div_ij
   !$OMP PARALLEL NUM_THREADS(nb_threads)