Juan 21/09/2022:rain_ice_fast_rg.f90, GPU nvhpc optimization , mv mnh_expand...

Juan 21/09/2022:rain_ice_fast_rg.f90, GPU nvhpc optimization , mv mnh_expand over tab indirection I1(1:IGDRY) <-> not parallelizing without "acc independent"

src/MNH/rain_ice_fast_rg.f90

@@ -342,6 +342,7 @@ END IF
 !*       6.2.3  select the (PLBDAG,PLBDAS) couplet
 !
 !$acc kernels
+   !$mnh_expand_where(JL=1:IGDRY)
     ZVECLBDAG(1:IGDRY) = PLBDAG(I1(1:IGDRY))
     ZVECLBDAS(1:IGDRY) = PLBDAS(I1(1:IGDRY))
 !
@@ -349,7 +350,6 @@ END IF
 !               in the geometrical set of (Lbda_g,Lbda_s) couplet use to
 !               tabulate the SDRYG-kernel
 !
-   !$mnh_expand_where(JL=1:IGDRY)
     ZVEC1(1:IGDRY) = MAX( 1.00001, MIN( REAL(NDRYLBDAG)-0.00001,           &
 #if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
                           XDRYINTP1G * LOG( ZVECLBDAG(1:IGDRY) ) + XDRYINTP2G ) )
@@ -464,6 +464,7 @@ END IF
 !*       6.2.8  select the (PLBDAG,PLBDAR) couplet
 !
 !$acc kernels
+ !$mnh_expand_where(JL=1:IGDRY)    
     ZVECLBDAG(1:IGDRY) = PLBDAG(I1(1:IGDRY))
     ZVECLBDAR(1:IGDRY) = PLBDAR(I1(1:IGDRY))
 !
@@ -471,7 +472,6 @@ END IF
 !               in the geometrical set of (Lbda_g,Lbda_r) couplet use to
 !               tabulate the RDRYG-kernel
 !
- !$mnh_expand_where(JL=1:IGDRY)    
     ZVEC1(1:IGDRY) = MAX( 1.00001, MIN( REAL(NDRYLBDAG)-0.00001,           &
 #if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
                           XDRYINTP1G * LOG( ZVECLBDAG(1:IGDRY) ) + XDRYINTP2G ) )