Skip to content

Commit

Permalink
Numeric constant given a name (ry_to_ghz) and moved to constants.f90;
Browse files Browse the repository at this point in the history
make.depend updated; misc. minor things


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@10015 c92efa57-630b-4861-b058-cf58834340f0
  • Loading branch information
giannozz committed Feb 26, 2013
1 parent 3188066 commit 2f1d6fe
Show file tree
Hide file tree
Showing 15 changed files with 85 additions and 39 deletions.
5 changes: 4 additions & 1 deletion CPV/src/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,12 @@ cpr_loop.o : ../../Modules/ions_base.o
cpr_loop.o : ../../Modules/kind.o
cpr_mod.o : ../../Modules/kind.o
cprstart.o : ../../Modules/check_stop.o
cprstart.o : ../../Modules/command_line_options.o
cprstart.o : ../../Modules/environment.o
cprstart.o : ../../Modules/io_global.o
cprstart.o : ../../Modules/mp.o
cprstart.o : ../../Modules/mp_global.o
cprstart.o : ../../Modules/mp_images.o
cprstart.o : ../../Modules/read_input.o
cprstart.o : input.o
dealloc.o : ../../Modules/electrons_base.o
Expand Down Expand Up @@ -434,7 +437,7 @@ init_run.o : ../../Modules/io_global.o
init_run.o : ../../Modules/ions_base.o
init_run.o : ../../Modules/kind.o
init_run.o : ../../Modules/mp.o
init_run.o : ../../Modules/mp_global.o
init_run.o : ../../Modules/mp_bands.o
init_run.o : ../../Modules/recvec.o
init_run.o : ../../Modules/timestep.o
init_run.o : ../../Modules/uspp.o
Expand Down
2 changes: 1 addition & 1 deletion Doc/user_guide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ \subsection{People}
Audrius Alkauskas, Alain Allouche, Francesco Antoniella,
Uli Aschauer, Francesca Baletto, Gerardo Ballabio, Mauro Boero,
Claudia Bungaro, Paolo Cazzato, Gabriele Cipriani, Jiayu Dai,
Cesar Da Silva, Alberto Debernardi, Gernot Deinzer,
Cesar Da Silva, Alberto Debernardi, Gernot Deinzer, Thomas Gruber,
Martin Hilgeman, Yosuke Kanai, Axel Kohlmeyer, Konstantin Kudin,
Nicolas Lacorne, Stephane Lefranc, Sergey Lisenkov, Kurt Maeder,
Andrea Marini, Giuseppe Mattioli, Nicolas Mounet, William Parker,
Expand Down
1 change: 1 addition & 0 deletions Modules/constants.f90
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ MODULE constants
REAL(DP), PARAMETER :: AU_TERAHERTZ = AU_PS
REAL(DP), PARAMETER :: AU_TO_OHMCMM1 = 46000.0_DP ! (ohm cm)^-1
REAL(DP), PARAMETER :: RY_TO_THZ = 1.0_DP / AU_TERAHERTZ / FPI
REAL(DP), PARAMETER :: RY_TO_GHZ = RY_TO_THZ*1000.0_DP
REAL(DP), PARAMETER :: RY_TO_CMM1 = 1.E+10_DP * RY_TO_THZ / C_SI
!

