Philippe 27/06/2016: 2 gradient_m versions: with or without linearized loops...

Philippe 27/06/2016: 2 gradient_m versions: with or without linearized loops (useful for bound checking)

src/MNH/gradient_m.f90

@@ -488,6 +488,7 @@ IF (.NOT. LFLAT) THEN
 ! PGX_M_U = (   DXM(PY)  -  MZF (   MXM(  DZM(PY) /PDZZ  ) * PDZX   )   )/PDXX
 !$acc data pcopyin (pdzz,pdzx,pdxx,py)
 !$acc kernels
+#ifndef _OPT_LINEARIZED_LOOPS
   DO JK=1+JPVEXT_TURB,IKU-JPVEXT_TURB
     DO JI=1+JPHEXT,IIU
         PGX_M_U(JI,:,JK)=                                                 &
@@ -501,31 +502,31 @@ IF (.NOT. LFLAT) THEN
             )  / PDXX(JI,:,JK)
     END DO
   END DO
-!!$  JIJKOR  = 1 + JPHEXT + IIU*IJU*(JPVEXT_TURB+1 - 1)
-!!$  JIJKEND = IIU*IJU*(IKU-JPVEXT_TURB)
-!!$!CDIR NODEP
-!!$!OCL NOVREC
-!!$  DO JIJK=JIJKOR , JIJKEND
-!!$! indexation
-!!$    JI_1JK   = JIJK - 1
-!!$    JIJK_1   = JIJK     - IIU*IJU*KL
-!!$    JI_1JK_1 = JIJK - 1 - IIU*IJU*KL
-!!$    JIJKP1   = JIJK     + IIU*IJU*KL
-!!$    JI_1JKP1 = JIJK - 1 + IIU*IJU*KL
-!!$!
-!!$    PGX_M_U(JIJK,1,1)=                                              &
-!!$       (  PY(JIJK,1,1)-PY(JI_1JK,1,1)                               &
-!!$       -(  (PY(JIJK,1,1)-PY(JIJK_1,1,1))     / PDZZ(JIJK,1,1)       &
-!!$       +(PY(JI_1JK,1,1)-PY(JI_1JK_1,1,1)) / PDZZ(JI_1JK,1,1)        &
-!!$       ) * PDZX(JIJK,1,1)* 0.25                                     &
-!!$       -(  (PY(JIJKP1,1,1)-PY(JIJK,1,1))     / PDZZ(JIJKP1,1,1)     &
-!!$       +(PY(JI_1JKP1,1,1)-PY(JI_1JK,1,1)) / PDZZ(JI_1JKP1,1,1)      &
-!!$       ) * PDZX(JIJKP1,1,1)* 0.25                                   &
-!!$        )  / PDXX(JIJK,1,1)
-!!$  END DO
-
+#else
+  JIJKOR  = 1 + JPHEXT + IIU*IJU*(JPVEXT_TURB+1 - 1)
+  JIJKEND = IIU*IJU*(IKU-JPVEXT_TURB)
+!CDIR NODEP
+!OCL NOVREC
+  DO JIJK=JIJKOR , JIJKEND
+! indexation
+    JI_1JK   = JIJK - 1
+    JIJK_1   = JIJK     - IIU*IJU*KL
+    JI_1JK_1 = JIJK - 1 - IIU*IJU*KL
+    JIJKP1   = JIJK     + IIU*IJU*KL
+    JI_1JKP1 = JIJK - 1 + IIU*IJU*KL
+!
+    PGX_M_U(JIJK,1,1)=                                              &
+       (  PY(JIJK,1,1)-PY(JI_1JK,1,1)                               &
+       -(  (PY(JIJK,1,1)-PY(JIJK_1,1,1))     / PDZZ(JIJK,1,1)       &
+       +(PY(JI_1JK,1,1)-PY(JI_1JK_1,1,1)) / PDZZ(JI_1JK,1,1)        &
+       ) * PDZX(JIJK,1,1)* 0.25                                     &
+       -(  (PY(JIJKP1,1,1)-PY(JIJK,1,1))     / PDZZ(JIJKP1,1,1)     &
+       +(PY(JI_1JKP1,1,1)-PY(JI_1JK,1,1)) / PDZZ(JI_1JKP1,1,1)      &
+       ) * PDZX(JIJKP1,1,1)* 0.25                                   &
+        )  / PDXX(JIJK,1,1)
+  END DO
+#endif
 !
-! acc kernels
   DO JI=1+JPHEXT,IIU
     PGX_M_U(JI,:,KKU)=  ( PY(JI,:,KKU)-PY(JI-1,:,KKU)  )  / PDXX(JI,:,KKU) 
     PGX_M_U(JI,:,KKA)=  -999.
@@ -533,7 +534,7 @@ IF (.NOT. LFLAT) THEN
 !
   PGX_M_U(1,:,:)=PGX_M_U(IIU-2*JPHEXT+1,:,:)
 !$acc end kernels
-!$acc end data 
+!$acc end data
 ELSE
 !  PGX_M_U = DXM(PY) / PDXX
   PGX_M_U(1+JPHEXT:IIU,:,:) = ( PY(1+JPHEXT:IIU,:,:)-PY(JPHEXT:IIU-1,:,:) ) &
@@ -639,7 +640,6 @@ IJU=SIZE(PY,2)
 IKU=SIZE(PY,3)
 IF (.NOT. LFLAT) THEN 
 !  PGY_M_V = (   DYM(PY)  -  MZF (   MYM(  DZM(PY) /PDZZ  ) * PDZY   )   )/PDYY
-
 !$acc kernels
   DO JK=1+JPVEXT_TURB,IKU-JPVEXT_TURB
     DO JJ=1+JPHEXT,IJU