Merge branch 'mc' of github.com:YuleZhang936/abacus-develop into mc

Author: jinzx10

docs/advanced/input_files/input-main.md

@@ -1389,7 +1389,7 @@ These variables are used to control the geometry relaxation.
 
 - **Type**: Integer
 - **Description**: The maximal number of ionic iteration steps, the minimum value is 1.
-- **Default**: 1
+- **Default**: 1 for SCF, 50 for relax and cell-relax calcualtions
 
 ### relax_cg_thr
 

examples/band/lcao_Si2/run.sh

@@ -19,10 +19,10 @@ if [[ ! -f scf.output ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi
 

examples/band/pw_Al/run.sh

@@ -19,9 +19,9 @@ if [[ ! -f scf.output ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/berryphase/lcao_PbTiO3/run.sh

@@ -21,9 +21,9 @@ if [[ ! -f scf.output ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/berryphase/pw_PbTiO3/run.sh

@@ -19,9 +19,9 @@ if [[ ! -f scf.output ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_nscf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/bravais_lattice/fcc_SiO2/run.sh

@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
    [[ ! -f OUT.ABACUS/running_scf.log ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/bravais_lattice/hexagonal_MoS2/run.sh

@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
    [[ ! -f OUT.ABACUS/running_scf.log ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/bravais_lattice/so_SnTe/run.sh

@@ -10,9 +10,9 @@ if [[ ! -f output ]] ||
    [[ ! -f OUT.ABACUS/running_scf.log ]] ||
    [[ ! ( "$(tail -1 OUT.ABACUS/running_scf.log)" == " Total  Time  :"* ) ]]
 then
-	echo "job is failed!"
+	echo "job failed!"
 	exit 1
 else
-	echo "job is successed!"
+	echo "job succeeded!"
 	exit 0
 fi

examples/bsse/water/INPUT

@@ -1,17 +1,21 @@
+#this is the input of using counterpoise to correct the BSSE error
+#
 INPUT_PARAMETERS
 #Parameters	(General)
 pseudo_dir		../../../tests/PP_ORB
 orbital_dir		../../../tests/PP_ORB
 #Parameters (Accuracy)
-ecutwfc			 60 ### Please refer to orbital files[1] to set ecutwfc for LCAO basis.
+ecutwfc			 60 ###Energy cutoff needs to be tested to ensure your calculation is reliable.[1]
 scf_nmax		100
 scf_thr                 1e-6
 basis_type		lcao
 
-gamma_only 1 ### Abacus will generate KPT file when gamma_only=1.
+gamma_only 1 ### Abacus will generate/overwrite a KPT file when gamma_only is set to 1.
 
 smearing_method gauss
-smearing_sigma 0.02
+smearing_sigma 0.015
 
 
-### [1]The energy cutoff of a LCAO basis can be found in lines starting with "Energy Cutoff" of a .orb file.
+### [1] Energy cutoff determines the quality of numerical quadratures in your calculations.
+###     So it is strongly recommended to test whether your result (such as converged SCF energies) is
+###     converged with respect to the energy cutoff.

examples/bsse/water/KPT

@@ -2,3 +2,4 @@ K_POINTS
 0
 Gamma
 1 1 1 0 0 0
+###This file will be overwritten by Abacus because either kspacing is used or gamma_only is set to 1