Commit 13bc176a authored by giannozz's avatar giannozz

More check_stop / max_seconds / input_parameters cleanup


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@13769 c92efa57-630b-4861-b058-cf58834340f0
parent bf80dd98
......@@ -137,7 +137,6 @@ macro.o : ../../Modules/io_files.o
macro.o : ../../PW/src/pwcom.o
macro.o : cgcom.o
phcg.o : ../../Modules/cell_base.o
phcg.o : ../../Modules/check_stop.o
phcg.o : ../../Modules/constants.o
phcg.o : ../../Modules/control_flags.o
phcg.o : ../../Modules/environment.o
......
......@@ -13,7 +13,6 @@ PROGRAM phcg
USE ions_base, ONLY: nat, tau
USE io_global, ONLY: ionode
USE io_files, ONLY: seqopn
USE check_stop, ONLY: check_stop_init
USE mp_global, ONLY: mp_startup, mp_global_end
USE environment, ONLY: environment_start
USE cgcom
......@@ -26,8 +25,6 @@ PROGRAM phcg
LOGICAL :: exst
INTEGER :: i
!
CALL check_stop_init ()
!
! Initialize MPI, clocks, print initial messages
!
#if defined(__MPI)
......
......@@ -22,7 +22,8 @@ subroutine bcast_ph_input ( )
niter_ph, lnoloc, alpha_mix, tr2_ph, recover, &
ldisp, reduce_io, zue, zeu, epsil, trans, &
ldiag, lqdir, search_sym, electron_phonon, &
qplot, only_init, only_wfc, low_directory_check
qplot, only_init, only_wfc, low_directory_check, &
max_seconds
USE gamma_gamma, ONLY : asr
USE disp, ONLY : nq1, nq2, nq3
USE partial, ONLY : nat_todo
......@@ -31,7 +32,6 @@ subroutine bcast_ph_input ( )
use io_files, ONLY : tmp_dir, prefix
USE control_flags, only: iverbosity, modenum
USE ramanm, ONLY: lraman, elop, dek, eth_rps, eth_ns
USE input_parameters, ONLY: max_seconds
USE input_parameters, ONLY : nk1, nk2, nk3, k1, k2, k3
USE ions_base, ONLY : amass
USE io_global, ONLY : meta_ionode_id
......
......@@ -951,6 +951,7 @@ phq_init.o : acfdtest.o
phq_init.o : elph.o
phq_init.o : phcom.o
phq_readin.o : ../../LR_Modules/lrcom.o
phq_readin.o : ../../Modules/check_stop.o
phq_readin.o : ../../Modules/control_flags.o
phq_readin.o : ../../Modules/fft_base.o
phq_readin.o : ../../Modules/funct.o
......
......@@ -205,7 +205,7 @@ MODULE control_ph
start_q, last_q ! initial q in the list, last_q in the list
REAL(DP) :: tr2_ph ! threshold for phonon calculation
REAL(DP) :: alpha_mix(maxter), & ! the mixing parameter
time_now ! CPU time up to now
max_seconds = 1.0D+7 ! max CPU time
CHARACTER(LEN=10) :: where_rec='no_recover'! where the ph run recovered
CHARACTER(LEN=12) :: electron_phonon
CHARACTER(LEN=256) :: flmixdpot, tmp_dir_ph, tmp_dir_phq
......
......@@ -22,7 +22,7 @@ SUBROUTINE phq_readin()
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : world_comm
USE ions_base, ONLY : amass, atm
USE input_parameters, ONLY : max_seconds, nk1, nk2, nk3, k1, k2, k3
USE input_parameters, ONLY : nk1, nk2, nk3, k1, k2, k3
USE start_k, ONLY : reset_grid
USE klist, ONLY : xk, nks, nkstot, lgauss, two_fermi_energies, ltetra
USE control_flags, ONLY : gamma_only, tqr, restart, lkpoint_dir, io_level, &
......@@ -43,7 +43,7 @@ SUBROUTINE phq_readin()
ext_recover, ext_restart, u_from_file, ldiag, &
search_sym, lqdir, electron_phonon, tmp_dir_phq, &
rec_code_read, qplot, only_init, only_wfc, &
low_directory_check
low_directory_check, max_seconds
USE save_ph, ONLY : tmp_dir_save, save_ph_input_variables
USE gamma_gamma, ONLY : asr
......@@ -79,6 +79,7 @@ SUBROUTINE phq_readin()
! YAMBO <
USE elph_tetra_mod,ONLY : elph_tetra, lshift_q, in_alpha2f
USE ktetra, ONLY : tetra_type
USE check_stop, ONLY : check_stop_init
!
IMPLICIT NONE
!
......@@ -824,6 +825,8 @@ SUBROUTINE phq_readin()
CALL save_ph_input_variables()
!
CALL check_stop_init( max_seconds)
!
RETURN
!
END SUBROUTINE phq_readin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment