Philippe 30/11/2021: LOCAL locality is supported by most compilers for DO CONCURRENT

src/MNH/rain_ice_fast_rs.f90

@@ -216,12 +216,7 @@ CALL COUNTJV_DEVICE( GWORK(:), I1(:), IGRIM )
 !        5.1.4  riming of the small sized aggregates
 !
     !$acc loop independent , private (JL)
-    DO CONCURRENT ( JJ = 1:IGRIM ) &
-#if defined(MNH_OPENACC) && !defined(_FAKEOPENACC)      
-         LOCAL(JL)
-#else
- & !     LOCAL(JL)     
-#endif              
+    DO CONCURRENT ( JJ = 1:IGRIM ) LOCAL(JL)
       JL = I1(JJ)
 #ifndef MNH_BITREP
       ZZW1(JJ) = MIN( PRCS(JL),                           &
@@ -261,13 +256,7 @@ END IF
 !
     !
     !$acc loop independent , private (JL)
-    DO CONCURRENT (JJ = 1:IGRIM ) &
-#if defined(MNH_OPENACC) && !defined(_FAKEOPENACC)
-         LOCAL(JL)
-#else
- & !     LOCAL(JL)  
-#endif
-       
+    DO CONCURRENT (JJ = 1:IGRIM ) LOCAL(JL)
       JL = I1(JJ)
       IF ( PRSS(JL) > 0.0 ) THEN
 #ifndef MNH_BITREP
@@ -407,13 +396,7 @@ END IF
 !        5.2.4  raindrop accretion on the small sized aggregates
 !
 !$acc loop independent , private (JL)
-    DO CONCURRENT ( JJ = 1:IGACC ) &
-#if defined(MNH_OPENACC) && !defined(_FAKEOPENACC)     
-         LOCAL(JL)
-#else
- & !     LOCAL(JL)  
-#endif       
- 
+    DO CONCURRENT ( JJ = 1:IGACC ) LOCAL(JL)
       JL = I1(JJ)
 #ifndef MNH_BITREP
       ZZW2(JJ) =                                                          & !! coef of RRACCS
@@ -479,13 +462,7 @@ END IF
 !               into graupeln
     !
     !$acc loop independent , private (JL)
-    DO CONCURRENT ( JJ = 1:IGACC ) &
-#if defined(MNH_OPENACC) && !defined(_FAKEOPENACC)     
-         LOCAL(JL)
-#else
- & !     LOCAL(JL)     
-#endif       
- 
+    DO CONCURRENT ( JJ = 1:IGACC ) LOCAL(JL)
       JL = I1(JJ)
       IF ( PRSS(JL) > 0.0 ) THEN
         ZZW2(JJ) = MAX( MIN( PRRS(JL),ZZW2(JJ)-ZZW4(JJ) ),0.0 )       ! RRACCSG