Expand Down
4 changes: 2 additions & 2 deletions Modules/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ bfgs_module.o : cell_base.o
bfgs_module.o : constants.o
bfgs_module.o : io_files.o
bfgs_module.o : kind.o
bspline.o : kind.o
cell_base.o : constants.o
cell_base.o : control_flags.o
cell_base.o : io_global.o
Expand Down Expand Up @@ -176,7 +177,6 @@ pseudo_types.o : kind.o
pseudo_types.o : radial_grids.o
ptoolkit.o : descriptors.o
ptoolkit.o : dspev_drv.o
ptoolkit.o : io_global.o
ptoolkit.o : kind.o
ptoolkit.o : parallel_include.o
ptoolkit.o : zhpev_drv.o
Expand All @@ -192,6 +192,7 @@ read_cards.o : parser.o
read_cards.o : wannier_new.o
read_cards.o : wrappers.o
read_input.o : ../iotk/src/iotk_module.o
read_input.o : input_parameters.o
read_input.o : io_global.o
read_input.o : kind.o
read_input.o : mp.o
Expand Down Expand Up @@ -339,6 +340,5 @@ xml_io_base.o : mp_global.o
xml_io_base.o : mp_wave.o
xml_io_base.o : parser.o
xml_io_base.o : wrappers.o
zhpev_drv.o : io_global.o
zhpev_drv.o : kind.o
fft_scalar.o : ../include/fft_defs.h
7 changes: 2 additions & 5 deletions NEB/src/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ input.o : ../../Modules/xml_io_base.o
input.o : path_input_parameters_module.o
input.o : path_variables.o
neb.o : ../../Modules/check_stop.o
neb.o : ../../Modules/command_line_options.o
neb.o : ../../Modules/environment.o
neb.o : ../../Modules/io_global.o
neb.o : ../../Modules/mp.o
neb.o : ../../Modules/mp_global.o
neb.o : ../../Modules/read_cards.o
neb.o : ../../Modules/read_namelists.o
neb.o : ../../Modules/read_xml.o
neb.o : ../../iotk/src/iotk_module.o
neb.o : ../../Modules/read_input.o
neb.o : path_base.o
neb.o : path_input_parameters_module.o
neb.o : path_io_routines.o
Expand Down Expand Up @@ -123,7 +121,6 @@ path_to_engine_fix_atom_pos.o : ../../Modules/kind.o
path_to_engine_fix_atom_pos.o : path_input_parameters_module.o
path_to_engine_fix_atom_pos.o : path_variables.o
path_variables.o : ../../Modules/kind.o
set_defaults.o : ../../Modules/input_parameters.o
set_defaults.o : ../../Modules/io_global.o
stop_run_path.o : ../../Modules/environment.o
stop_run_path.o : ../../Modules/io_global.o
Expand Down
27 changes: 10 additions & 17 deletions PHonon/PH/elphon.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!
! Copyright (C) 2001-2008 Quantum ESPRESSO group
! Copyright (C) 2001-2013 Quantum ESPRESSO group
! This file is distributed under the terms of the
! GNU General Public License. See the file `License'
! in the root directory of the present distribution,
Expand Down Expand Up @@ -449,7 +449,7 @@ SUBROUTINE elphsum ( )
! New version by Malgorzata Wierzbowska
!
USE kinds, ONLY : DP
USE constants, ONLY : pi, rytoev, degspin
USE constants, ONLY : pi, rytoev, ry_to_cmm1, ry_to_ghz, degspin
USE ions_base, ONLY : nat, ityp, tau
USE cell_base, ONLY : at, bg
USE lsda_mod, ONLY: isk, nspin
Expand All @@ -473,8 +473,8 @@ SUBROUTINE elphsum ( )
!
IMPLICIT NONE
! epsw = 20 cm^-1, in Ry
REAL(DP), PARAMETER :: Rytocm1 = 109737.57990d0, RytoGHz = 3.289828D6, &
RytoTHz = RytoGHz/1000.d0, epsw = 20.d0 / Rytocm1, eps = 1.0d-6
REAL(DP), PARAMETER :: epsw = 20.d0 / ry_to_cmm1
REAL(DP), PARAMETER :: eps = 1.0d-6
!
INTEGER :: iuna2Fsave = 40
!
Expand Down Expand Up @@ -810,7 +810,7 @@ SUBROUTINE elphsum ( )
else
lamb(nu,isig) = 0.0d0
endif
gam(nu,isig) = gam(nu,isig)*RytoGHz
gam(nu,isig) = gam(nu,isig)*ry_to_ghz
enddo !nu
enddo ! isig
!
Expand Down Expand Up @@ -904,7 +904,7 @@ SUBROUTINE elphsum_simple
! Rewritten by Matteo Calandra
!-----------------------------------------------------------------------
USE kinds, ONLY : DP
USE constants, ONLY : pi, ry_to_cmm1, rytoev
USE constants, ONLY : pi, ry_to_cmm1, ry_to_ghz, rytoev
USE ions_base, ONLY : nat
USE cell_base, ONLY : at, bg
USE symm_base, ONLY : s, irt, nsym, invs
Expand Down Expand Up @@ -1025,9 +1025,7 @@ SUBROUTINE elphsum_simple
!
! collect contributions from all pools (sum over k-points)
!

! CALL poolreduce (2 * 3 * nat * 3 * nat, el_ph_sum)
! CALL poolreduce (1, phase_space)

call mp_sum ( el_ph_sum , inter_pool_comm )
call mp_sum ( phase_space , inter_pool_comm )

Expand Down Expand Up @@ -1077,11 +1075,9 @@ SUBROUTINE elphsum_simple
ELSE
lambda = 0.d0
ENDIF
! 3.289828x10^6 is the conversion factor from Ry to GHz
WRITE (stdout, 9010) nu, lambda, gamma * 3.289828d6
IF (ionode) WRITE (iuelph, 9010) nu, lambda, gamma * &
3.289828d6
IF (qplot) gamma_disp(nu,isig,current_iq) = gamma * 3.289828d6
WRITE (stdout, 9010) nu, lambda, gamma * ry_to_gHz
IF (ionode) WRITE (iuelph, 9010) nu, lambda, gamma * ry_to_gHz
IF (qplot) gamma_disp(nu,isig,current_iq) = gamma * ry_to_gHz
ENDDO
ENDDO

Expand All @@ -1104,9 +1100,6 @@ SUBROUTINE elphsum_simple

END SUBROUTINE elphsum_simple




!-----------------------------------------------------------------------
FUNCTION dos_ef (ngauss, degauss, ef, et, wk, nks, nbnd)
!-----------------------------------------------------------------------
Expand Down
13 changes: 10 additions & 3 deletions PHonon/PH/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ davcio_drho.o : ../../Modules/kind.o
davcio_drho.o : ../../Modules/mp.o
davcio_drho.o : ../../Modules/mp_global.o
davcio_drho.o : ../../Modules/noncol.o
davcio_drho.o : ../../Modules/paw_variables.o
davcio_drho.o : phcom.o
deallocate_part.o : elph.o
deallocate_part.o : phcom.o
deallocate_phq.o : ../../Modules/becmod.o
Expand Down Expand Up @@ -638,7 +636,6 @@ el_ph_collect.o : ../../PW/src/pwcom.o
elph.o : ../../Modules/kind.o
elphon.o : ../../Modules/cell_base.o
elphon.o : ../../Modules/constants.o
elphon.o : ../../Modules/control_flags.o
elphon.o : ../../Modules/fft_base.o
elphon.o : ../../Modules/io_files.o
elphon.o : ../../Modules/io_global.o
Expand All @@ -658,10 +655,12 @@ elphon.o : ../../PW/src/start_k.o
elphon.o : ../../PW/src/symm_base.o
elphon.o : dfile_star.o
elphon.o : elph.o
elphon.o : io_dyn_mat.o
elphon.o : ph_restart.o
elphon.o : phcom.o
elphon.o : save_ph_input.o
ep_matrix_element_wannier.o : ../../Modules/cell_base.o
ep_matrix_element_wannier.o : ../../Modules/constants.o
ep_matrix_element_wannier.o : ../../Modules/fft_base.o
ep_matrix_element_wannier.o : ../../Modules/fft_interfaces.o
ep_matrix_element_wannier.o : ../../Modules/io_files.o
Expand Down Expand Up @@ -776,6 +775,7 @@ init_representations.o : ../../Modules/kind.o
init_representations.o : ../../Modules/mp.o
init_representations.o : ../../Modules/mp_global.o
init_representations.o : ../../PW/src/symm_base.o
init_representations.o : elph.o
init_representations.o : ph_restart.o
init_representations.o : phcom.o
initialize_ph.o : ../../PW/src/pwcom.o
Expand Down Expand Up @@ -1481,6 +1481,13 @@ write_modes.o : ../../Modules/io_global.o
write_modes.o : ../../Modules/ions_base.o
write_modes.o : ../../Modules/kind.o
write_modes.o : phcom.o
write_qplot_data.o : ../../Modules/constants.o
write_qplot_data.o : ../../Modules/io_global.o
write_qplot_data.o : ../../Modules/ions_base.o
write_qplot_data.o : ../../Modules/kind.o
write_qplot_data.o : ../../Modules/mp_global.o
write_qplot_data.o : elph.o
write_qplot_data.o : phcom.o
write_ramtns.o : ../../Modules/cell_base.o
write_ramtns.o : ../../Modules/constants.o
write_ramtns.o : ../../Modules/ions_base.o
Expand Down
7 changes: 7 additions & 0 deletions PP/src/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ chdens.o : ../../Modules/recvec_subs.o
chdens.o : ../../Modules/run_info.o
chdens.o : ../../Modules/wavefunctions.o
chdens.o : ../../PW/src/pwcom.o
chdens_bspline.o : ../../Modules/bspline.o
chdens_bspline.o : ../../Modules/cell_base.o
chdens_bspline.o : ../../Modules/fft_base.o
chdens_bspline.o : ../../Modules/io_global.o
chdens_bspline.o : ../../Modules/kind.o
compute_ppsi.o : ../../Modules/becmod.o
compute_ppsi.o : ../../Modules/cell_base.o
compute_ppsi.o : ../../Modules/io_global.o
Expand All @@ -149,6 +154,8 @@ compute_sigma_avg.o : ../../Modules/uspp.o
compute_sigma_avg.o : ../../Modules/wavefunctions.o
compute_sigma_avg.o : ../../PW/src/pwcom.o
compute_sigma_avg.o : ../../PW/src/scf_mod.o
cube.o : ../../Modules/cell_base.o
cube.o : ../../Modules/io_global.o
cube.o : ../../Modules/kind.o
d_matrix_nc.o : ../../Modules/kind.o
d_matrix_nc.o : ../../Modules/random_numbers.o
Expand Down
16 changes: 14 additions & 2 deletions PW/src/make.depend
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,18 @@ makov_payne.o : ../../Modules/mp_global.o
makov_payne.o : ../../Modules/recvec.o
makov_payne.o : pwcom.o
makov_payne.o : scf_mod.o
manypw.o : ../../Modules/cell_base.o
manypw.o : ../../Modules/check_stop.o
manypw.o : ../../Modules/command_line_options.o
manypw.o : ../../Modules/control_flags.o
manypw.o : ../../Modules/environment.o
manypw.o : ../../Modules/input_parameters.o
manypw.o : ../../Modules/io_global.o
manypw.o : ../../Modules/mp_global.o
manypw.o : ../../Modules/parameters.o
manypw.o : ../../Modules/read_input.o
manypw.o : ../../Modules/xml_io_base.o
manypw.o : pwcom.o
martyna_tuckerman.o : ../../Modules/cell_base.o
martyna_tuckerman.o : ../../Modules/constants.o
martyna_tuckerman.o : ../../Modules/control_flags.o
Expand Down Expand Up @@ -1202,14 +1214,13 @@ pwcom.o : ../../Modules/parameters.o
pwcom.o : ../../Modules/recvec.o
pwscf.o : ../../Modules/cell_base.o
pwscf.o : ../../Modules/check_stop.o
pwscf.o : ../../Modules/command_line_options.o
pwscf.o : ../../Modules/control_flags.o
pwscf.o : ../../Modules/environment.o
pwscf.o : ../../Modules/io_files.o
pwscf.o : ../../Modules/io_global.o
pwscf.o : ../../Modules/mp_global.o
pwscf.o : ../../Modules/parameters.o
pwscf.o : ../../Modules/read_input.o
pwscf.o : ../../Modules/xml_io_base.o
pwscf.o : ms2.o
pwscf.o : pwcom.o
qvan2.o : ../../Modules/kind.o
Expand Down Expand Up @@ -1640,6 +1651,7 @@ summary.o : bp_mod.o
summary.o : esm.o
summary.o : martyna_tuckerman.o
summary.o : pwcom.o
summary.o : realus.o
summary.o : symm_base.o
symm_base.o : ../../Modules/cell_base.o
symm_base.o : ../../Modules/io_global.o
Expand Down
Loading

0 comments on commit 2f1d6fe

Please sign in to comment.