Juan 21/04/2022:Juan:ZSOLVER/ , Cray Bug/Opt Bypass , use do conccurrent +...

Juan 21/04/2022:Juan:ZSOLVER/ , Cray Bug/Opt Bypass , use do conccurrent + present_cr + acc_nv + dir concurrent

src/ZSOLVER/tridiag_thermo.f90

@@ -258,17 +258,11 @@ ZMZM_RHODJ = MZM(PRHODJ)
 #else
 CALL MZM_DEVICE(PRHODJ,ZMZM_RHODJ)
 #endif
-#ifdef MNH_COMPILER_CCE
-!$acc kernels present(ZRHODJ_DFDDTDZ_O_DZ2) ! async
-#else
-!$acc kernels 
-#endif
+!$acc kernels present_cr(ZRHODJ_DFDDTDZ_O_DZ2) ! async
 #ifndef MNH_BITREP
 ZRHODJ_DFDDTDZ_O_DZ2(:,:,:) = ZMZM_RHODJ(:,:,:)*PDFDDTDZ(:,:,:)/PDZZ(:,:,:)**2
 #else
-#ifdef MNH_COMPILER_NVHPC
-!$acc loop independent collapse(3)
-#endif
+!$acc_nv loop independent collapse(3)
 DO CONCURRENT ( JI=1:JIU,JJ=1:JJU,JK=1:JKU) 
    ZRHODJ_DFDDTDZ_O_DZ2(JI,JJ,JK) = ZMZM_RHODJ(JI,JJ,JK)*PDFDDTDZ(JI,JJ,JK)/BR_P2(PDZZ(JI,JJ,JK))
 END DO !CONCURRENT   
@@ -399,9 +393,7 @@ END DO !CONCURRENT
 !$acc loop seq
 DO JK = IKB+KKL,IKE-KKL,KKL
    ! gang+vector needed or parallisation vector only
-#ifdef MNH_COMPILER_NVHPC
-   !$acc loop independent gang, vector collapse(2)   
-#endif
+   !$acc_nv loop independent gang, vector collapse(2)   
    DO CONCURRENT ( JI=1:JIU,JJ=1:JJU)
       ZGAM(JI,JJ,JK) = ZC(JI,JJ,JK-KKL) / ZBET(JI,JJ)  
       ! gam(k) = c(k-1) / bet
@@ -430,9 +422,7 @@ END DO !CONCURRENT
 !$acc loop seq
 DO JK = IKE-KKL,IKB,-1*KKL
    ! gang+vector needed or parallisation vector only
-#ifdef MNH_COMPILER_NVHPC
-   !$acc loop independent gang, vector collapse(2)
-#endif
+   !$acc_nv loop independent gang, vector collapse(2)
    DO CONCURRENT ( JI=1:JIU,JJ=1:JJU)
       PVARP(JI,JJ,JK) = PVARP(JI,JJ,JK) - ZGAM(JI,JJ,JK+KKL) * PVARP(JI,JJ,JK+KKL)
    END DO !CONCURRENT