diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90 index 55ed76c0701f039e5602fc3cae95cf6c02c76bb0..4bf99d54f2cb0f3829e79279c6621544126c4613 100644 --- a/src/MNH/turb_hor_uv.f90 +++ b/src/MNH/turb_hor_uv.f90 @@ -449,12 +449,10 @@ ZTMP6_DEVICE(:,:,1) = ( ZTMP1_DEVICE(:,:,1) - ZTMP4_DEVICE(:,:,1)*0.5*ZTMP2_DEVI CALL MXM_DEVICE(PK(:,:,IKB:IKB),ZTMP1_DEVICE(:,:,1:1)) CALL MYM_DEVICE(ZTMP1_DEVICE(:,:,1:1),ZTMP2_DEVICE(:,:,1:1)) ! -#ifdef MNH_COMPILER_CCE -!$acc kernels present(ZFLX) -#else -!$acc kernels -#endif +!$acc kernels present_cr(ZFLX) +!$mnh_expand_array(JI=1:JIU,JJ=1:JJU) ZFLX(:,:,IKB) = - XCMFS * ZTMP2_DEVICE(:,:,1) * ( ZTMP5_DEVICE(:,:,1) + ZTMP6_DEVICE(:,:,1) ) +!$mnh_end_expand_array() !$acc end kernels #endif ! @@ -476,7 +474,7 @@ ZFLX(:,:,IKB) = - XCMFS * ZTMP2_DEVICE(:,:,1) * ( ZTMP5_DEVICE(:,:,1) + ZTMP6_DE #else #ifdef MNH_COMPILER_NVHPC !PW: BUG: commented 'acc loop independent collapse(2)' to workaround compiler bug (NVHPC 21.1) -!$mnh_undef(OPENACC) +! mnh_undef(OPENACC) #endif !$mnh_expand_array(JI=1:JIU,JJ=1:JJU) ZFLX(:,:,IKB-1) = & @@ -491,7 +489,7 @@ ZFLX(:,:,IKB) = - XCMFS * ZTMP2_DEVICE(:,:,1) * ( ZTMP5_DEVICE(:,:,1) + ZTMP6_DE +PVSLOPEM(:,:) * (BR_P2(PCOSSLOPE(:,:)) - BR_P2(PSINSLOPE(:,:))) * ZDIRSINZW(:,:) ) !$mnh_end_expand_array() #ifdef MNH_COMPILER_NVHPC -!$mnh_define(OPENACC) +! mnh_define(OPENACC) #endif #endif !$acc end kernels