Skip to content

Commit 7e0c98e

Browse files
authored
Merge branch 'deepmodeling:develop' into develop
2 parents 4b82a10 + 46797ad commit 7e0c98e

File tree

742 files changed

+17246
-14248
lines changed

Some content is hidden

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

742 files changed

+17246
-14248
lines changed

docs/advanced/input_files/input-main.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
- [kpar](#kpar)
1212
- [bndpar](#bndpar)
1313
- [latname](#latname)
14-
- [psi\_initializer](#psi_initializer)
1514
- [init\_wfc](#init_wfc)
1615
- [init\_chg](#init_chg)
1716
- [init\_vel](#init_vel)
@@ -93,6 +92,7 @@
9392
- [scf\_os\_stop](#scf_os_stop)
9493
- [scf\_os\_thr](#scf_os_thr)
9594
- [scf\_os\_ndim](#scf_os_ndim)
95+
- [sc\_os\_ndim](#sc_os_ndim)
9696
- [chg\_extrap](#chg_extrap)
9797
- [lspinorb](#lspinorb)
9898
- [noncolin](#noncolin)
@@ -467,7 +467,7 @@
467467
- [abs\_broadening](#abs_broadening)
468468
- [ri\_hartree\_benchmark](#ri_hartree_benchmark)
469469
- [aims\_nbasis](#aims_nbasis)
470-
- [Reduced Density Matrix Functional Theory](#Reduced-Density-Matrix-Functional-Theory)
470+
- [Reduced Density Matrix Functional Theory](#reduced-density-matrix-functional-theory)
471471
- [rdmft](#rdmft)
472472
- [rdmft\_power\_alpha](#rdmft_power_alpha)
473473

@@ -580,17 +580,6 @@ These variables are used to control general system parameters.
580580
- triclinic: triclinic (14)
581581
- **Default**: none
582582

583-
### psi_initializer
584-
585-
- **Type**: Integer
586-
- **Description**: enable the experimental feature psi_initializer, to support use numerical atomic orbitals initialize wavefunction (`basis_type pw` case).
587-
588-
NOTE: this feature is not well-implemented for `nspin 4` case (closed presently), and cannot use with `calculation nscf`/`esolver_type sdft` cases.
589-
Available options are:
590-
- 0: disable psi_initializer
591-
- 1: enable psi_initializer
592-
- **Default**: 0
593-
594583
### init_wfc
595584

596585
- **Type**: String
@@ -602,8 +591,6 @@ These variables are used to control general system parameters.
602591
- atomic+random: add small random numbers on atomic pseudo-wavefunctions
603592
- file: from binary files `WAVEFUNC*.dat`, which are output by setting [out_wfc_pw](#out_wfc_pw) to `2`.
604593
- random: random numbers
605-
606-
with `psi_initializer 1`, two more options are supported:
607594
- nao: from numerical atomic orbitals. If they are not enough, other wave functions are initialized with random numbers.
608595
- nao+random: add small random numbers on numerical atomic orbitals
609596
- **Default**: atomic

docs/advanced/scf/hsolver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Method of explicit solving KS-equation can be chosen by variable "ks_solver" in INPUT file.
66

7-
When "basis_type = pw", `ks_solver` can be `cg`, `bpcg` or `dav`. The `bpcg` method only supports K-point parallelism currently. The default setting `cg` is recommended, which is band-by-band conjugate gradient diagonalization method. There is a large probability that the use of setting of `dav` , which is block Davidson diagonalization method, can be tried to improve performance.
7+
When "basis_type = pw", `ks_solver` can be `cg`, `bpcg` or `dav`. The default setting `cg` is recommended, which is band-by-band conjugate gradient diagonalization method. There is a large probability that the use of setting of `dav` , which is block Davidson diagonalization method, can be tried to improve performance.
88

99
When "basis_type = lcao", `ks_solver` can be `genelpa` or `scalapack_gvx`. The default setting `genelpa` is recommended, which is based on ELPA (EIGENVALUE SOLVERS FOR PETAFLOP APPLICATIONS) (https://elpa.mpcdf.mpg.de/) and the kernel is auto choosed by GENELPA(https://github.com/pplab/GenELPA), usually faster than the setting of "scalapack_gvx", which is based on ScaLAPACK(Scalable Linear Algebra PACKage)
1010

examples/band/lcao_Si2/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Cartesian //Cartesian or Direct coordinate.

examples/charge_density/lcao_nspin1_Si2/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Cartesian //Cartesian or Direct coordinate.

examples/density_matrix/lcao_nspin1_Si2/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Cartesian //Cartesian or Direct coordinate.

examples/dos/lcao_Si2/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Cartesian //Cartesian or Direct coordinate.

examples/lr-tddft/lcao_Si2/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ LATTICE_CONSTANT
1111
10.2 #Lattice constant
1212

1313
LATTICE_VECTORS
14-
0.5 0.5 0.0 #Lattice vector 1
14+
0.0 0.5 0.5 #Lattice vector 1
1515
0.5 0.0 0.5 #Lattice vector 2
16-
0.0 0.5 0.5 #Lattice vector 3
16+
0.5 0.5 0.0 #Lattice vector 3
1717

1818
ATOMIC_POSITIONS
1919
Cartesian #Cartesian(Unit is LATTICE_CONSTANT)

examples/matrix_hs/out_hs2_multik/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Direct

examples/matrix_hs/out_hs_gammaonly/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
20 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Direct

examples/matrix_hs/out_hs_multik/STRU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ LATTICE_CONSTANT
88
10.2 // add lattice constant
99

1010
LATTICE_VECTORS
11-
0.5 0.5 0.0
12-
0.5 0.0 0.5
1311
0.0 0.5 0.5
12+
0.5 0.0 0.5
13+
0.5 0.5 0.0
1414

1515
ATOMIC_POSITIONS
1616
Direct

0 commit comments

Comments
 (0)