Skip to content
Snippets Groups Projects
Commit d4c1b0fe authored by ESCOBAR MUNOZ Juan's avatar ESCOBAR MUNOZ Juan
Browse files

Juan 16/03/2023:ZSOLVER/p_abs.f90, replace DO CONCURRENT -> mnh_do_conccurent...

Juan 16/03/2023:ZSOLVER/p_abs.f90, replace DO CONCURRENT -> mnh_do_conccurent , better perf with acc parallel
parent e28116cb
No related branches found
No related tags found
No related merge requests found
...@@ -306,8 +306,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN ...@@ -306,8 +306,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
!$acc parallel !$acc parallel
!$acc loop seq !$acc loop seq
DO JK = IKB,IKE DO JK = IKB,IKE
!$acc loop independent !$mnh_do_concurrent(JI=IIB:IIE,JJ=IJB:IJE)
DO CONCURRENT ( JJ = IJB:IJE , JI = IIB:IIE )
ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + & ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + &
#if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP) #if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
(PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD & (PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD &
...@@ -322,7 +321,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN ...@@ -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) 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) + & ZWATERMASST_2D(JI,JJ) = ZWATERMASST_2D(JI,JJ) + &
ZRTOT(JI,JJ,JK) * ZWORK(JI,JJ,JK) * PRHODREF(JI,JJ,JK) ZRTOT(JI,JJ,JK) * ZWORK(JI,JJ,JK) * PRHODREF(JI,JJ,JK)
END DO !$mnh_end_do()
END DO END DO
!$acc end parallel !$acc end parallel
! !
...@@ -377,8 +376,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN ...@@ -377,8 +376,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
!$acc parallel !$acc parallel
!$acc loop seq !$acc loop seq
DO JK = IKB,IKE DO JK = IKB,IKE
!$acc loop independent !$mnh_do_concurrent(JI=IIB:IIE,JJ=IJB:IJE )
DO CONCURRENT ( JJ = IJB:IJE , JI = IIB:IIE )
ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + & ZMASSGUESS_2D(JI,JJ) = ZMASSGUESS_2D(JI,JJ) + &
#if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP) #if !defined(MNH_BITREP) && !defined(MNH_BITREP_OMP)
(PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD & (PEXNREF(JI,JJ,JK)+PPHIT(JI,JJ,JK))**ZCVD_O_RD &
...@@ -390,7 +388,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN ...@@ -390,7 +388,7 @@ IF ( CEQNSYS=='DUR' .OR. CEQNSYS=='MAE' ) THEN
#endif #endif
#endif #endif
* ZWORK(JI,JJ,JK) / PTHETAV(JI,JJ,JK) * ZWORK(JI,JJ,JK) / PTHETAV(JI,JJ,JK)
END DO !$mnh_end_do()
END DO END DO
!$acc end parallel !$acc end parallel
ELSE ELSE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment