diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index d54409639d5a2b9ac09b87ac85ed31599c42bfe3..408861cddf11554929925b44c84373269cecc515 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -190,7 +190,7 @@ USE MODI_ADV_BOUNDARIES
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 USE MODI_BITREP
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 !$mnh_undef(OPENACC)
 #endif
diff --git a/src/MNH/gradient_m.f90 b/src/MNH/gradient_m.f90
index 9353d3f20dc559bf2f5fb2712dec30f3b37aedea..15ced819881101e4ca0b3212c44407fe3bfa4137 100644
--- a/src/MNH/gradient_m.f90
+++ b/src/MNH/gradient_m.f90
@@ -866,7 +866,7 @@ INTEGER  IIU,IJU,IKU,JI
 IIU=SIZE(PY,1)
 IJU=SIZE(PY,2)
 IKU=SIZE(PY,3)
-!$acc kernels present_cr(PGX_M_U)
+!$acc kernels !!!!present_cr(PGX_M_U)
 IF (.NOT. LFLAT) THEN 
 PGX_M_U(1+JPHEXT:IIU,1:IJU,1+JPVEXT_TURB:IKU-JPVEXT_TURB) = &
   (  PY(1+JPHEXT:IIU,1:IJU,1+JPVEXT_TURB:IKU-JPVEXT_TURB)-PY(JPHEXT:IIU-1,1:IJU,1+JPVEXT_TURB:IKU-JPVEXT_TURB)      &
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 321e097e185c1671a776e030e80f7173e741dbb8..c2ba3b9d0125c05806a1ce1905929e3720456dbf 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -1676,7 +1676,7 @@ CALL GRAVITY_IMPL ( CLBCX, CLBCY, NRR, NRRL, NRRI,XTSTEP,            &
 ! compensated by the pressure gradient
 !
 IF (KTCOUNT == 1 .AND. CCONF=='START') THEN
-!$acc kernels present( ZRWS )
+!$acc kernels present( ZRWS,XRWS_PRES )
   XRWS_PRES(:,:,:) = ZRWS(:,:,:) - XRWS(:,:,:)
 !$acc end kernels
 END IF
diff --git a/src/MNH/prandtl.f90 b/src/MNH/prandtl.f90
index 892901e7153a936c9f598f7940f61b70339aaaad..f2cc9f810f3a36a4769bae4ad7b07f094e0a44bb 100644
--- a/src/MNH/prandtl.f90
+++ b/src/MNH/prandtl.f90
@@ -209,7 +209,7 @@ use mode_msg
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 USE MODI_BITREP
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 !$mnh_undef(OPENACC)
 #endif
diff --git a/src/MNH/rain_ice_fast_rg.f90 b/src/MNH/rain_ice_fast_rg.f90
index 7087c38bd619b0c861a7902254a8319143d563b0..14101b80037ee6d9d656237d2199ad2e71120d3c 100644
--- a/src/MNH/rain_ice_fast_rg.f90
+++ b/src/MNH/rain_ice_fast_rg.f90
@@ -57,7 +57,7 @@ use mode_tools,                        only: Countjv_device
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 USE MODI_BITREP
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 ! mnh_undef(OPENACC)
 #endif
diff --git a/src/MNH/rain_ice_fast_ri.f90 b/src/MNH/rain_ice_fast_ri.f90
index 4ed0d86058d6aa13ee675e12f99b04e26679342b..8efd9cf0cfd7a0ba95e0802bfd0b2d4abf7d359f 100644
--- a/src/MNH/rain_ice_fast_ri.f90
+++ b/src/MNH/rain_ice_fast_ri.f90
@@ -40,7 +40,7 @@ use mode_mppdb
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 USE MODI_BITREP
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 !$mnh_undef(OPENACC)
 #endif
diff --git a/src/MNH/rain_ice_slow.f90 b/src/MNH/rain_ice_slow.f90
index 1332542d066e6bbe45287d55b56804bc6a63e498..690cbda36b5fbe985e99272d99da77b7d18b737f 100644
--- a/src/MNH/rain_ice_slow.f90
+++ b/src/MNH/rain_ice_slow.f90
@@ -42,7 +42,7 @@ use mode_mppdb
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 USE MODI_BITREP
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 !$mnh_undef(OPENACC)
 #endif
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index 0870549d407b4d22330b48ed4d6b8d13cc42bb83..0d5eca9b9b2013711c7ae68bf5e603936c8f1f2c 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -718,7 +718,7 @@ ENDIF
 !  complete the lateral boundaries to avoid possible problems
 !
 !dir$ concurrent
-DO JI=1,JPHEXT
+DO CONCURRENT (JI=1:JPHEXT)
  PTHS(JI,:,:) = PTHS(IIB,:,:)
  PTHS(IIE+JI,:,:) = PTHS(IIE,:,:)
  PTHS(:,JI,:) = PTHS(:,IJB,:)
@@ -932,7 +932,7 @@ CALL PRINT_MSG(NVERB_FATAL,'GEN','RESOLVED_CLOUD','C2R2//KHKO not yet implemente
 #if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
     ZEXN(:,:,:)= (PPABST(:,:,:)/XP00)**(XRD/XCPD)
 #else
-DO CONCURRENT ( JI=1:JIU,JJ=1:JJU,JK=1:JKU )
+DO CONCURRENT (JK=1:JKU,JJ=1:JJU,JI=1:JIU)
     ZEXN(JI,JJ,JK)= BR_POW( PPABST(JI,JJ,JK)/XP00, XRD/XCPD )
 ENDDO
 #endif
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index 266e76bd76387151cb94d7d33baed3d423448a11..abfde1c07e497aa2ca8f533e93754fe493cf832f 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -14,7 +14,7 @@ module mode_turb
 #if defined(MNH_BITREP) || defined(MNH_BITREP_OMP)
 use modi_bitrep
 #endif
-#ifdef MNH_BITREP_OMP
+#ifdef MNH_COMPILER_CCE
 !$mnh_undef(LOOP)
 !$mnh_undef(OPENACC)  
 #endif
@@ -1853,7 +1853,7 @@ CALL MNH_MEM_GET( zrvsat   , size( pexn, 1 ), size( pexn, 2 ), size( pexn, 3 ) )
 CALL MNH_MEM_GET( zdrvsatdt, size( pexn, 1 ), size( pexn, 2 ), size( pexn, 3 ) )
 #endif
 
-!$acc data present( zrvsat, zdrvsatdt )
+!$acc data present_cr( zrvsat, zdrvsatdt )
 
   ZEPS = XMV / XMD
 !