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

Cleanup of unused variables and routines; some comments updated. 

Note that this comit will break compilation of GWW


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@9835 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2013-01-22 11:07:54 +00:00
parent c6c82dc0f5
commit 8b4316bdc1
4 changed files with 13 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CPV/src/cprstart.f90
View File

@ -21,7 +21,7 @@ PROGRAM main
USE input, ONLY : iosys_pseudo, iosys
USE read_input, ONLY : read_input_file
USE mp_global, ONLY : mp_startup, nimage, me_image, root_image
USE io_global, ONLY : ionode, ionode_id, io_global_start
USE io_global, ONLY : ionode, ionode_id
USE environment, ONLY : environment_start
USE check_stop, ONLY : check_stop_init
USE mp_global, ONLY : mp_bcast, intra_image_comm

76
Modules/io_global.f90
View File

@ -14,16 +14,20 @@ MODULE io_global
PRIVATE
SAVE
!
PUBLIC :: io_global_start, meta_io_global_start, io_global_getionode, io_global_getmeta
PUBLIC :: io_global_start, io_global_getionode
PUBLIC :: stdout, ionode, ionode_id, meta_ionode, meta_ionode_id
PUBLIC :: xmlinputunit, xmloutputunit, xmltmpunit
!
INTEGER :: stdout = 6 ! unit connected to standard output
INTEGER :: ionode_id = 0 ! index of the i/o node
LOGICAL :: ionode = .TRUE. ! identifies the i/o node
INTEGER :: meta_ionode_id = 0 ! index of the i/o node for meta-codes
LOGICAL :: meta_ionode = .TRUE. ! identifies the i/o node for meta-codes
! For parallel execution: I/O within an image
INTEGER :: ionode_id = 0 ! index of the i/o node for this image
LOGICAL :: ionode = .TRUE. ! true if this processor is a i/o node
! for this image
! For parallel execution: global I/O node (for NEB, PHonon, etc)
INTEGER :: meta_ionode_id = 0 ! index of the global i/o node
LOGICAL :: meta_ionode = .TRUE. ! true if this processor is global i/o node
LOGICAL :: first = .TRUE.
!
INTEGER :: xmlinputunit ! unit connected to the xml input
INTEGER :: xmloutputunit = 51 ! unit connected to the xml output
INTEGER :: xmltmpunit = 52 ! unit connected to the temp xml output
@ -35,20 +39,14 @@ MODULE io_global
!-----------------------------------------------------------------------
!
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: mpime, ionode_set
!
!
IF ( mpime == ionode_set ) THEN
!
ionode = .TRUE.
!
ELSE
!
ionode = .FALSE.
!
END IF
!
ionode_id = ionode_set
!
first = .FALSE.
@ -58,35 +56,6 @@ MODULE io_global
END SUBROUTINE io_global_start
!
!-----------------------------------------------------------------------
SUBROUTINE meta_io_global_start( mpime, ionode_set )
!-----------------------------------------------------------------------
!
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: mpime, ionode_set
!
!
IF ( mpime == ionode_set ) THEN
!
meta_ionode = .TRUE.
!
ELSE
!
meta_ionode = .FALSE.
!
END IF
!
meta_ionode_id = ionode_set
!
first = .FALSE.
!
RETURN
!
END SUBROUTINE meta_io_global_start
!
!
!
!-----------------------------------------------------------------------
SUBROUTINE io_global_getionode( ionode_out, ionode_id_out )
!-----------------------------------------------------------------------
!
@ -106,32 +75,5 @@ MODULE io_global
!
END SUBROUTINE io_global_getionode
!
!
!-----------------------------------------------------------------------
SUBROUTINE io_global_getmeta( myrank, root )
!-----------------------------------------------------------------------
!
! ... writes in module variables meta_ionode_id and meta_ionode
!
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: myrank, root
!
!
IF(myrank == root) THEN
!
meta_ionode = .true.
!
ELSE
meta_ionode = .false.
!
ENDIF
!
meta_ionode_id = root
!
RETURN
!
END SUBROUTINE io_global_getmeta
!
!
END MODULE io_global

42
Modules/mp_global.f90
View File

@ -194,14 +194,11 @@ CONTAINS
INTEGER, INTENT(IN) :: world, root
INTEGER :: nproc_ortho_in = 0
!
INTEGER :: myrank, npe
INTEGER :: myrank
!
! ... get global coordinate for this processor
!
myrank = mp_rank(world)
npe = mp_size(world)
!
CALL mp_global_start( root, myrank, world, npe )
!
! ... initialize input/output, set (and get) the I/O nodes
!
@ -259,34 +256,6 @@ CONTAINS
END SUBROUTINE mp_image_startup
!
!-----------------------------------------------------------------------
SUBROUTINE mp_global_start( root_i, mpime_i, group_i, nproc_i )
!-----------------------------------------------------------------------
!
IMPLICIT NONE
!
INTEGER, INTENT(IN) :: root_i, mpime_i, group_i, nproc_i
!
nproc_pool = nproc_i
nproc_bgrp = nproc_i
my_pool_id = 0
my_bgrp_id = 0
me_pool = mpime_i
me_bgrp = mpime_i
root_pool = root_i
root_bgrp = root_i
inter_pool_comm = group_i
intra_pool_comm = group_i
inter_bgrp_comm = group_i
intra_bgrp_comm = group_i
ortho_comm = group_i
ortho_row_comm = group_i
ortho_col_comm = group_i
!
RETURN
!
END SUBROUTINE mp_global_start
!
!-----------------------------------------------------------------------
SUBROUTINE mp_global_end ( )
!-----------------------------------------------------------------------
!
@ -791,12 +760,8 @@ CONTAINS
END SUBROUTINE distribute_over_bgrp
!
SUBROUTINE init_index_over_band(comm,nbnd)
!
IMPLICIT NONE
#if defined (__MPI)
!
include 'mpif.h'
!
#endif
INTEGER, INTENT(IN) :: comm, nbnd
INTEGER :: npe, myrank, ierror, rest, k
@ -804,8 +769,6 @@ CONTAINS
myrank = mp_rank(comm)
npe = mp_size(comm)
! call mpi_comm_rank(comm, mp_rank, ierror)
! call mpi_comm_size(comm, mp_size, ierror)
rest = mod(nbnd, npe)
k = int(nbnd/npe)
@ -822,7 +785,6 @@ CONTAINS
ibnd_end = nbnd
endif
END SUBROUTINE init_index_over_band
!
!

2
PW/src/generate_vdW_kernel_table.f90
View File

@ -87,7 +87,7 @@ program generate_kernel
use mp, ONLY : mp_get, mp_end, mp_barrier
use mp_global, ONLY : mp_startup, nproc, mpime
use kinds, ONLY : dp
use io_global, ONLY : io_global_start, ionode, ionode_id
use io_global, ONLY : ionode, ionode_id
use constants, ONLY : pi
!! --------------------------------------------------------------------------------------------