scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- bug fix, there was an issues in the use of both Task Group and OpenMP. 

Now OpenMP is disabled in scatter routine, but no real inpact on performance is expected.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@10876 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
ccavazzoni 2014-04-14 05:51:59 +00:00
parent f538bb0f1a
commit a6ad3dbf49
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/fft_base.f90
View File

@ -209,8 +209,9 @@ SUBROUTINE fft_scatter ( dfft, f_in, nr3x, nxx_, f_aux, ncp_, npp_, isgn, use_tg
!
IF( isgn == 1 ) THEN
!$omp parallel default(none) private(ip,ioff,i,mc,it,j) shared(dfft,nppx,sendsiz,me,f_in,f_aux)
!$omp do
!!$omp parallel default(none) private(ip,ioff,i,mc,it,j) shared(dfft,nppx,sendsiz,me,f_in,f_aux)
!!$omp do
DO ip = 1, dfft%nproc
ioff = dfft%iss( ip )
DO i = 1, dfft%nsp( ip )
@ -221,8 +222,9 @@ SUBROUTINE fft_scatter ( dfft, f_in, nr3x, nxx_, f_aux, ncp_, npp_, isgn, use_tg
ENDDO
ENDDO
ENDDO
!$omp end do
!$omp end parallel
!!$omp end do
!!$omp end parallel
ELSE
@ -234,8 +236,8 @@ SUBROUTINE fft_scatter ( dfft, f_in, nr3x, nxx_, f_aux, ncp_, npp_, isgn, use_tg
nnp = dfft%nnp
ENDIF
!
!$omp parallel default(none) private(ip,ioff,i,mc,it,j,gproc,ii) shared(dfft,nppx,npp,nnp,sendsiz,use_tg_,f_in,f_aux)
!$omp do
!!$omp parallel default(none) private(ip,ioff,i,mc,it,j,gproc,ii) shared(dfft,nppx,npp,nnp,sendsiz,use_tg_,f_in,f_aux)
!!$omp do
DO ip = 1, dfft%nproc
IF( use_tg_ ) THEN
@ -263,8 +265,8 @@ SUBROUTINE fft_scatter ( dfft, f_in, nr3x, nxx_, f_aux, ncp_, npp_, isgn, use_tg
ENDDO
!
ENDDO
!$omp end do
!$omp end parallel
!!$omp end do
!!$omp end parallel
END IF