Skip to content

Commit 8baf4e8

Browse files
committed
Merge branch 'develop' of https://gitee.com/deepmodeling/abacus-develop into mybfgs
2 parents 37461e5 + 6bff8e3 commit 8baf4e8

File tree

269 files changed

+3733
-3505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+3733
-3505
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
env:
2626
OMP_NUM_THREADS: 1
2727
run: |
28-
cmake --build build --target test ARGS="-V --timeout 21600"
28+
cmake --build build --target test ARGS="-V --timeout 21600" || exit 0
2929
- name: Upload Coverage to Codecov
3030
uses: codecov/codecov-action@v4
3131
if: ${{ ! cancelled() }}

docs/advanced/input_files/input-main.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ Note: In new angle mixing, you should set `mixing_beta_mag >> mixing_beta`. The
11761176

11771177
- **Type**: Integer
11781178
- **Description**: Print out energy for each band for every printe step
1179-
- **Default**: 100
1179+
- **Default**: `scf_nmax`
11801180

11811181
### scf_nmax
11821182

examples/band/lcao_Si2/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ if [[ ! -f scf.output ]] ||
1919
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]] ||
2020
[[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total Time :"* ) ]]
2121
then
22-
echo "job is failed!"
22+
echo "job failed!"
2323
exit 1
2424
else
25-
echo "job is successed!"
25+
echo "job succeeded!"
2626
exit 0
2727
fi
2828

examples/band/pw_Al/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ if [[ ! -f scf.output ]] ||
1919
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]] ||
2020
[[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total Time :"* ) ]]
2121
then
22-
echo "job is failed!"
22+
echo "job failed!"
2323
exit 1
2424
else
25-
echo "job is successed!"
25+
echo "job succeeded!"
2626
exit 0
2727
fi

examples/berryphase/lcao_PbTiO3/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ if [[ ! -f scf.output ]] ||
2121
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]] ||
2222
[[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total Time :"* ) ]]
2323
then
24-
echo "job is failed!"
24+
echo "job failed!"
2525
exit 1
2626
else
27-
echo "job is successed!"
27+
echo "job succeeded!"
2828
exit 0
2929
fi

examples/berryphase/pw_PbTiO3/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ if [[ ! -f scf.output ]] ||
1919
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]] ||
2020
[[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total Time :"* ) ]]
2121
then
22-
echo "job is failed!"
22+
echo "job failed!"
2323
exit 1
2424
else
25-
echo "job is successed!"
25+
echo "job succeeded!"
2626
exit 0
2727
fi

examples/bravais_lattice/fcc_SiO2/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
1010
[[ ! -f OUT.ABACUS/running_scf.log ]] ||
1111
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]]
1212
then
13-
echo "job is failed!"
13+
echo "job failed!"
1414
exit 1
1515
else
16-
echo "job is successed!"
16+
echo "job succeeded!"
1717
exit 0
1818
fi

examples/bravais_lattice/hexagonal_MoS2/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
1010
[[ ! -f OUT.ABACUS/running_scf.log ]] ||
1111
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]]
1212
then
13-
echo "job is failed!"
13+
echo "job failed!"
1414
exit 1
1515
else
16-
echo "job is successed!"
16+
echo "job succeeded!"
1717
exit 0
1818
fi

examples/bravais_lattice/so_SnTe/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
1010
[[ ! -f OUT.ABACUS/running_scf.log ]] ||
1111
[[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total Time :"* ) ]]
1212
then
13-
echo "job is failed!"
13+
echo "job failed!"
1414
exit 1
1515
else
16-
echo "job is successed!"
16+
echo "job succeeded!"
1717
exit 0
1818
fi

examples/bsse/water/INPUT

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1+
#this is the input of using counterpoise to correct the BSSE error
2+
#
13
INPUT_PARAMETERS
24
#Parameters (General)
35
pseudo_dir ../../../tests/PP_ORB
46
orbital_dir ../../../tests/PP_ORB
57
#Parameters (Accuracy)
6-
ecutwfc 60 ### Please refer to orbital files[1] to set ecutwfc for LCAO basis.
8+
ecutwfc 60 ###Energy cutoff needs to be tested to ensure your calculation is reliable.[1]
79
scf_nmax 100
810
scf_thr 1e-6
911
basis_type lcao
1012

11-
gamma_only 1 ### Abacus will generate KPT file when gamma_only=1.
13+
gamma_only 1 ### Abacus will generate/overwrite a KPT file when gamma_only is set to 1.
1214

1315
smearing_method gauss
14-
smearing_sigma 0.02
16+
smearing_sigma 0.015
1517

1618

17-
### [1]The energy cutoff of a LCAO basis can be found in lines starting with "Energy Cutoff" of a .orb file.
19+
### [1] Energy cutoff determines the quality of numerical quadratures in your calculations.
20+
### So it is strongly recommended to test whether your result (such as converged SCF energies) is
21+
### converged with respect to the energy cutoff.

0 commit comments

Comments
 (0)