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

Oops, nprocp => nproc_pool ... 

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1546 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2005-01-07 13:12:53 +00:00
parent f6c7dd48e0
commit dec32b1cdf
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PW/cft_3.f90
View File

@ -10,9 +10,6 @@
! ... The performance of the code may depend heavily upon the
! ... performance of these routines.
!
! ... For FFTW and AIX ESSL, there are no serial drivers:
! ... parallel drivers are used also in the serial case
!
! ... If a machine-specific routine is not available, a fake
! ... routine issuing an error message is compiled.
!

17
PW/para.f90
View File

@ -78,9 +78,6 @@ SUBROUTINE reduce( dim, ps )
USE mp, ONLY : mp_barrier
USE kinds, ONLY : DP
USE parallel_include
# if defined (__SHMEM)
USE para, ONLY : nprocp
# endif
!
IMPLICIT NONE
!
@ -160,11 +157,11 @@ SUBROUTINE reduce( dim, ps )
# if defined (__SHMEM)
!
# if defined (__ALTIX) || defined (__ORIGIN)
CALL SHMEM_REAL8_SUM_TO_ALL( buff, snd_buff(1+(n-1)*maxb), &
maxb, start, 0, nprocp, pWrkData, pWrkSync )
CALL SHMEM_REAL8_SUM_TO_ALL( buff, snd_buff(1+(n-1)*maxb), maxb, &
start, 0, nproc_pool, pWrkData, pWrkSync )
# else
CALL SHMEM_REAL8_SUM_TO_ALL( buff, ps(1+(n-1)*maxb), &
maxb, start, 0, nprocp, pWrkData, pWrkSync )
CALL SHMEM_REAL8_SUM_TO_ALL( buff, ps(1+(n-1)*maxb), maxb, &
start, 0, nproc_pool, pWrkData, pWrkSync )
#endif
!
# else
@ -188,11 +185,11 @@ SUBROUTINE reduce( dim, ps )
!
# if defined (__ALTIX) || defined (__ORIGIN)
CALL SHMEM_REAL8_SUM_TO_ALL( buff, snd_buff(1+nbuf*maxb), &
& (dim-nbuf*maxb), start, 0, nprocp, &
& (dim-nbuf*maxb), start, 0, nproc_pool,&
& pWrkData, pWrkSync )
# else
CALL SHMEM_REAL8_SUM_TO_ALL( buff, ps(1+nbuf*maxb), (dim-nbuf*maxb), &
start, 0, nprocp, pWrkData, pWrkSync )
start, 0, nproc_pool, pWrkData, pWrkSync )
# endif
!
# else
@ -346,7 +343,7 @@ END SUBROUTINE poolreduce
SUBROUTINE gather( f_in, f_out )
!----------------------------------------------------------------------------
!
! ... gathers nprocp distributed data on the first processor of every pool
! ... gathers nproc_pool distributed data on the first processor of every pool
!
! ... REAL*8 f_in = distributed variable (nxx)
! ... REAL*8 f_out = gathered variable (nrx1*nrx2*nrx3)