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

Juan 19/06/2023:rain_ice_sedimentation_split.f90, For pref PB with nvhpc ,...

Juan 19/06/2023:rain_ice_sedimentation_split.f90, For pref PB with nvhpc , reintroduce mnh_expand_array & MNH_MEM_GET(ZRTMIN...) + replace data create -> present
parent 1fd2acd8
No related branches found
No related tags found
No related merge requests found
...@@ -245,7 +245,6 @@ CALL MNH_MEM_GET( GSEDIMS,IIU,IJU,IKU ) ...@@ -245,7 +245,6 @@ CALL MNH_MEM_GET( GSEDIMS,IIU,IJU,IKU )
CALL MNH_MEM_GET( GSEDIMG,IIU,IJU,IKU ) CALL MNH_MEM_GET( GSEDIMG,IIU,IJU,IKU )
CALL MNH_MEM_GET( GSEDIMH,IIU,IJU,IKU ) CALL MNH_MEM_GET( GSEDIMH,IIU,IJU,IKU )
#endif #endif
ALLOCATE( ZRTMIN(SIZE(XRTMIN)) )
#ifndef MNH_OPENACC #ifndef MNH_OPENACC
ALLOCATE( ZCONC_TMP(IIU,IJU) ) ALLOCATE( ZCONC_TMP(IIU,IJU) )
ALLOCATE( ZOMPSEA (IIU,IJU) ) ALLOCATE( ZOMPSEA (IIU,IJU) )
...@@ -264,6 +263,7 @@ ALLOCATE( ZPRGS (IIU,IJU,IKU) ) ...@@ -264,6 +263,7 @@ ALLOCATE( ZPRGS (IIU,IJU,IKU) )
ALLOCATE( ZPRHS (IIU,IJU,IKU) ) ALLOCATE( ZPRHS (IIU,IJU,IKU) )
ALLOCATE( ZW (IIU,IJU,IKU) ) ALLOCATE( ZW (IIU,IJU,IKU) )
ALLOCATE( ZWSED (IIU,IJU,0:IKU+1) ) ALLOCATE( ZWSED (IIU,IJU,0:IKU+1) )
ALLOCATE( ZRTMIN(SIZE(XRTMIN)) )
#else #else
CALL MNH_MEM_GET( ZCONC_TMP,IIU,IJU ) CALL MNH_MEM_GET( ZCONC_TMP,IIU,IJU )
CALL MNH_MEM_GET( ZOMPSEA ,IIU,IJU ) CALL MNH_MEM_GET( ZOMPSEA ,IIU,IJU )
...@@ -282,11 +282,12 @@ CALL MNH_MEM_GET( ZPRGS ,IIU,IJU,IKU ) ...@@ -282,11 +282,12 @@ CALL MNH_MEM_GET( ZPRGS ,IIU,IJU,IKU )
CALL MNH_MEM_GET( ZPRHS ,IIU,IJU,IKU ) CALL MNH_MEM_GET( ZPRHS ,IIU,IJU,IKU )
CALL MNH_MEM_GET( ZW ,IIU,IJU,IKU ) CALL MNH_MEM_GET( ZW ,IIU,IJU,IKU )
CALL MNH_MEM_GET( ZWSED, 1, IIU, 1, IJU, 0, IKU+1 ) CALL MNH_MEM_GET( ZWSED, 1, IIU, 1, IJU, 0, IKU+1 )
CALL MNH_MEM_GET( ZRTMIN , SIZE(XRTMIN) )
#endif #endif
!$acc data present( IC1, IC2, IC3, IR1, IR2, IR3, IS1, IS2, IS3, II1, II2, II3, IG1, IG2, IG3, IH1, IH2, IH3,& !$acc data present( IC1, IC2, IC3, IR1, IR2, IR3, IS1, IS2, IS3, II1, II2, II3, IG1, IG2, IG3, IH1, IH2, IH3,&
!$acc & GDEP, GSEDIMR, GSEDIMC, GSEDIMI, GSEDIMS, GSEDIMG, GSEDIMH ) & !$acc & GDEP, GSEDIMR, GSEDIMC, GSEDIMI, GSEDIMS, GSEDIMG, GSEDIMH ) &
!$acc & create( ZRTMIN ) & !$acc & present( ZRTMIN ) &
!$acc & present(ZCONC_TMP, & !$acc & present(ZCONC_TMP, &
!$acc & ZOMPSEA, ZTMP1_2D, ZTMP2_2D, ZTMP3_2D, ZTMP4_2D, ZCONC3D, & !$acc & ZOMPSEA, ZTMP1_2D, ZTMP2_2D, ZTMP3_2D, ZTMP4_2D, ZCONC3D, &
!$acc & ZRAY, ZLBC, ZFSEDC, & !$acc & ZRAY, ZLBC, ZFSEDC, &
...@@ -433,7 +434,7 @@ DO JN = 1 , KSPLITR ...@@ -433,7 +434,7 @@ DO JN = 1 , KSPLITR
IF ( KRR == 7 ) PRHS(:,:,:) = PRHS(:,:,:) + ZPRHS(:,:,:) * ZTSPLITR IF ( KRR == 7 ) PRHS(:,:,:) = PRHS(:,:,:) + ZPRHS(:,:,:) * ZTSPLITR
END IF END IF
! !
! mnh_do_concurrent( JI=KIB:KIE,JJ=KJB:KJE,JK=KKTB:KKTE ) !$mnh_expand_array( JI=KIB:KIE,JJ=KJB:KJE,JK=KKTB:KKTE )
IF ( GSEDIC ) GSEDIMC(:,:,:) = & IF ( GSEDIC ) GSEDIMC(:,:,:) = &
PRCS(:,:,:) > ZRTMIN(2) PRCS(:,:,:) > ZRTMIN(2)
GSEDIMR(:,:,:) = & GSEDIMR(:,:,:) = &
...@@ -446,7 +447,7 @@ DO JN = 1 , KSPLITR ...@@ -446,7 +447,7 @@ DO JN = 1 , KSPLITR
PRGS(:,:,:) > ZRTMIN(6) PRGS(:,:,:) > ZRTMIN(6)
IF ( GKRR_7 ) GSEDIMH(:,:,:) = & IF ( GKRR_7 ) GSEDIMH(:,:,:) = &
PRHS(:,:,:) > ZRTMIN(7) PRHS(:,:,:) > ZRTMIN(7)
! mnh_end_do() ! CONCURRENT !$mnh_end_expand_array() ! CONCURRENT
!$acc end kernels !$acc end kernels
! !
#ifndef MNH_OPENACC #ifndef MNH_OPENACC
......
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