From 31865c4ceb2c934570b9e2c08db4f95fa9f056df Mon Sep 17 00:00:00 2001
From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr>
Date: Tue, 13 Jun 2023 09:58:20 +0200
Subject: [PATCH] Juan 13/06/2023:ice4_sedimentation_split.f90 , For
gfortran+openacc ,replace DO CONCURRENT -> mnh_do_concurrent
---
src/MNH/ice4_sedimentation_split.f90 | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/MNH/ice4_sedimentation_split.f90 b/src/MNH/ice4_sedimentation_split.f90
index c8b634e3c..518ba63fb 100644
--- a/src/MNH/ice4_sedimentation_split.f90
+++ b/src/MNH/ice4_sedimentation_split.f90
@@ -646,8 +646,8 @@ DO WHILE (ANY(ZREMAINT>0.))
!$acc kernels
!******* for cloud
ZWSED(:,:,:) = 0.
-!$acc loop independent private(JI,JJ,JK,JL,ZZWLBDC,ZRAY,ZZT,ZZWLBDA,ZZCC)
- DO CONCURRENT( JL = 1 : ISEDIM )
+! acc loop independent private(JI,JJ,JK,JL,ZZWLBDC,ZRAY,ZZT,ZZWLBDA,ZZCC)
+ !$mnh_do_concurrent( JL = 1 : ISEDIM )
JI=I1(JL)
JJ=I2(JL)
JK=I3(JL)
@@ -672,14 +672,14 @@ DO WHILE (ANY(ZREMAINT>0.))
BR_POW(ZZWLBDC,-XDC)*ZZCC*PFSEDC(JI,JJ,JK) * PRXT(JI,JJ,JK)
#endif
ENDIF
- ENDDO
+ !$mnh_end_do()
!$acc end kernels
ELSEIF(KSPE==4) THEN
!$acc kernels
! ******* for pristine ice
ZWSED(:,:,:) = 0.
-!$acc loop independent private(JI,JJ,JK,JL)
- DO CONCURRENT( JL = 1 : ISEDIM )
+! acc loop independent private(JI,JJ,JK,JL)
+ !$mnh_do_concurrent( JL = 1 : ISEDIM )
JI=I1(JL)
JJ=I2(JL)
JK=I3(JL)
@@ -696,7 +696,7 @@ DO WHILE (ANY(ZREMAINT>0.))
& BR_LOG(PRHODREF(JI,JJ,JK)*PRXT(JI,JJ,JK))),XEXCSEDI)
#endif
ENDIF
- ENDDO
+ !$mnh_end_do()
!$acc end kernels
ELSE
!acc kernels
@@ -729,8 +729,8 @@ DO WHILE (ANY(ZREMAINT>0.))
!
!$acc kernels
ZWSED(:,:,:) = 0.
-!$acc loop independent private(JI,JJ,JK,JL)
- DO CONCURRENT( JL = 1 : ISEDIM )
+! acc loop independent private(JI,JJ,JK,JL)
+ !$mnh_do_concurrent( JL = 1 : ISEDIM )
JI=I1(JL)
JJ=I2(JL)
JK=I3(JL)
@@ -743,13 +743,13 @@ DO WHILE (ANY(ZREMAINT>0.))
* BR_POW(PRHODREF(JI, JJ, JK),ZEXSED-XCEXVT)
#endif
ENDIF
- ENDDO
+ !$mnh_end_do()
!$acc end kernels
ENDIF
!$acc kernels
ZMAX_TSTEP(:,:) = ZREMAINT(:,:)
-!acc loop independent private(JI,JJ,JK,JL)
- DO CONCURRENT( JL = 1 : ISEDIM )
+! acc loop independent private(JI,JJ,JK,JL)
+ !$mnh_do_concurrent( JL = 1 : ISEDIM )
JI=I1(JL)
JJ=I2(JL)
JK=I3(JL)
@@ -759,7 +759,7 @@ DO WHILE (ANY(ZREMAINT>0.))
PRXT(JI, JJ, JK) * PDZZ(JI, JJ, JK) / ZWSED(JI, JJ, JK))
!acc end atomic
ENDIF
- ENDDO
+ !$mnh_end_do()
ZREMAINT(:,:) = ZREMAINT(:,:) - ZMAX_TSTEP(:,:)
!$acc end kernels
!$acc kernels
--
GitLab