Juan 07/03/2022:ZSOLVER/advection_uvw.f90,Cray Optimisation, replace loop or...

Juan 07/03/2022:ZSOLVER/advection_uvw.f90,Cray Optimisation, replace loop or ARRAY SYNTAX by DO CONCURRENT

src/ZSOLVER/advection_uvw.f90

@@ -197,6 +197,8 @@ TYPE(LIST_ll), POINTER      :: TZFIELDS0_ll ! list of fields to exchange
 !
 INTEGER :: IIU,IJU,IKU
 !
+INTEGER :: JI,JJ,JK
+!
 !-------------------------------------------------------------------------------
 !
 !*       0.     INITIALIZATION
@@ -273,8 +275,8 @@ CALL MNH_MEM_GET( ZMZM_RHODJ, IIU, IJU, IKU )
 #endif
 
 !$acc data present( zrut, zrvt, zrwt, zruct, zrvct, zrwct, zu, zv, zw,                &
-!$acc &            zrus_other, zrvs_other, zrws_other, zrus_adv, zrvs_adv, zrws_adv, &
-!$acc &            zmxm_rhodj, zmym_rhodj, zmzm_rhodj  )
+!$acc &             zrus_other, zrvs_other, zrws_other, zrus_adv, zrvs_adv, zrws_adv, &
+!$acc &             zmxm_rhodj, zmym_rhodj, zmzm_rhodj  )
 
 IKE = SIZE(PWT,3) - JPVEXT
 !
@@ -435,24 +437,32 @@ DO JSPL=1,ISPLIT
 ! Tendencies on wind
 !$acc update device(ZRUS_ADV,ZRVS_ADV,ZRWS_ADV)
 !$acc kernels
-  PRUS(:,:,:) = PRUS(:,:,:) + ZRUS_ADV(:,:,:) / ISPLIT
-  PRVS(:,:,:) = PRVS(:,:,:) + ZRVS_ADV(:,:,:) / ISPLIT
-  PRWS(:,:,:) = PRWS(:,:,:) + ZRWS_ADV(:,:,:) / ISPLIT
-!$acc end kernels  
-!
+#ifdef MNH_COMPILER_NVHPC  
+!$acc loop independent collapse(3)
+#endif     
+DO CONCURRENT (JI=1:IIU , JJ=1:IJU , JK=1:IKU )
+  PRUS(JI,JJ,JK) = PRUS(JI,JJ,JK) + ZRUS_ADV(JI,JJ,JK) / ISPLIT
+  PRVS(JI,JJ,JK) = PRVS(JI,JJ,JK) + ZRVS_ADV(JI,JJ,JK) / ISPLIT
+  PRWS(JI,JJ,JK) = PRWS(JI,JJ,JK) + ZRWS_ADV(JI,JJ,JK) / ISPLIT
+END DO
   IF (JSPL<ISPLIT) THEN
 !
 ! Guesses for next time splitting loop
-  !
-  !$acc kernels   
-  ZU(:,:,:) = ZU(:,:,:) + ZTSTEP / ZMXM_RHODJ *  &
-              (ZRUS_OTHER(:,:,:) + ZRUS_ADV(:,:,:))
-  ZV(:,:,:) = ZV(:,:,:) + ZTSTEP / ZMYM_RHODJ *  &
-              (ZRVS_OTHER(:,:,:) + ZRVS_ADV(:,:,:))
-  ZW(:,:,:) = ZW(:,:,:) + ZTSTEP / ZMZM_RHODJ *  &
-              (ZRWS_OTHER(:,:,:) + ZRWS_ADV(:,:,:))
-  !$acc end kernels
- END IF
+!
+!
+#ifdef MNH_COMPILER_NVHPC  
+!$acc loop independent collapse(3)
+#endif     
+DO CONCURRENT (JI=1:IIU , JJ=1:IJU , JK=1:IKU )
+  ZU(JI,JJ,JK) = ZU(JI,JJ,JK) + ZTSTEP / ZMXM_RHODJ(JI,JJ,JK) *  &
+              (ZRUS_OTHER(JI,JJ,JK) + ZRUS_ADV(JI,JJ,JK))
+  ZV(JI,JJ,JK) = ZV(JI,JJ,JK) + ZTSTEP / ZMYM_RHODJ(JI,JJ,JK) *  &
+              (ZRVS_OTHER(JI,JJ,JK) + ZRVS_ADV(JI,JJ,JK))
+  ZW(JI,JJ,JK) = ZW(JI,JJ,JK) + ZTSTEP / ZMZM_RHODJ(JI,JJ,JK) *  &
+              (ZRWS_OTHER(JI,JJ,JK) + ZRWS_ADV(JI,JJ,JK))
+END DO
+END IF
+!$acc end kernels
 !
 ! Top and bottom Boundaries 
 !