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

me_image replace with ionode in weights. eliminatinted obsolete me_image 

in rotate_wfc and cegterg


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@7641 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
marsamos 2011-03-30 10:23:57 +00:00
parent 0d39e04efe
commit 26648245ab
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PW/cegterg.f90
View File

@ -463,7 +463,7 @@ SUBROUTINE pcegterg( npw, npwx, nvec, nvecx, npol, evc, ethr, &
USE kinds, ONLY : DP
USE io_global, ONLY : stdout
USE mp_global, ONLY : npool, nproc_pool, me_pool, root_pool, &
intra_pool_comm, me_image, &
intra_pool_comm, &
ortho_comm, np_ortho, me_ortho, ortho_comm_id, &
leg_ortho
USE descriptors, ONLY : descla_siz_ , descla_init , descla_local_dims, lambda_node_ , &

2
PW/rotate_wfc_gamma.f90
View File

@ -150,7 +150,7 @@ SUBROUTINE protate_wfc_gamma( npwx, npw, nstart, gstart, nbnd, psi, overlap, evc
USE kinds, ONLY : DP
USE control_flags, ONLY : gamma_only
USE mp_global, ONLY : npool, nproc_pool, me_pool, root_pool, &
intra_pool_comm, me_image, &
intra_pool_comm, &
ortho_comm, np_ortho, me_ortho, ortho_comm_id,&
leg_ortho
USE descriptors, ONLY : descla_siz_ , descla_init , lambda_node_ , &

2
PW/rotate_wfc_k.f90
View File

@ -121,7 +121,7 @@ SUBROUTINE protate_wfc_k( npwx, npw, nstart, nbnd, npol, psi, overlap, evc, e )
!
USE kinds, ONLY : DP
USE mp_global, ONLY : npool, nproc_pool, me_pool, root_pool, &
intra_pool_comm, me_image, &
intra_pool_comm, &
ortho_comm, np_ortho, me_ortho, ortho_comm_id,&
leg_ortho
USE descriptors, ONLY : descla_siz_ , descla_init , lambda_node_ , &

9
PW/weights.f90
View File

@ -23,9 +23,10 @@ SUBROUTINE weights()
USE lsda_mod, ONLY : nspin, current_spin, isk
USE noncollin_module, ONLY : bfield, nspin_lsda
USE wvfct, ONLY : nbnd, wg, et
USE mp_global, ONLY : intra_image_comm, me_image, &
root_image, npool, my_pool_id, inter_pool_comm
USE mp_global, ONLY : intra_image_comm, &
npool, my_pool_id, inter_pool_comm
USE mp, ONLY : mp_bcast, mp_sum
USE io_global, ONLY : ionode, ionode_id
!
IMPLICIT NONE
!
@ -64,7 +65,7 @@ SUBROUTINE weights()
! ... Important notice: all eigenvalues (et) must be present on
! ... the first pool (poolreduce must have been called for et)
!
IF ( me_image == root_image ) THEN
IF ( ionode ) THEN
!
IF (two_fermi_energies) THEN
!
@ -84,7 +85,7 @@ SUBROUTINE weights()
!
CALL poolscatter( nbnd, nkstot, wg, nks, wg )
!
CALL mp_bcast( ef, root_image, intra_image_comm )
CALL mp_bcast( ef, ionode_id, intra_image_comm )
!
ELSE IF ( lgauss ) THEN
!