Skip to content

Commit 4b760c6

Browse files
committed
update integrate tests
1 parent 58db013 commit 4b760c6

File tree

10 files changed

+38
-42
lines changed

10 files changed

+38
-42
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Obtain the electronci wave functions via the 'calculation get_wf' commond,
2-
for lcao multi-k algorithm
1+
Obtain the electronic wave functions via the 'calculation get_wf'
2+
opiton in 'INPUT' file, for LCAO multi k-point algorithm
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
BAND1_k_1_s_1_ENV.cube 1.06417
2-
BAND1_k_2_s_1_ENV.cube 1.06414
3-
BAND2_k_1_s_1_ENV.cube 1.07188
4-
BAND2_k_2_s_1_ENV.cube 1.07169
5-
BAND3_k_1_s_1_ENV.cube 1.0689
6-
BAND3_k_2_s_1_ENV.cube 1.06886
7-
BAND4_k_1_s_1_ENV.cube 1.06869
8-
BAND4_k_2_s_1_ENV.cube 1.06864
9-
totaltimeref 0.19544
1+
wf1s1k1.cube -11.65179721
2+
wf1s1k2.cube -3.691662805
3+
wf1s1k3.cube -3.691662805
4+
wf1s2k1.cube -11.65179721
5+
wf1s2k2.cube -3.691662805
6+
wf1s2k3.cube -3.691662805
7+
wf2s1k1.cube 0.1128845215
8+
wf2s1k2.cube 0.06528930664
9+
wf2s1k3.cube 0.06528930664
10+
wf2s2k1.cube 0.1128845215
11+
wf2s2k2.cube 0.06528930664
12+
wf2s2k3.cube 0.06528930664
13+
totaltimeref 0.46
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Obtain the electronci wave functions via the 'calculation get_wf' commond, for lcao gamma_only
1+
Obtain the electronic wave functions via the 'calculation get_wf'
2+
opiton in 'INPUT' file, for LCAO gamma_only
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
wf1s1.cube 1.063865347
2-
wf1s2.cube 1.063865347
3-
wf2s1.cube 1.067613307
4-
wf2s2.cube 1.067613308
5-
wf3s1.cube 1.067439633
6-
wf3s2.cube 1.067439633
7-
wf4s1.cube 1.064460607
8-
wf4s2.cube 1.064460607
9-
totaltimeref 0.37
1+
wf1s1.cube -11.64684896
2+
wf1s2.cube -11.64684895
3+
wf2s1.cube 0.1128951336
4+
wf2s2.cube 0.1128951337
5+
wf3s1.cube 18.89834207
6+
wf3s2.cube 18.89834207
7+
wf4s1.cube 0.1187879246
8+
wf4s2.cube 0.1187879246
9+
totaltimeref 0.36
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
get_pchg calculation for lcao gamma_only
1+
Obtain the charge density for selected states via the 'calculation get_pchg'
2+
opiton in 'INPUT' file, for LCAO gamma_only algorithm
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
BAND1_GAMMA_SPIN1_CHG.cube 2.06078
2-
BAND2_GAMMA_SPIN1_CHG.cube 2.07625
3-
BAND3_GAMMA_SPIN1_CHG.cube 2.07027
4-
BAND4_GAMMA_SPIN1_CHG.cube 2.06983
5-
totaltimeref 0.16856
1+
BAND1_GAMMA_SPIN1_CHG.cube 2.060784687
2+
BAND2_GAMMA_SPIN1_CHG.cube 2.076249844
3+
BAND3_GAMMA_SPIN1_CHG.cube 2.070272135
4+
BAND4_GAMMA_SPIN1_CHG.cube 2.06983289
5+
totaltimeref 0.17

tests/integrate/Autotest.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ stress_threshold=0.001
1313
ca=8
1414
# specify the test cases file
1515
cases_file=CASES_CPU.txt
16+
#cases_file=CASES_mylist.txt
1617
# regex of case name
1718
case='^[^#].*_.*$'
1819
# enable AddressSanitizer
@@ -176,7 +177,7 @@ check_out(){
176177
if [ $ifail -eq 1 ]; then
177178
let failed++
178179
failed_case_list+=$dir'\n'
179-
calculation=`grep calculation INPUT | awk '{print $2}' | sed s/[[:space:]]//g`
180+
calculation=`grep calculation INPUT | grep -v '^#' | awk '{print $2}' | sed s/[[:space:]]//g`
180181
running_path=`echo "OUT.autotest/running_$calculation"".log"`
181182
cat $running_path
182183
case_status+=$dir' 0\n'

tests/integrate/CASES_mylist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
312_NO_GO_wfc_get_pchg

tests/integrate/general_info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
EXEC /xxx/abacus
1+
EXEC /home/mohan/qianrui/abacus-mc/build/abacus
22
CHECKACCURACY 2
33
NUMBEROFPROCESS 4

tests/integrate/tools/catch_properties.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -519,21 +519,9 @@ fi
519519
#--------------------------------------------
520520
if [ $calculation == "get_pchg" ]; then
521521
nfile=0
522-
# chgfiles=`ls OUT.autotest/ | grep -E '_CHG$'`
523-
# if test -z "$chgfiles"; then
524-
# echo "Can't find BAND_CHG files"
525-
# exit 1
526-
# else
527-
# for chg in $chgfiles;
528-
# do
529-
# total_chg=`../tools/sum_BAND_CHG_H2 OUT.autotest/$chg`
530-
# nfile=$(($nfile+1))
531-
# echo "nelec$nfile $total_chg" >>$1
532-
# done
533-
# fi
534522
cubefiles=`ls OUT.autotest/ | grep -E '.cube$'`
535523
if test -z "$cubefiles"; then
536-
echo "Can't find BAND_CHG files"
524+
echo "Can't find cube files"
537525
exit 1
538526
else
539527
for cube in $cubefiles;

0 commit comments

Comments
 (0)