mirror of https://gitlab.com/QEF/q-e.git
[energy_current] removed old test dir, updated main Makefile
This commit is contained in:
Riccardo Bertossa
parent
a49ea18d0d
commit
6fa1517c84
4
Makefile
4
Makefile
|
|
@ -126,6 +126,10 @@ epw: phlibs
|
||||||
( cd EPW ; $(MAKE) all || exit 1; \
|
( cd EPW ; $(MAKE) all || exit 1; \
|
||||||
cd ../bin; ln -fs ../EPW/bin/epw.x . ); fi
|
cd ../bin; ln -fs ../EPW/bin/epw.x . ); fi
|
||||||
|
|
||||||
|
all_currents:
|
||||||
|
if test -d energy_current ; then \
|
||||||
|
( cd energy_current ; $(MAKE) all || exit 1; ) ; fi
|
||||||
|
|
||||||
travis : pwall epw
|
travis : pwall epw
|
||||||
if test -d test-suite ; then \
|
if test -d test-suite ; then \
|
||||||
( cd test-suite ; make run-travis || exit 1 ) ; fi
|
( cd test-suite ; make run-travis || exit 1 ) ; fi
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Makefile for energy_current
|
||||||
|
sinclude ../make.inc
|
||||||
|
|
||||||
|
default: all
|
||||||
|
|
||||||
|
all:
|
||||||
|
( cd src ; $(MAKE) all || exit 1 )
|
||||||
|
|
||||||
|
clean :
|
||||||
|
( cd src ; $(MAKE) clean )
|
||||||
|
|
||||||
|
doc:
|
||||||
|
(cd Doc ; $(MAKE) all || exit 1 )
|
||||||
|
|
||||||
|
doc_clean:
|
||||||
|
(cd Doc ; $(MAKE) clean )
|
||||||
|
|
||||||
|
distclean: clean doc_clean
|
||||||
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
||||||
include ../../make.inc
|
include ../../make.inc
|
||||||
# location of include files
|
# location of include files
|
||||||
#IFLAGS=-I../../include
|
#IFLAGS=-I../../include
|
||||||
F90FLAGS+=-fsanitize=address -Wall
|
#F90FLAGS+=-fsanitize=address -Wall
|
||||||
LDFLAGS+=-fsanitize=address
|
#LDFLAGS+=-fsanitize=address
|
||||||
# location of needed modules
|
# location of needed modules
|
||||||
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
|
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
|
||||||
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../../CPV/src $(MOD_FLAG)../../PHonon/PH \
|
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../../CPV/src $(MOD_FLAG)../../PHonon/PH \
|
||||||
|
|
@ -72,10 +72,4 @@ lib_all_currents.a : $(ALLCURRENTSOBJS)
|
||||||
clean :
|
clean :
|
||||||
- /bin/rm -f *.x *.o *~ *.F90 *.d *.mod *.i *.L lib_all_currents.a
|
- /bin/rm -f *.x *.o *~ *.F90 *.d *.mod *.i *.L lib_all_currents.a
|
||||||
|
|
||||||
maroni-sync:
|
|
||||||
( cd ../.. ; rsync -mrvt --include="*/" --include="*Makefile" --include="*make.depend" --include="*.f90" --exclude="*" . maroni:/marconi_work/Sis19_baroni/qe-thermalcurrents2/ )
|
|
||||||
|
|
||||||
mugon-sync:
|
|
||||||
( cd ../.. ; rsync -mrvt --include="*/" --include="*Makefile" --include="*make.depend" --include="*.f90" --exclude="*" . mugon:/scratch/rbertoss/qe-thermalcurrents2/ )
|
|
||||||
|
|
||||||
include make.depend
|
include make.depend
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
energy_current_*/total_axes*
|
|
||||||
energy_current_*/full_unformatted*
|
|
||||||
energy_current_*/test.out.*
|
|
||||||
energy_current_*/test.err.*
|
|
||||||
energy_current_*/current_hz*
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
# Copyright (C) 2001-2016 Quantum ESPRESSO group
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU General Public License
|
|
||||||
# as published by the Free Software Foundation; either version 2
|
|
||||||
# of the License. See the file `License' in the root directory
|
|
||||||
# of the present distribution.
|
|
||||||
|
|
||||||
# Edit this line every time a new reference is created
|
|
||||||
export REFERENCE_VERSION=6.0
|
|
||||||
|
|
||||||
# Edit this line _ONLY_ if you run test-code outside the QE main directory
|
|
||||||
# export ESPRESSO_ROOT=${PWD}/../
|
|
||||||
export ESPRESSO_ROOT=${PWD}/../../
|
|
||||||
|
|
||||||
# Edit this line to change the number of processors for parallel execution
|
|
||||||
export TESTCODE_NPROCS=4
|
|
||||||
|
|
||||||
#export ESPRESSO_PSEUDO=${ESPRESSO_ROOT}/pseudo
|
|
||||||
export ESPRESSO_PSEUDO=${PWD}/pseudo
|
|
||||||
export NETWORK_PSEUDO=http://www.quantum-espresso.org/wp-content/uploads/upf_files/
|
|
||||||
export TESTCODE_DIR=${ESPRESSO_ROOT}/test-suite/testcode
|
|
||||||
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (C) 2001 Quantum ESPRESSO
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU General Public License
|
|
||||||
# as published by the Free Software Foundation; either version 2
|
|
||||||
# of the License. See the file `License' in the root directory
|
|
||||||
# of the present distribution.
|
|
||||||
|
|
||||||
include ./ENVIRONMENT
|
|
||||||
|
|
||||||
default :
|
|
||||||
@echo 'To run Quantum ESPRESSO test-suite, type at the shell prompt:'
|
|
||||||
@echo ' '
|
|
||||||
@echo ' make target'
|
|
||||||
@echo ' '
|
|
||||||
@echo 'where <target> identifies an action'
|
|
||||||
@echo ' run-tests : run-tests-serial (default)'
|
|
||||||
@echo ' run-tests-serial : run all tests in SERIAL'
|
|
||||||
@echo ' run-tests-XX-serial : run tests for XX={pw,cp} only, as above'
|
|
||||||
@echo ' run-tests-parallel : run all tests in PARALLEL (4 MPI)'
|
|
||||||
@echo ' run-tests-XX-parallel : run tests for XX={pw,cp} only, as above'
|
|
||||||
@echo ' run-custom-test testdir=DIR : run test in DIR only (serial)'
|
|
||||||
@echo ' run-custom-test-parallel testdir=DIR : run test in DIR only (parallel 4 MPI)'
|
|
||||||
@echo ' compare : compare last output with reference'
|
|
||||||
@echo ' pseudo : download needed PPs into ESPRESSO_PSEUDO'
|
|
||||||
@echo ' clean : clean stdout/sderr of all tests'
|
|
||||||
@echo ' '
|
|
||||||
@echo 'For additional advanced commands and settings please manually inspect'
|
|
||||||
@echo 'ENVIRONMENT and Makefile files'
|
|
||||||
|
|
||||||
prolog :
|
|
||||||
@sed "s|XXXXXX|$(ESPRESSO_ROOT)|g" < userconfig.tmp > userconfig
|
|
||||||
|
|
||||||
|
|
||||||
pseudo :
|
|
||||||
@./check_pseudo.sh ./
|
|
||||||
|
|
||||||
|
|
||||||
run-tests : run-tests-serial
|
|
||||||
|
|
||||||
run-tests-serial : run-tests-all_currents-serial
|
|
||||||
|
|
||||||
run-tests-parallel : run-tests-all_currents-parallel
|
|
||||||
|
|
||||||
|
|
||||||
run-tests-all_currents-serial : prolog pseudo
|
|
||||||
@if ! test -d $(ESPRESSO_TMPDIR); then mkdir $(ESPRESSO_TMPDIR); fi
|
|
||||||
env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=all_currents_all
|
|
||||||
|
|
||||||
run-tests-all_currents-parallel : prolog pseudo
|
|
||||||
@if ! test -d $(ESPRESSO_TMPDIR); then mkdir $(ESPRESSO_TMPDIR); fi
|
|
||||||
env QE_USE_MPI=1 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=all_currents_all
|
|
||||||
|
|
||||||
|
|
||||||
run-custom-test : run-custom-test-serial
|
|
||||||
|
|
||||||
run-custom-test-serial : prolog pseudo
|
|
||||||
@if test -d $(testdir); then \
|
|
||||||
env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=$(testdir) ; fi
|
|
||||||
|
|
||||||
run-custom-test-parallel : prolog pseudo
|
|
||||||
@if test -d $(testdir); then \
|
|
||||||
env QE_USE_MPI=1 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=$(testdir) ; fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
create-reference-all_currents : prolog pseudo
|
|
||||||
@if ! test -d $(ESPRESSO_TMPDIR); then mkdir $(ESPRESSO_TMPDIR); fi
|
|
||||||
env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --category=all_currents_all make-benchmarks
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
compare : compare-all_currents
|
|
||||||
|
|
||||||
compare-all_currents : prolog pseudo
|
|
||||||
${TESTCODE_DIR}/bin/testcode.py --category=all_currents_all --verbose compare 2>&1 | tee out.ALL_CURRENTS.`date +%Y%m%d_%H%M%S`
|
|
||||||
|
|
||||||
|
|
||||||
clean:
|
|
||||||
# output files
|
|
||||||
@for x in `find energy_current_* -name "test*"`; do rm -rf $$x; done
|
|
||||||
# error files
|
|
||||||
@for x in `find energy_current_* -name "CRASH"`; do rm -rf $$x; done
|
|
||||||
@rm -f userconfig
|
|
||||||
|
|
||||||
# Calling 'purge' means remove all reference outputs... be careful!
|
|
||||||
purge: clean
|
|
||||||
@for x in `find energy_current_* -name "benchmark*"`; do rm -rf $$x; done
|
|
||||||
.PHONY: pseudo
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (C) 2001-2016 Quantum ESPRESSO group
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU General Public License
|
|
||||||
# as published by the Free Software Foundation; either version 2
|
|
||||||
# of the License. See the file `License' in the root directory
|
|
||||||
# of the present distribution.
|
|
||||||
|
|
||||||
if test "`which curl`" = "" ; then
|
|
||||||
if test "`which wget`" = "" ; then
|
|
||||||
echo "### wget or curl not found: will not be able to download missing PP ###"
|
|
||||||
else
|
|
||||||
DOWNLOADER="wget -O"
|
|
||||||
# echo "wget found"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
DOWNLOADER="curl -o"
|
|
||||||
# echo "curl found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ${ESPRESSO_PSEUDO}
|
|
||||||
echo ${NETWORK_PSEUDO}
|
|
||||||
inputs=`find $1* -type f -name "*.in" -not -name "test.*" -not -name "benchmark.*"`
|
|
||||||
pp_files=`for x in ${inputs}; do grep UPF ${x} | awk '{print $3}'; done`
|
|
||||||
|
|
||||||
for pp_file in ${pp_files} ; do
|
|
||||||
if ! test -f ${ESPRESSO_PSEUDO}/${pp_file} ; then
|
|
||||||
echo -n "Downloading ${pp_file} to ${ESPRESSO_PSEUDO} ... "
|
|
||||||
#${DOWNLOADER} ${ESPRESSO_PSEUDO}/${pp_file} ${NETWORK_PSEUDO}/${pp_file} 2> /dev/null
|
|
||||||
${DOWNLOADER} ${ESPRESSO_PSEUDO}/${pp_file} ${NETWORK_PSEUDO}/${pp_file}
|
|
||||||
if test $? != 0 ; then
|
|
||||||
echo "Download of" ${pp_file} "FAILED, do it manually -- Testing aborted!"
|
|
||||||
exit -1
|
|
||||||
#else
|
|
||||||
#echo "done."
|
|
||||||
fi
|
|
||||||
#else
|
|
||||||
#echo "No need to download ${pp_file}."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
[energy_current_rotation/]
|
|
||||||
program = h2o_mol
|
|
||||||
|
|
||||||
[energy_current_translation/]
|
|
||||||
program = translation
|
|
||||||
|
|
||||||
[energy_current_h2o]
|
|
||||||
program = h2o_mol_t
|
|
||||||
|
|
||||||
[categories]
|
|
||||||
all_currents_all = energy_current_*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../examples/pseudo
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
&energy_current
|
|
||||||
delta_t= 0.100,
|
|
||||||
file_output= 'current_hz_ar',
|
|
||||||
eta= 0.100,
|
|
||||||
n_max= 5,
|
|
||||||
! ec_test= .true.,
|
|
||||||
add_i_current_b = .true.,
|
|
||||||
re_init_wfc_1 = .true.,
|
|
||||||
n_repeat_every_step = 4
|
|
||||||
/
|
|
||||||
&CONTROL
|
|
||||||
calculation='md',
|
|
||||||
restart_mode='from_scratch',
|
|
||||||
pseudo_dir='../../pseudo',
|
|
||||||
outdir='./save',
|
|
||||||
disk_io = 'none',
|
|
||||||
/
|
|
||||||
&SYSTEM
|
|
||||||
ibrav=1,
|
|
||||||
celldm(1) = 10.,
|
|
||||||
nat= 1,
|
|
||||||
ntyp= 1,
|
|
||||||
ecutwfc = 40.d0,
|
|
||||||
/
|
|
||||||
&ELECTRONS
|
|
||||||
conv_thr = 1.D-15,
|
|
||||||
mixing_beta = 0.7,
|
|
||||||
startingwfc = 'random'
|
|
||||||
/
|
|
||||||
&IONS
|
|
||||||
ion_velocities = 'from_input',
|
|
||||||
/
|
|
||||||
ATOMIC_SPECIES
|
|
||||||
Ar 39.948 Ar.pbe-mt.UPF
|
|
||||||
ATOMIC_POSITIONS (bohr)
|
|
||||||
Ar 0.0 0.0 0.0
|
|
||||||
ATOMIC_VELOCITIES
|
|
||||||
Ar 1.d-5 1.d-5 1.d-5
|
|
||||||
|
|
||||||
K_POINTS {Gamma}
|
|
||||||
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
&energy_current
|
|
||||||
delta_t= 0.500,
|
|
||||||
file_output= 'current_hz_h2o',
|
|
||||||
eta= 0.100,
|
|
||||||
n_max= 5,
|
|
||||||
add_i_current_b = .true.,
|
|
||||||
re_init_wfc_1 = .true.,
|
|
||||||
n_repeat_every_step = 10
|
|
||||||
/
|
|
||||||
&CONTROL
|
|
||||||
calculation='md',
|
|
||||||
restart_mode='from_scratch',
|
|
||||||
pseudo_dir='../../pseudo',
|
|
||||||
outdir='./save',
|
|
||||||
disk_io = 'none',
|
|
||||||
/
|
|
||||||
&SYSTEM
|
|
||||||
ibrav=1,
|
|
||||||
celldm(1) = 10.,
|
|
||||||
nat= 3,
|
|
||||||
ntyp= 2,
|
|
||||||
ecutwfc = 40.d0,
|
|
||||||
/
|
|
||||||
&ELECTRONS
|
|
||||||
conv_thr = 1.D-11,
|
|
||||||
mixing_beta = 0.7,
|
|
||||||
/
|
|
||||||
&IONS
|
|
||||||
ion_velocities = 'from_input',
|
|
||||||
/
|
|
||||||
ATOMIC_SPECIES
|
|
||||||
H 1.00000000 H.pbe-vbc.UPF
|
|
||||||
O 16.00000000 O.pbe-mt.UPF
|
|
||||||
ATOMIC_POSITIONS {bohr}
|
|
||||||
H 0.57164238 0.94335166 0.96565043
|
|
||||||
H -0.24339682 -0.43501513 -1.37874473
|
|
||||||
O -0.32824556 -0.50852550 0.41309430
|
|
||||||
ATOMIC_VELOCITIES
|
|
||||||
H -0.38060793839043E-03 0.11644696237662E-02 -0.18055220775137E-03
|
|
||||||
H 0.14854564679755E-02 -0.65844095250918E-03 -0.37960675829410E-02
|
|
||||||
O -0.69053033099076E-04 -0.31626791953560E-04 0.24853873691829E-03
|
|
||||||
K_POINTS {Gamma}
|
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
[h2o_mol_t]
|
|
||||||
exe = XXXXXX/energy_current/tests/run-all_currents.x
|
|
||||||
extract_program = XXXXXX/energy_current/tests/extract-all_currents.x
|
|
||||||
inputs_args = ('*.in', '')
|
|
||||||
run_cmd_template = tc.program tc.input tc.output tc.error
|
|
||||||
tolerance = ( (1.0e-1, 2.5e-5 ) )
|
|
||||||
skip_program = grep
|
|
||||||
skip_args = 'not present in this version'
|
|
||||||
|
|
||||||
[h2o_mol]
|
|
||||||
exe = XXXXXX/energy_current/tests/run-all_currents.x
|
|
||||||
extract_program = XXXXXX/energy_current/tests/extract-all_currents.x
|
|
||||||
inputs_args = ('*.in', '')
|
|
||||||
run_cmd_template = tc.program tc.input tc.output tc.error
|
|
||||||
tolerance = ( (1.0e-1, 1.0e-7 ) )
|
|
||||||
skip_program = grep
|
|
||||||
skip_args = 'not present in this version'
|
|
||||||
|
|
||||||
[translation]
|
|
||||||
exe = XXXXXX/energy_current/tests/run-all_currents.x
|
|
||||||
extract_program = XXXXXX/energy_current/tests/extract-all_currents.x
|
|
||||||
inputs_args = ('*.in', '')
|
|
||||||
run_cmd_template = tc.program tc.input tc.output tc.error
|
|
||||||
tolerance = ( (1.0e-2, 1.0e-4 ) )
|
|
||||||
skip_program = grep
|
|
||||||
skip_args = 'not present in this version'
|
|
||||||
|
|
||||||
|
|
||||||
[user]
|
|
||||||
benchmark = 20210518
|
|
||||||
date_fmt = %d%m%y
|
|
||||||
diff = vimdiff
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue