From d4c1b0fe23a3e1983770a5469c638a0a8c95f70a Mon Sep 17 00:00:00 2001
From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr>
Date: Thu, 16 Mar 2023 19:01:15 +0100
Subject: [PATCH] Juan 16/03/2023:ZSOLVER/p_abs.f90, replace DO CONCURRENT ->
mnh_do_conccurent , better perf with acc parallel
---
src/ZSOLVER/p_abs.f90 | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/ZSOLVER/p_abs.f90 b/src/ZSOLVER/p_abs.f90
index 962230cde..5f6bc62e9 100644
--- a/src/ZSOLVER/p_abs.f90
+++ b/src/ZSOLVER/p_abs.f90
@@ -306,8 +306,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
!$acc parallel
!$acc loop seq
DO JK = IKB,IKE
- !$acc loop independent
- DO CONCURRENT ( JJ = IJB:IJE , JI = IIB:IIE )
+ !$mnh_do_concurrent(JI=IIB:IIE,JJ=IJB:IJE)
ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + &
#if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
(PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD &
@@ -322,7 +321,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
ZMASS_O_PI_2D(JI,JJ) = ZMASS_O_PI_2D(JI,JJ) + ZWORK(JI,JJ,JK) / PTHETAV(JI,JJ,JK)
ZWATERMASST_2D(JI,JJ) = ZWATERMASST_2D(JI,JJ) + &
ZRTOT(JI,JJ,JK) * ZWORK(JI,JJ,JK) * PRHODREF(JI,JJ,JK)
- END DO
+ !$mnh_end_do()
END DO
!$acc end parallel
!
@@ -377,8 +376,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
!$acc parallel
!$acc loop seq
DO JK = IKB,IKE
- !$acc loop independent
- DO CONCURRENT ( JJ = IJB:IJE , JI = IIB:IIE )
+ !$mnh_do_concurrent(JI=IIB:IIE,JJ=IJB:IJE )
ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + &
#if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
(PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD &
@@ -390,7 +388,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
#endif
#endif
* ZWORK(JI,JJ,JK) / PTHETAV(JI,JJ,JK)
- END DO
+ !$mnh_end_do()
END DO
!$acc end parallel
ELSE
--
GitLab