diff --git a/src/ZSOLVER/gdiv.f90 b/src/ZSOLVER/gdiv.f90 index 09c3bbd31445fc56f908763501b8435e6b396976..035d7ac6ceb04ea6d4bbd0d2e8a77fb78a07fb37 100644 --- a/src/ZSOLVER/gdiv.f90 +++ b/src/ZSOLVER/gdiv.f90 @@ -223,28 +223,16 @@ CALL CONTRAV_DEVICE(HLBCX,HLBCY,PU,PV,PW,PDXX,PDYY,PDZZ,PDZX,PDZY,ZUC,ZVC,ZWC,4, ! ---------------------- ! !$acc kernels -#ifdef MNH_COMPILER_NVHPC -!$acc loop independent collapse(3) -#endif !$mnh_do_concurrent (JI=1:IIU,JJ=1:IJU,JK=1:IKU) PGDIV(JI,JJ,JK)=0. !usefull for the four corners and halo zones !$mnh_end_do() ! -#ifdef MNH_COMPILER_NVHPC -!$acc loop independent collapse(3) -#endif !$mnh_do_concurrent (JI=IIB:IIE,JJ=1:IJU,JK=1:IKU) Z1(JI,JJ,JK)=ZUC(JI+IIB+1-(IIB) ,JJ,JK)-ZUC(JI,JJ,JK) !$mnh_end_do() -#ifdef MNH_COMPILER_NVHPC -!$acc loop independent collapse(3) -#endif !$mnh_do_concurrent (JI=1:IIU,JJ=IJB:IJE,JK=1:IKU) Z2(JI,JJ,JK)=ZVC(JI,JJ+IJB+1-(IJB) ,JK)-ZVC(JI,JJ,JK) !$mnh_end_do() -#ifdef MNH_COMPILER_NVHPC -!$acc loop independent collapse(3) -#endif !$mnh_do_concurrent (JI=1:IIU,JJ=1:IJU,JK=IKB:IKE) Z3(JI,JJ,JK)=ZWC(JI,JJ,JK+IKB+1-(IKB) )-ZWC(JI,JJ,JK) !$mnh_end_do() diff --git a/src/ZSOLVER/rain_ice_red.f90 b/src/ZSOLVER/rain_ice_red.f90 index a5f8dcd59e603326ad4f89b0cbc21e3cfffd20bd..8322ccd19af0ab7e7b69d8aca70a26ad0c56eff0 100644 --- a/src/ZSOLVER/rain_ice_red.f90 +++ b/src/ZSOLVER/rain_ice_red.f90 @@ -1476,7 +1476,6 @@ IF(HSUBG_AUCV_RC=='PDF ' .AND. CSUBG_PR_PDF=='SIGM') GTEST=.true. #endif IF(IMICRO>0) THEN -!acc loop independent !$mnh_do_concurrent(JL=1:IMICRO) ZRVT(JL) = PRVT(I1(JL),I2(JL),I3(JL)) ZRCT(JL) = PRCT(I1(JL),I2(JL),I3(JL)) @@ -2114,7 +2113,6 @@ end if IF(GEXT_TEND) THEN !$acc kernels !Z..T variables contain the exeternal tendency, we substract it -!$acc loop independent !$mnh_do_concurrent ( JL = 1 : IMICRO ) ZRVT(JL) = ZRVT(JL) - ZEXT_RV(JL) * PTSTEP ZRCT(JL) = ZRCT(JL) - ZEXT_RC(JL) * PTSTEP @@ -2127,7 +2125,6 @@ IF(GEXT_TEND) THEN !$acc end kernels IF (KRR==7) THEN !$acc kernels -!$acc loop independent !$mnh_do_concurrent ( JL = 1 : IMICRO ) ZRHT(JL) = ZRHT(JL) - ZEXT_RH(JL) * PTSTEP !$mnh_end_do()