Merge branch 'master' into 'develop'

Variable "npw" made explicitly local in a few places

See merge request QEF/q-e!432
This commit is contained in:
giannozz 2019-05-07 07:06:08 +00:00
commit 6679a6f98b
3 changed files with 4 additions and 4 deletions

View File

@ -31,7 +31,6 @@ SUBROUTINE hp_ef_shift (drhoscf, ldos, ldoss, dos_ef, dbecsum, becsum1)
USE gvect, ONLY : gg
USE buffers, ONLY : get_buffer, save_buffer
USE lsda_mod, ONLY : nspin
USE wvfct, ONLY : npw, npwx, et
USE klist, ONLY : degauss, ngauss, ngk
USE noncollin_module, ONLY : noncolin, npol, nspin_mag, nspin_lsda
USE mp_bands, ONLY : intra_bgrp_comm

View File

@ -51,7 +51,7 @@ PROGRAM do_ppacf
USE funct, ONLY : xc,xc_spin,gcxc,gcx_spin,gcc_spin,dft_is_nonlocc,nlc
USE funct, ONLY : get_iexch, get_icorr, get_igcx, get_igcc
USE funct, ONLY : set_exx_fraction,set_auxiliary_flags,enforce_input_dft
USE wvfct, ONLY : npw, npwx
USE wvfct, ONLY : npwx
USE environment, ONLY : environment_start, environment_end
USE kernel_table, ONLY : Nqs, vdw_table_name, kernel_file_name
USE vdW_DF, ONLY : get_potential, vdW_energy
@ -110,6 +110,7 @@ PROGRAM do_ppacf
REAL(DP), ALLOCATABLE :: tot_grad_rho(:,:),grad_rho(:,:,:)
REAL(DP), ALLOCATABLE :: tot_rho(:)
INTEGER :: npw ! number of plane waves
INTEGER :: ik ! counter on k points
INTEGER, ALLOCATABLE :: igk_buf(:)
REAL(dp), ALLOCATABLE :: gk(:) ! work space

View File

@ -23,7 +23,7 @@ SUBROUTINE stres_mgga( sigmaxc )
USE klist, ONLY : nks, xk, ngk
USE buffers, ONLY : get_buffer
USE io_files, ONLY : iunwfc, nwordwfc
USE wvfct, ONLY : nbnd, npwx, npw, wg
USE wvfct, ONLY : nbnd, npwx, wg
USE lsda_mod, ONLY : lsda, nspin, current_spin, isk
USE fft_interfaces, ONLY : fwfft, invfft
USE fft_base, ONLY : dfftp, dffts
@ -37,7 +37,7 @@ SUBROUTINE stres_mgga( sigmaxc )
!
! Internal variables
!
INTEGER :: ix, iy, ir, ipol, iss, incr, ibnd, ik
INTEGER :: ix, iy, ir, ipol, iss, incr, ibnd, ik, npw
INTEGER :: ipol2xy(3,3)
REAL(DP), PARAMETER :: epsr = 1.0d-6, epsg = 1.0d-10, e2 = 2.d0
COMPLEX(DP), ALLOCATABLE :: gradwfc (:,:), crosstaus(:,:,:)