diff --git a/EPW/src/make.depend b/EPW/src/make.depend index d4f0f63d9..59e70ca91 100644 --- a/EPW/src/make.depend +++ b/EPW/src/make.depend @@ -290,7 +290,6 @@ epw_init.o : ../../UtilXlib/mp.o epw_init.o : constants_epw.o epw_init.o : elph2.o epw_readin.o : ../../LR_Modules/lrcom.o -epw_readin.o : ../../Modules/check_stop.o epw_readin.o : ../../Modules/constants.o epw_readin.o : ../../Modules/control_flags.o epw_readin.o : ../../Modules/io_files.o @@ -305,6 +304,7 @@ epw_readin.o : ../../UtilXlib/mp.o epw_readin.o : constants_epw.o epw_readin.o : elph2.o epw_readin.o : epwcom.o +epw_readin.o : io_epw.o epw_setup.o : ../../LR_Modules/lrcom.o epw_setup.o : ../../Modules/cell_base.o epw_setup.o : ../../Modules/control_flags.o diff --git a/GWW/head/bcast_ph_input.f90 b/GWW/head/bcast_ph_input.f90 index 88ebc4502..dc5dbb09d 100644 --- a/GWW/head/bcast_ph_input.f90 +++ b/GWW/head/bcast_ph_input.f90 @@ -20,7 +20,6 @@ subroutine bcast_ph_input ( ) use mp, only: mp_bcast use mp_world, only: world_comm - USE mp_global, only : intra_image_comm USE control_ph, ONLY : start_irr, last_irr, start_q, last_q, nmix_ph, & niter_ph, lnoloc, alpha_mix, tr2_ph, recover, & ldisp, reduce_io, zue, zeu, epsil, trans diff --git a/GWW/head/close_phq.f90 b/GWW/head/close_phq.f90 index 7b624547e..8c56697a7 100644 --- a/GWW/head/close_phq.f90 +++ b/GWW/head/close_phq.f90 @@ -16,7 +16,6 @@ SUBROUTINE close_phq( flag ) ! ... Called at the end of the run with flag=.TRUE. (removes 'recover') ! ... or during execution with flag=.FALSE. (does not remove 'recover') ! - USE mp_global, ONLY : me_pool USE io_global, ONLY : ionode, stdout USE uspp, ONLY : okvan USE units_ph, ONLY : iudwf, iubar, iudrhous, iuebar, iudrho, & diff --git a/GWW/head/head.f90 b/GWW/head/head.f90 index 31ddb1054..a9e7e3dcf 100644 --- a/GWW/head/head.f90 +++ b/GWW/head/head.f90 @@ -49,7 +49,7 @@ PROGRAM head USE check_stop, ONLY : check_stop_init USE ph_restart, ONLY : ph_writefile, destroy_status_run USE save_ph, ONLY : clean_input_variables - USE mp_global, ONLY: mp_startup, nimage + USE mp_global, ONLY: mp_startup !, nimage !USE path_io_routines, ONLY : io_path_start USE environment, ONLY: environment_start USE wannier_gw, ONLY : l_head diff --git a/GWW/head/make.depend b/GWW/head/make.depend index 36aafc93f..27bbfc1e3 100644 --- a/GWW/head/make.depend +++ b/GWW/head/make.depend @@ -4,7 +4,6 @@ bcast_ph_input.o : ../../Modules/control_flags.o bcast_ph_input.o : ../../Modules/io_files.o bcast_ph_input.o : ../../Modules/io_global.o bcast_ph_input.o : ../../Modules/ions_base.o -bcast_ph_input.o : ../../Modules/mp_global.o bcast_ph_input.o : ../../Modules/mp_world.o bcast_ph_input.o : ../../Modules/run_info.o bcast_ph_input.o : ../../Modules/wannier_gw.o @@ -13,7 +12,6 @@ bcast_ph_input.o : ../../PHonon/PH/ramanm.o bcast_ph_input.o : ../../UtilXlib/mp.o close_phq.o : ../../LR_Modules/lrcom.o close_phq.o : ../../Modules/io_global.o -close_phq.o : ../../Modules/mp_global.o close_phq.o : ../../Modules/uspp.o close_phq.o : ../../Modules/wannier_gw.o close_phq.o : ../../PHonon/PH/phcom.o @@ -49,7 +47,7 @@ openfilq.o : ../../Modules/fft_base.o openfilq.o : ../../Modules/io_files.o openfilq.o : ../../Modules/io_global.o openfilq.o : ../../Modules/kind.o -openfilq.o : ../../Modules/mp_global.o +openfilq.o : ../../Modules/mp_pools.o openfilq.o : ../../Modules/noncol.o openfilq.o : ../../Modules/uspp.o openfilq.o : ../../Modules/wannier_gw.o diff --git a/GWW/head/openfilq.f90 b/GWW/head/openfilq.f90 index ce2131d3e..f3ca85e1c 100644 --- a/GWW/head/openfilq.f90 +++ b/GWW/head/openfilq.f90 @@ -32,7 +32,7 @@ SUBROUTINE openfilq() USE uspp, ONLY : nkb, okvan USE io_files, ONLY : prefix,tmp_dir, diropn,seqopn USE noncollin_module, ONLY : npol, nspin_mag - USE mp_global, ONLY : me_pool + USE mp_pools, ONLY : me_pool USE io_global, ONLY : ionode USE ramanm, ONLY: lraman, elop, iuchf, iud2w, iuba2, lrchf, lrd2w, lrba2 USE wannier_gw, ONLY : l_head diff --git a/GWW/pw4gww/calculate_wing.f90 b/GWW/pw4gww/calculate_wing.f90 index 7583945d0..363cd0c87 100644 --- a/GWW/pw4gww/calculate_wing.f90 +++ b/GWW/pw4gww/calculate_wing.f90 @@ -20,7 +20,7 @@ subroutine calculate_wing(n_set, orthonorm) USE gvect, ONLY : mill, ngm, gstart,g,ngm_g, ig_l2g USE cell_base, ONLY : tpiba USE mp_wave, ONLY : mergewf,splitwf - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp_world, ONLY : mpime, nproc, world_comm USE wvfct, ONLY : npwx, npw USE cell_base, ONLY : at,bg diff --git a/GWW/pw4gww/cgsolve_all_gamma.f90 b/GWW/pw4gww/cgsolve_all_gamma.f90 index 9247df96c..f36fff2fa 100644 --- a/GWW/pw4gww/cgsolve_all_gamma.f90 +++ b/GWW/pw4gww/cgsolve_all_gamma.f90 @@ -59,7 +59,7 @@ subroutine cgsolve_all_gamma (h_psi, cg_psi, e, d0psi, dpsi, h_diag, & ! revised (to reduce memory) 29 May 2004 by S. de Gironcoli ! USE kinds, ONLY : DP - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE control_flags, ONLY : gamma_only USE gvect, ONLY : gstart diff --git a/GWW/pw4gww/dft_exchange.f90 b/GWW/pw4gww/dft_exchange.f90 index a58d30878..33022caf7 100644 --- a/GWW/pw4gww/dft_exchange.f90 +++ b/GWW/pw4gww/dft_exchange.f90 @@ -15,7 +15,6 @@ subroutine dft_exchange(nbnd_v,nbnd_s,n_set, e_x,ks_wfcs) USE io_global, ONLY : stdout, ionode, ionode_id USE io_files, ONLY : prefix, tmp_dir, iunwfc, nwordwfc - USE mp_global, ONLY : nproc_pool, me_pool USE kinds, ONLY : DP USE basis USE klist diff --git a/GWW/pw4gww/exchange_custom.f90 b/GWW/pw4gww/exchange_custom.f90 index 0389e09c2..dc521a7db 100644 --- a/GWW/pw4gww/exchange_custom.f90 +++ b/GWW/pw4gww/exchange_custom.f90 @@ -62,12 +62,12 @@ MODULE exchange_custom !experimental version work just with factor 1/2 USE io_global, ONLY : stdout, ionode,ionode_id - USE mp_global, ONLY : me_pool,intra_pool_comm + USE mp_pools, ONLY : me_pool,intra_pool_comm USE cell_base, ONLY: at, alat, tpiba, omega, tpiba2,bg USE constants, ONLY : e2, pi, tpi, fpi, RYTOEV USE wavefunctions, ONLY : psic USE mp, ONLY : mp_sum - USE mp_world, ONLY : world_comm, nproc + USE mp_world, ONLY : nproc USE wvfct, ONLY : npwx, npw, wg USE gvect USE mp_wave, ONLY : mergewf,splitwf @@ -793,7 +793,7 @@ MODULE exchange_custom !experimental version work just with factor 1/2 USE io_global, ONLY : stdout, ionode,ionode_id - USE mp_global, ONLY : me_pool,intra_pool_comm + USE mp_pools, ONLY : me_pool,intra_pool_comm USE cell_base, ONLY : at, alat, tpiba, omega, tpiba2,bg USE constants, ONLY : e2, pi, tpi, fpi, RYTOEV USE wavefunctions, ONLY : psic @@ -1133,7 +1133,7 @@ MODULE exchange_custom USE cell_base, ONLY: at, alat, tpiba, omega, tpiba2,bg USE constants, ONLY : e2, pi, tpi, fpi, RYTOEV USE wavefunctions, ONLY : psic - USE mp_global, ONLY : intra_pool_comm, me_pool + USE mp_pools, ONLY : intra_pool_comm, me_pool USE gvect USE mp_wave, ONLY : mergewf,splitwf USE mp, ONLY : mp_barrier, mp_sum diff --git a/GWW/pw4gww/fft_custom.f90 b/GWW/pw4gww/fft_custom.f90 index d847dc7f4..a7eb983a5 100644 --- a/GWW/pw4gww/fft_custom.f90 +++ b/GWW/pw4gww/fft_custom.f90 @@ -173,10 +173,9 @@ CONTAINS ! ngm, ngm_l, ngm_g, gcutm, ecutwfc ! USE gsmooth, ONLY : nr1s, nr2s, nr3s, nrx1s, nrx2s, nrx3s, nrxxs, & ! ngms, ngms_l, ngms_g, gcutms - USE mp, ONLY : mp_sum, mp_max,mp_barrier - USE mp_global, ONLY : intra_pool_comm, nproc_pool, me_pool, my_image_id, & + USE mp, ONLY : mp_sum, mp_max + USE mp_pools, ONLY : intra_pool_comm, nproc_pool, me_pool, & inter_pool_comm,root_pool - USE mp_world, ONLY : world_comm, nproc USE stick_base USE fft_support, ONLY : good_fft_dimension USE fft_types, ONLY : fft_type_init @@ -371,8 +370,6 @@ SUBROUTINE initialize_fft_custom(fc) USE cell_base, ONLY : at, bg,tpiba2,tpiba,omega,alat USE io_global, ONLY : stdout use control_flags, ONLY : gamma_only - USE mp, ONLY : mp_barrier - USE mp_world, ONLY : world_comm implicit none @@ -415,8 +412,6 @@ SUBROUTINE initialize_fft_custom_cell(fc) USE cell_base, ONLY : at, bg,tpiba2,tpiba,omega,alat USE io_global, ONLY : stdout use control_flags, ONLY : gamma_only - USE mp, ONLY : mp_barrier - USE mp_world, ONLY : world_comm implicit none diff --git a/GWW/pw4gww/make.depend b/GWW/pw4gww/make.depend index dfcc803f4..29da39a42 100644 --- a/GWW/pw4gww/make.depend +++ b/GWW/pw4gww/make.depend @@ -7,7 +7,7 @@ calculate_wing.o : ../../Modules/fft_base.o calculate_wing.o : ../../Modules/io_files.o calculate_wing.o : ../../Modules/io_global.o calculate_wing.o : ../../Modules/kind.o -calculate_wing.o : ../../Modules/mp_global.o +calculate_wing.o : ../../Modules/mp_pools.o calculate_wing.o : ../../Modules/mp_wave.o calculate_wing.o : ../../Modules/mp_world.o calculate_wing.o : ../../Modules/recvec.o @@ -16,7 +16,7 @@ calculate_wing.o : ../../PW/src/pwcom.o calculate_wing.o : ../../UtilXlib/mp.o cgsolve_all_gamma.o : ../../Modules/control_flags.o cgsolve_all_gamma.o : ../../Modules/kind.o -cgsolve_all_gamma.o : ../../Modules/mp_global.o +cgsolve_all_gamma.o : ../../Modules/mp_pools.o cgsolve_all_gamma.o : ../../Modules/recvec.o cgsolve_all_gamma.o : ../../UtilXlib/mp.o contour_terms.o : ../../Modules/io_files.o @@ -38,7 +38,6 @@ dft_exchange.o : ../../Modules/io_files.o dft_exchange.o : ../../Modules/io_global.o dft_exchange.o : ../../Modules/ions_base.o dft_exchange.o : ../../Modules/kind.o -dft_exchange.o : ../../Modules/mp_global.o dft_exchange.o : ../../Modules/mp_world.o dft_exchange.o : ../../Modules/recvec.o dft_exchange.o : ../../Modules/uspp.o @@ -86,7 +85,6 @@ exchange_custom.o : ../../Modules/gvecw.o exchange_custom.o : ../../Modules/io_files.o exchange_custom.o : ../../Modules/io_global.o exchange_custom.o : ../../Modules/kind.o -exchange_custom.o : ../../Modules/mp_global.o exchange_custom.o : ../../Modules/mp_pools.o exchange_custom.o : ../../Modules/mp_wave.o exchange_custom.o : ../../Modules/mp_world.o @@ -128,8 +126,7 @@ fft_custom.o : ../../Modules/control_flags.o fft_custom.o : ../../Modules/fft_base.o fft_custom.o : ../../Modules/io_global.o fft_custom.o : ../../Modules/kind.o -fft_custom.o : ../../Modules/mp_global.o -fft_custom.o : ../../Modules/mp_world.o +fft_custom.o : ../../Modules/mp_pools.o fft_custom.o : ../../Modules/recvec.o fft_custom.o : ../../PW/src/pwcom.o fft_custom.o : ../../UtilXlib/mp.o @@ -160,7 +157,7 @@ matrix_wannier_gamma.o : ../../Modules/io_files.o matrix_wannier_gamma.o : ../../Modules/io_global.o matrix_wannier_gamma.o : ../../Modules/ions_base.o matrix_wannier_gamma.o : ../../Modules/kind.o -matrix_wannier_gamma.o : ../../Modules/mp_global.o +matrix_wannier_gamma.o : ../../Modules/mp_pools.o matrix_wannier_gamma.o : ../../Modules/mp_world.o matrix_wannier_gamma.o : ../../Modules/recvec.o matrix_wannier_gamma.o : ../../Modules/uspp.o @@ -178,7 +175,6 @@ o_1psi.o : ../../Modules/fft_base.o o_1psi.o : ../../Modules/io_files.o o_1psi.o : ../../Modules/io_global.o o_1psi.o : ../../Modules/kind.o -o_1psi.o : ../../Modules/mp_global.o o_1psi.o : ../../Modules/mp_world.o o_1psi.o : ../../Modules/random_numbers.o o_1psi.o : ../../Modules/recvec.o @@ -363,7 +359,7 @@ semicore_read.o : ../../Modules/fft_base.o semicore_read.o : ../../Modules/io_files.o semicore_read.o : ../../Modules/io_global.o semicore_read.o : ../../Modules/kind.o -semicore_read.o : ../../Modules/mp_global.o +semicore_read.o : ../../Modules/mp_pools.o semicore_read.o : ../../Modules/mp_wave.o semicore_read.o : ../../Modules/mp_world.o semicore_read.o : ../../Modules/recvec.o diff --git a/GWW/pw4gww/matrix_wannier_gamma.f90 b/GWW/pw4gww/matrix_wannier_gamma.f90 index 8fa0c241a..d2d9207f3 100644 --- a/GWW/pw4gww/matrix_wannier_gamma.f90 +++ b/GWW/pw4gww/matrix_wannier_gamma.f90 @@ -93,7 +93,7 @@ subroutine matrix_wannier_gamma_big( matsincos, ispin, n_set, itask ) USE ions_base, ONLY : nat, ntyp =>nsp, ityp USE uspp_param, ONLY : lmaxq,upf,nh, nhm USE lsda_mod, ONLY : nspin - USE mp_global, ONLY : intra_image_comm, me_pool + USE mp_pools, ONLY : me_pool USE mp, ONLY : mp_bcast,mp_barrier,mp_sum USE mp_world, ONLY : world_comm USE fft_base, ONLY : dffts,dfftp diff --git a/GWW/pw4gww/o_1psi.f90 b/GWW/pw4gww/o_1psi.f90 index 0d4a69ed5..468368dd4 100644 --- a/GWW/pw4gww/o_1psi.f90 +++ b/GWW/pw4gww/o_1psi.f90 @@ -22,7 +22,6 @@ SUBROUTINE o_rcgdiagg( npwx, npw, nbnd, psi, e, precondition, & USE constants, ONLY : pi USE kinds, ONLY : DP USE gvect, ONLY : gstart - USE mp_global, ONLY : intra_bgrp_comm USE mp, ONLY : mp_sum USE mp_world, ONLY : world_comm USE fft_base, ONLY : dffts diff --git a/GWW/pw4gww/semicore_read.f90 b/GWW/pw4gww/semicore_read.f90 index 5231d8591..6bd7ff962 100644 --- a/GWW/pw4gww/semicore_read.f90 +++ b/GWW/pw4gww/semicore_read.f90 @@ -19,7 +19,7 @@ USE kinds, ONLY : DP USE gvect, ONLY : g, ig_l2g, gstart USE mp, ONLY : mp_sum, mp_barrier, mp_bcast - USE mp_global, ONLY : inter_pool_comm, intra_pool_comm + USE mp_pools, ONLY : inter_pool_comm, intra_pool_comm USE mp_wave, ONLY : mergewf,splitwf USE mp_world, ONLY : mpime, nproc, world_comm USE fft_base, ONLY : dfftp, dffts diff --git a/GWW/simple/make.depend b/GWW/simple/make.depend index fbf9e83f8..29146b1b8 100644 --- a/GWW/simple/make.depend +++ b/GWW/simple/make.depend @@ -95,7 +95,7 @@ read_export.o : ../../Modules/io_files.o read_export.o : ../../Modules/io_global.o read_export.o : ../../Modules/ions_base.o read_export.o : ../../Modules/kind.o -read_export.o : ../../Modules/mp_global.o +read_export.o : ../../Modules/mp_pools.o read_export.o : ../../Modules/mp_world.o read_export.o : ../../Modules/recvec.o read_export.o : ../../Modules/uspp.o @@ -110,6 +110,7 @@ simple.o : ../../Modules/fft_base.o simple.o : ../../Modules/io_files.o simple.o : ../../Modules/io_global.o simple.o : ../../Modules/mp_global.o +simple.o : ../../Modules/mp_pools.o simple.o : ../../Modules/mp_world.o simple.o : ../../Modules/recvec.o simple.o : ../../Modules/uspp.o diff --git a/GWW/simple/read_export.f90 b/GWW/simple/read_export.f90 index e3866090a..b5d0f9091 100644 --- a/GWW/simple/read_export.f90 +++ b/GWW/simple/read_export.f90 @@ -17,9 +17,8 @@ subroutine read_export (pp_file,kunit,uspp_spsi, ascii, single_file, raw) use io_files, ONLY : pseudo_dir, psfile use io_global, ONLY : ionode, stdout USE ions_base, ONLY : atm, nat, ityp, tau, nsp - use mp_global, ONLY : nproc_pool - use mp_global, ONLY : my_pool_id, intra_pool_comm, inter_pool_comm - USE mp_world, ONLY : world_comm, mpime,nproc + use mp_pools, ONLY : nproc_pool, my_pool_id, intra_pool_comm, inter_pool_comm + USE mp_world, ONLY : world_comm, nproc use mp, ONLY : mp_sum, mp_max use ldaU, ONLY : lda_plus_u USE gvecw, ONLY : ecutwfc diff --git a/GWW/simple/simple.f90 b/GWW/simple/simple.f90 index e423a9bc3..15d0ba450 100644 --- a/GWW/simple/simple.f90 +++ b/GWW/simple/simple.f90 @@ -9,7 +9,8 @@ program simple use io_files, ONLY : prefix, tmp_dir use io_files, ONLY : psfile, pseudo_dir use io_global, ONLY : stdout, ionode, ionode_id - USE mp_global, ONLY: mp_startup,kunit + USE mp_global, ONLY: mp_startup + USE mp_pools, ONLY : kunit use mp_world, ONLY: mpime, world_comm USE environment, ONLY: environment_start USE mp, ONLY : mp_bcast diff --git a/PHonon/Gamma/cg_setup.f90 b/PHonon/Gamma/cg_setup.f90 index 6302ef6df..1b40e2204 100644 --- a/PHonon/Gamma/cg_setup.f90 +++ b/PHonon/Gamma/cg_setup.f90 @@ -16,7 +16,6 @@ SUBROUTINE cg_setup USE scf, ONLY: rho, rho_core, v, vltot, vrs, kedtau USE uspp, ONLY: vkb, nlcc_any USE uspp_param, ONLY: upf - USE mp_global, ONLY: kunit USE wavefunctions, ONLY: evc USE io_files, ONLY: prefix, iunpun, iunres, diropn USE funct, ONLY: dft_is_gradient, dmxc @@ -37,7 +36,7 @@ SUBROUTINE cg_setup LOGICAL :: exst CHARACTER (len=256) :: filint REAL(DP) :: rhotot - INTEGER :: ndr, kunittmp, ierr + INTEGER :: ndr, ierr REAL(DP) :: edum(1,1), wdum(1,1) ! CALL start_clock('cg_setup') diff --git a/PHonon/Gamma/d2ion.f90 b/PHonon/Gamma/d2ion.f90 index ee69f6717..2a625460d 100644 --- a/PHonon/Gamma/d2ion.f90 +++ b/PHonon/Gamma/d2ion.f90 @@ -17,7 +17,7 @@ SUBROUTINE d2ion (nat,ntyp,ityp,zv,tau,alat,omega, & USE kinds, ONLY : DP USE constants, ONLY : tpi, fpi, e2 USE io_global, ONLY : stdout - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum IMPLICIT NONE INTEGER :: nat, ntyp, ngm, ityp(nat), nmodes, has_equivalent(nat) diff --git a/PHonon/Gamma/dielec.f90 b/PHonon/Gamma/dielec.f90 index 10b5a34d4..ba3a8ddd8 100644 --- a/PHonon/Gamma/dielec.f90 +++ b/PHonon/Gamma/dielec.f90 @@ -15,7 +15,7 @@ SUBROUTINE dielec(do_zstar) USE constants, ONLY : fpi USE cell_base, ONLY : omega USE ions_base, ONLY : nat, zv, ityp - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE io_files, ONLY : seqopn USE klist, ONLY : wk, ngk diff --git a/PHonon/Gamma/drhodv.f90 b/PHonon/Gamma/drhodv.f90 index c5337b5ba..44d3ac5d9 100644 --- a/PHonon/Gamma/drhodv.f90 +++ b/PHonon/Gamma/drhodv.f90 @@ -12,7 +12,7 @@ SUBROUTINE drhodv(nu_i) ! ! calculate the electronic term of the dynamical matrix ! - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE klist, ONLY : wk, ngk USE wvfct, ONLY : nbnd, npwx diff --git a/PHonon/Gamma/dynmatcc.f90 b/PHonon/Gamma/dynmatcc.f90 index 456f0fc9d..3a06f934c 100644 --- a/PHonon/Gamma/dynmatcc.f90 +++ b/PHonon/Gamma/dynmatcc.f90 @@ -23,7 +23,7 @@ SUBROUTINE dynmatcc(dyncc) USE scf, ONLY : rho, rho_core, rhog_core USE wavefunctions, ONLY: psic USE cgcom - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum IMPLICIT NONE diff --git a/PHonon/Gamma/make.depend b/PHonon/Gamma/make.depend index 1b3e09f31..894167858 100644 --- a/PHonon/Gamma/make.depend +++ b/PHonon/Gamma/make.depend @@ -33,7 +33,6 @@ cg_setup.o : ../../Modules/gvecw.o cg_setup.o : ../../Modules/io_files.o cg_setup.o : ../../Modules/ions_base.o cg_setup.o : ../../Modules/kind.o -cg_setup.o : ../../Modules/mp_global.o cg_setup.o : ../../Modules/recvec.o cg_setup.o : ../../Modules/uspp.o cg_setup.o : ../../Modules/wavefunctions.o @@ -57,7 +56,7 @@ cgsolve.o : ../../Modules/kind.o d2ion.o : ../../Modules/constants.o d2ion.o : ../../Modules/io_global.o d2ion.o : ../../Modules/kind.o -d2ion.o : ../../Modules/mp_global.o +d2ion.o : ../../Modules/mp_pools.o d2ion.o : ../../UtilXlib/mp.o dgradcorr.o : ../../FFTXlib/fft_types.o dgradcorr.o : ../../Modules/kind.o @@ -65,11 +64,11 @@ dielec.o : ../../Modules/cell_base.o dielec.o : ../../Modules/constants.o dielec.o : ../../Modules/io_files.o dielec.o : ../../Modules/ions_base.o -dielec.o : ../../Modules/mp_global.o +dielec.o : ../../Modules/mp_pools.o dielec.o : ../../PW/src/pwcom.o dielec.o : ../../UtilXlib/mp.o dielec.o : cgcom.o -drhodv.o : ../../Modules/mp_global.o +drhodv.o : ../../Modules/mp_pools.o drhodv.o : ../../PW/src/pwcom.o drhodv.o : ../../UtilXlib/mp.o drhodv.o : cgcom.o @@ -112,7 +111,7 @@ dynmatcc.o : ../../Modules/constants.o dynmatcc.o : ../../Modules/fft_base.o dynmatcc.o : ../../Modules/ions_base.o dynmatcc.o : ../../Modules/kind.o -dynmatcc.o : ../../Modules/mp_global.o +dynmatcc.o : ../../Modules/mp_pools.o dynmatcc.o : ../../Modules/recvec.o dynmatcc.o : ../../Modules/uspp.o dynmatcc.o : ../../Modules/wavefunctions.o @@ -164,7 +163,7 @@ rhod2vkb.o : ../../Modules/fft_base.o rhod2vkb.o : ../../Modules/gvecw.o rhod2vkb.o : ../../Modules/ions_base.o rhod2vkb.o : ../../Modules/kind.o -rhod2vkb.o : ../../Modules/mp_global.o +rhod2vkb.o : ../../Modules/mp_pools.o rhod2vkb.o : ../../Modules/recvec.o rhod2vkb.o : ../../Modules/uspp.o rhod2vkb.o : ../../Modules/wavefunctions.o diff --git a/PHonon/Gamma/rhod2vkb.f90 b/PHonon/Gamma/rhod2vkb.f90 index a78f172db..a14f711dd 100644 --- a/PHonon/Gamma/rhod2vkb.f90 +++ b/PHonon/Gamma/rhod2vkb.f90 @@ -28,7 +28,7 @@ SUBROUTINE rhod2vkb(dyn0) USE uspp_param, ONLY: nh USE becmod, ONLY: calbec USE cgcom - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE fft_base, ONLY : dffts, dfftp USE fft_interfaces, ONLY : fwfft, invfft diff --git a/PHonon/PH/d2nsq_bare.f90 b/PHonon/PH/d2nsq_bare.f90 index 8ab9f11eb..78c8a95e4 100644 --- a/PHonon/PH/d2nsq_bare.f90 +++ b/PHonon/PH/d2nsq_bare.f90 @@ -24,7 +24,7 @@ SUBROUTINE doubleprojqq (na, vec1, vec2, vec3, vec4, npw1, npw2, dpqq) USE ions_base, ONLY : ityp USE uspp, ONLY : qq_nt USE wvfct, ONLY : npwx, nbnd - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE control_lr, ONLY : ofsbeta ! @@ -114,7 +114,7 @@ SUBROUTINE doubleprojqq2 (na, proj, vec3, vec4, npw2, dpqq) USE ions_base, ONLY : ityp USE uspp, ONLY : qq_nt USE wvfct, ONLY : npwx, nbnd - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE control_lr, ONLY : ofsbeta ! @@ -184,7 +184,7 @@ END MODULE doubleprojqq_module !-------------------------------------------------------- MODULE term_one_1_module !-------------------------------------------------------- - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY: mp_sum ! CONTAINS @@ -687,7 +687,7 @@ END MODULE term_one_module !------------------------------------------------------------------------- MODULE term_three_module !------------------------------------------------------------------------- - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum ! CONTAINS diff --git a/PHonon/PH/delta_sphi.f90 b/PHonon/PH/delta_sphi.f90 index 4a46d0d87..5ba22546c 100644 --- a/PHonon/PH/delta_sphi.f90 +++ b/PHonon/PH/delta_sphi.f90 @@ -41,7 +41,7 @@ SUBROUTINE delta_sphi (ikk, ikq, na, icart, nah, ihubst, wfcatomk_, wfcatomkpq_, USE uspp, ONLY : nkb, qq_nt, okvan USE ldaU, ONLY : nwfcU USE wvfct, ONLY : npwx - USE mp_global, ONLY : intra_pool_comm + USE mp_pools, ONLY : intra_pool_comm USE mp, ONLY : mp_sum USE klist, ONLY : ngk USE io_global, ONLY : stdout diff --git a/PHonon/PH/dnsq_orth.f90 b/PHonon/PH/dnsq_orth.f90 index dcdc94f69..d41164ac6 100644 --- a/PHonon/PH/dnsq_orth.f90 +++ b/PHonon/PH/dnsq_orth.f90 @@ -44,12 +44,11 @@ SUBROUTINE dnsq_orth() USE eqv, ONLY : evq USE uspp, ONLY : okvan, nkb, vkb USE control_flags, ONLY : iverbosity - USE mp_global, ONLY : intra_pool_comm, inter_pool_comm USE mp, ONLY : mp_sum, mp_bcast + USE mp_pools, ONLY : intra_pool_comm, inter_pool_comm + USE mp_world, ONLY : world_comm USE io_files, ONLY : seqopn USE buffers, ONLY : get_buffer - USE mp_world, ONLY : world_comm - USE mp_images, ONLY : intra_image_comm USE doubleprojqq_module ! IMPLICIT NONE @@ -117,10 +116,6 @@ SUBROUTINE dnsq_orth() CALL mp_bcast(ios, ionode_id, world_comm) IF (exst.and.ios==0) CALL mp_bcast(dnsorth_cart, ionode_id, world_comm) ! - ! IT: Is it needed to broadcast for intra_image_comm? - CALL mp_bcast(ios, ionode_id, intra_image_comm) - IF (exst .AND. ios==0) CALL mp_bcast(dnsorth_cart, ionode_id, intra_image_comm) - ! ENDIF ! ! Compute dnsorth_cart (if it was not already done) diff --git a/PHonon/PH/dynmat_hub_bare.f90 b/PHonon/PH/dynmat_hub_bare.f90 index feef129b1..0d57abcbc 100644 --- a/PHonon/PH/dynmat_hub_bare.f90 +++ b/PHonon/PH/dynmat_hub_bare.f90 @@ -50,8 +50,8 @@ SUBROUTINE dynmat_hub_bare USE control_flags, ONLY : iverbosity USE d2nsq_bare_module USE scf, ONLY : rho - USE mp_global, ONLY : intra_pool_comm, inter_pool_comm USE mp, ONLY : mp_sum, mp_bcast + USE mp_pools, ONLY : intra_pool_comm, inter_pool_comm USE mp_world, ONLY : world_comm USE io_files, ONLY : seqopn USE buffers, ONLY : get_buffer diff --git a/PHonon/PH/make.depend b/PHonon/PH/make.depend index cd00d1856..21249d2f9 100644 --- a/PHonon/PH/make.depend +++ b/PHonon/PH/make.depend @@ -307,7 +307,7 @@ d2nsq_bare.o : ../../LR_Modules/lrcom.o d2nsq_bare.o : ../../Modules/io_global.o d2nsq_bare.o : ../../Modules/ions_base.o d2nsq_bare.o : ../../Modules/kind.o -d2nsq_bare.o : ../../Modules/mp_global.o +d2nsq_bare.o : ../../Modules/mp_pools.o d2nsq_bare.o : ../../Modules/uspp.o d2nsq_bare.o : ../../Modules/wavefunctions.o d2nsq_bare.o : ../../PW/src/ldaU.o @@ -336,7 +336,7 @@ delta_sphi.o : ../../LR_Modules/lrcom.o delta_sphi.o : ../../Modules/io_global.o delta_sphi.o : ../../Modules/ions_base.o delta_sphi.o : ../../Modules/kind.o -delta_sphi.o : ../../Modules/mp_global.o +delta_sphi.o : ../../Modules/mp_pools.o delta_sphi.o : ../../Modules/uspp.o delta_sphi.o : ../../PW/src/ldaU.o delta_sphi.o : ../../PW/src/pwcom.o @@ -423,8 +423,7 @@ dnsq_orth.o : ../../Modules/io_files.o dnsq_orth.o : ../../Modules/io_global.o dnsq_orth.o : ../../Modules/ions_base.o dnsq_orth.o : ../../Modules/kind.o -dnsq_orth.o : ../../Modules/mp_global.o -dnsq_orth.o : ../../Modules/mp_images.o +dnsq_orth.o : ../../Modules/mp_pools.o dnsq_orth.o : ../../Modules/mp_world.o dnsq_orth.o : ../../Modules/uspp.o dnsq_orth.o : ../../Modules/wavefunctions.o @@ -685,7 +684,7 @@ dynmat_hub_bare.o : ../../Modules/io_files.o dynmat_hub_bare.o : ../../Modules/io_global.o dynmat_hub_bare.o : ../../Modules/ions_base.o dynmat_hub_bare.o : ../../Modules/kind.o -dynmat_hub_bare.o : ../../Modules/mp_global.o +dynmat_hub_bare.o : ../../Modules/mp_pools.o dynmat_hub_bare.o : ../../Modules/mp_world.o dynmat_hub_bare.o : ../../Modules/uspp.o dynmat_hub_bare.o : ../../Modules/wavefunctions.o @@ -1008,7 +1007,7 @@ obsolete.o : ../../Modules/control_flags.o obsolete.o : ../../Modules/io_global.o obsolete.o : ../../Modules/ions_base.o obsolete.o : ../../Modules/kind.o -obsolete.o : ../../Modules/mp_global.o +obsolete.o : ../../Modules/mp_images.o obsolete.o : ../../Modules/noncol.o obsolete.o : ../../Modules/random_numbers.o obsolete.o : ../../Modules/recvec.o @@ -1124,8 +1123,6 @@ phq_readin.o : ../../Modules/io_files.o phq_readin.o : ../../Modules/io_global.o phq_readin.o : ../../Modules/ions_base.o phq_readin.o : ../../Modules/kind.o -phq_readin.o : ../../Modules/mp_bands.o -phq_readin.o : ../../Modules/mp_global.o phq_readin.o : ../../Modules/mp_images.o phq_readin.o : ../../Modules/mp_pools.o phq_readin.o : ../../Modules/mp_world.o diff --git a/PHonon/PH/obsolete.f90 b/PHonon/PH/obsolete.f90 index 4dad75ff7..d41eb0c62 100644 --- a/PHonon/PH/obsolete.f90 +++ b/PHonon/PH/obsolete.f90 @@ -158,14 +158,14 @@ subroutine set_irr (nat, at, bg, xq, s, sr, tau, ntyp, ityp, ftau, invs, nsym, & ! April 1997: parallel stuff added (SdG) ! USE io_global, ONLY : stdout - USE kinds, only : DP + USE kinds, ONLY : DP USE constants, ONLY: tpi USE random_numbers, ONLY : randy USE rap_point_group, ONLY : name_rap #if defined(__MPI) - use mp, only: mp_bcast - use io_global, only : ionode_id - use mp_global, only : intra_image_comm + USE mp, ONLY: mp_bcast + USE io_global, ONLY : ionode_id + USE mp_images, ONLY : intra_image_comm #endif implicit none ! @@ -761,7 +761,7 @@ subroutine set_irr_sym (nat, at, bg, xq, s, rtau, irt, & USE constants, ONLY: tpi USE mp, ONLY: mp_bcast - USE mp_global, ONLY : intra_image_comm + USE mp_images, ONLY : intra_image_comm USE io_global, ONLY : ionode_id implicit none ! diff --git a/PHonon/PH/phq_readin.f90 b/PHonon/PH/phq_readin.f90 index 6fd7f4cde..bfe037682 100644 --- a/PHonon/PH/phq_readin.f90 +++ b/PHonon/PH/phq_readin.f90 @@ -57,10 +57,7 @@ SUBROUTINE phq_readin() USE io_global, ONLY : meta_ionode, meta_ionode_id, ionode, ionode_id, stdout USE mp_images, ONLY : nimage, my_image_id, intra_image_comm, & me_image, nproc_image - USE mp_global, ONLY : nproc_pool_file, & - nproc_bgrp_file, nproc_image_file - USE mp_pools, ONLY : nproc_pool, npool - USE mp_bands, ONLY : nproc_bgrp, ntask_groups + USE mp_pools, ONLY : npool USE paw_variables, ONLY : okpaw USE ramanm, ONLY : eth_rps, eth_ns, lraman, elop, dek USE freq_ph, ONLY : fpol, fiu, nfs diff --git a/PHonon/PH/q2trans_fd.f90 b/PHonon/PH/q2trans_fd.f90 index 465803ed8..4f8ed4781 100644 --- a/PHonon/PH/q2trans_fd.f90 +++ b/PHonon/PH/q2trans_fd.f90 @@ -61,7 +61,7 @@ USE iotk_module USE kinds, ONLY : DP USE mp, ONLY : mp_bcast USE mp_global, ONLY : mp_startup, mp_global_end - USE mp_world, ONLY : nproc, mpime, world_comm + USE mp_world, ONLY : world_comm USE dynamicalq, ONLY : phiq, tau, ityp, zeu USE io_global, ONLY : ionode_id, ionode, stdout USE io_dyn_mat, ONLY : read_dyn_mat_param, read_dyn_mat_header, &