Merge pull request #813 from YuLiu98/develop

update name of some INPUT parameters

Author: mohanchen

doc/examples/band-struc.md

@@ -21,8 +21,8 @@ read_file_dir   ./
 #Parameters (Accuracy)
 ecutwfc 60
 scf_nmax 50
-scf_thr_rho 1.0e-9
-diag_thr_e 1.0e-7
+scf_thr 1.0e-9
+pw_diag_thr 1.0e-7
 
 #Parameters (File)
 init_chg file

doc/examples/basic-lcao.md

@@ -52,7 +52,7 @@ basis:
  ---------------------------------------------------------
  SELF-CONSISTENT : 
  ---------------------------------------------------------
- ITER   ETOT(eV)       EDIFF(eV)      SCF_THR_RHO      TIME(s)    
+ ITER   ETOT(eV)       EDIFF(eV)      SCF_THR      TIME(s)    
  GE1    -2.138667e+02  0.000000e+00   1.652e-01  4.690e+00  
  GE2    -2.139153e+02  -4.859216e-02  3.480e-02  4.970e+00  
  GE3    -2.139161e+02  -8.407097e-04  4.131e-03  4.760e+00  

doc/examples/basic-pw.md

@@ -16,7 +16,7 @@ For this example, the input files are:
     suffix Si2_diamond
     symmetry 1
     scf_nmax 60
-    scf_thr_rho 1.0e-9
+    scf_thr 1.0e-9
     out_chg 1
     ```
 
@@ -50,7 +50,7 @@ For this example, the input files are:
 
     - scf_nmax
         The maximal iteration number for electronic-structure calculations.
-    - scf_thr_rho
+    - scf_thr
         Tolerance of the difference of charge density, below which the self-consistent calculation is considered to be converged.
     - out_chg
         Print out the charge density(=1) or not(=0).
@@ -131,7 +131,7 @@ The following typical output information will be printed to the screen:
  -------------------------------------------
  SELF-CONSISTENT : 
  -------------------------------------------
- ITER   ETOT(eV)       EDIFF(eV)      SCF_THR_RHO      CG_ITER    TIME(S)    
+ ITER   ETOT(eV)       EDIFF(eV)      SCF_THR      CG_ITER    TIME(S)    
  CG1    -2.154524e+02  0.000000e+00   6.855e-02  1.000e+00  1.290e+00  
  CG2    -2.154992e+02  -4.673475e-02  2.378e-03  2.000e+00  8.400e-01  
  CG3    -2.155050e+02  -5.882715e-03  8.220e-05  2.594e+00  9.000e-01  

doc/examples/berry-phase.md

@@ -27,7 +27,7 @@ nbands        25 // number of bands
 ecutwfc       50 // Ry
 scf_nmax         20
 symmetry      0 // turn off symmetry
-diag_thr_e          1e-10
+pw_diag_thr          1e-10
 smearing_method      gaussian // gaussian smearing
 smearing_sigma         0.002 // Ry
 calculation   nscf // non-self-consistent calculation

doc/examples/dispersion.md

@@ -25,7 +25,7 @@ Below is an example using DFT + dispersion calculation:
 INPUT_PARAMETERS
 ntype                         2
 ecutwfc                       20
-scf_thr_rho                           1e-06
+scf_thr                           1e-06
 scf_nmax                         400
 basis_type                    lcao
 ks_solver                     genelpa
@@ -125,7 +125,7 @@ The files (`Sn_ONCV_PBE-1.0.upf`,`Te_ONCV_PBE-1.0.upf`,`Sn_pbe_9.0au_100Ry_2s2p2
  ---------------------------------------------------------
  SELF-CONSISTENT : 
  ---------------------------------------------------------
- ITER   ETOT(eV)       EDIFF(eV)      SCF_THR_RHO      TIME(s)    
+ ITER   ETOT(eV)       EDIFF(eV)      SCF_THR      TIME(s)    
  GE1    -4.263615e+03  0.000000e+00   1.030e-01  1.030e+00  
  GE2    -4.262783e+03  8.325232e-01   6.041e-02  1.010e+00  
  GE3    -4.262610e+03  1.722243e-01   2.263e-02  1.040e+00  

doc/examples/dos.md

@@ -23,8 +23,8 @@ read_file_dir   ./
 ecutwfc 60
 symmetry 1
 scf_nmax 50
-scf_thr_rho 1.0e-9
-diag_thr_e 1.0e-7
+scf_thr 1.0e-9
+pw_diag_thr 1.0e-7
 
 #Parameters (File)
 init_chg file
@@ -42,9 +42,9 @@ Some parameters in the INPUT file are explained:
 
     choose which kind of calculation: scf calculation, nscf calculation, structure relaxation or Molecular Dynamics. Now we need to do one step of nscf calculation.
     Attention: This is a main variable of ABACUS, and for its more information please see the [list of input variables](../input-main.md).
-- diag_thr_e
+- pw_diag_thr
 
-    threshold for the CG method which diagonalizes the Hamiltonian to get eigenvalues and eigen wave functions. If one wants to do nscf calculation, diag_thr_e needs to be changed to a smaller account, typically smaller than 1.0e-3. Note that this parameter only apply to plane-wave calculations that employ the CG method to diagonalize the Hamiltonian.
+    threshold for the CG method which diagonalizes the Hamiltonian to get eigenvalues and eigen wave functions. If one wants to do nscf calculation, pw_diag_thr needs to be changed to a smaller account, typically smaller than 1.0e-3. Note that this parameter only apply to plane-wave calculations that employ the CG method to diagonalize the Hamiltonian.
 
     For LCAO calculations, this parameter will be neglected !
 - init_chg

doc/examples/force.md

@@ -44,7 +44,7 @@ relax_bfgs_init 0.5
 
 - `cg_bfgs`
 
-    A mixed cg-bfgs method. For detail description, check out the variable relax_cg_thr_e in the [list of input keywords](../input-main.md#cg-threshold).
+    A mixed cg-bfgs method. For detail description, check out the variable relax_cg_thr in the [list of input keywords](../input-main.md#cg-threshold).
 
 - `sd`
 

doc/examples/md.md

@@ -24,7 +24,7 @@ smearing_method            gaussian
 smearing_sigma               0.02
 #Parameters (3.PW)
 ecutwfc             30
-scf_thr_rho                 1e-5
+scf_thr                 1e-5
 scf_nmax               100
 
 #Parameters (5.LCAO)

doc/examples/potential.md

@@ -13,7 +13,7 @@ gamma_only 0
 
 #Parameters (2.Iteration)
 ecutwfc 50
-scf_thr_rho 1e-8
+scf_thr 1e-8
 scf_nmax 200
 
 #Parameters (3.Basis)

doc/examples/tddft.md

@@ -24,7 +24,7 @@ basis_type lcao
 out_chg 1
 gamma_only 0
 md_nstep 2000
-scf_thr_rho 1.0e-6
+scf_thr 1.0e-6
 md_type 0
 md_dt 0.01
 md_tfirst 30