Skip to content

Commit 2a31da8

Browse files
committed
Merge branch 'develop' into deepks_append_npy
2 parents fafa246 + 867adf7 commit 2a31da8

File tree

1,574 files changed

+6050
-3560
lines changed

Some content is hidden

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

1,574 files changed

+6050
-3560
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ set(ABACUS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source)
167167
set(ABACUS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
168168
set(ABACUS_BIN_PATH ${CMAKE_CURRENT_BINARY_DIR}/${ABACUS_BIN_NAME})
169169
include_directories(${ABACUS_SOURCE_DIR})
170-
include_directories(${ABACUS_SOURCE_DIR}/module_base/module_container)
170+
include_directories(${ABACUS_SOURCE_DIR}/source_base/module_container)
171171

172172
set(CMAKE_CXX_STANDARD 11)
173173
set(CMAKE_CXX_STANDARD_REQUIRED ON)

docs/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The source code of ABACUS is based on several modules. Under the ABACUS root dir
3939
For those who are interested in the source code, the following figure shows the structure of the source code.
4040

4141
```text
42-
|-- module_base A basic module including
42+
|-- source_base A basic module including
4343
| | (1) Mathematical library interface functions: BLAS, LAPACK, Scalapack;
4444
| | (2) Custom data classes: matrix, vector definitions and related functions;
4545
| | (3) Parallelization functions: MPI, OpenMP;
@@ -57,7 +57,7 @@ For those who are interested in the source code, the following figure shows the
5757
|-- module_elecstate The module for defining the electronic state and its operations.
5858
| |-- module_charge The module for calculating the charge density, charge mixing
5959
| |-- potentials The module for calculating the potentials, including Hartree, exchange-correlation, local pseudopotential, etc.
60-
|-- module_esolver The module defining task-specific driver of corresponding workflow for evaluating energies, forces, etc., including lj, dp, ks, sdft, ofdft, etc.
60+
|-- source_esolver The module defining task-specific driver of corresponding workflow for evaluating energies, forces, etc., including lj, dp, ks, sdft, ofdft, etc.
6161
| | TDDFT, Orbital-free DFT, etc.
6262
|-- module_hamilt_general The module for defining general Hamiltonian that can be used both in PW and LCAO calculations.
6363
| |-- module_ewald The module for calculating the Ewald summation.
@@ -77,7 +77,7 @@ For those who are interested in the source code, the following figure shows the
7777
| |-- hamilt_pwdft The module for defining the Hamiltonian in PW-DFT calculations.
7878
| | |-- operator_pw The module for defining the operators in PW-DFT calculations.
7979
| `-- hamilt_stodft The module for defining the Hamiltonian in STODFT calculations.
80-
|-- module_hsolver The module for solving the Hamiltonian with different diagonalization methods, including CG, Davidson in PW
80+
|-- source_hsolver The module for solving the Hamiltonian with different diagonalization methods, including CG, Davidson in PW
8181
| | calculations, and scalapack and genelpa in LCAO calculations.
8282
|-- module_io The module for reading of INPUT files and output properties including band structure, density of states, charge density, etc.
8383
|-- module_md The module for performing molecular dynamics.
@@ -183,7 +183,7 @@ pre-commit install
183183

184184
## Adding a unit test
185185

186-
We use [GoogleTest](https://github.com/google/googletest) as our test framework. Write your test under the corresponding module folder at `abacus-develop/tests`, then append the test to `tests/CMakeLists.txt`. If there are currently no unit tests provided for the module, do as follows. `module_base` provides a simple demonstration.
186+
We use [GoogleTest](https://github.com/google/googletest) as our test framework. Write your test under the corresponding module folder at `abacus-develop/tests`, then append the test to `tests/CMakeLists.txt`. If there are currently no unit tests provided for the module, do as follows. `source_base` provides a simple demonstration.
187187

188188
- Add a folder named `test` under the module.
189189
- Append the content below to `CMakeLists.txt` of the module:

docs/advanced/acceleration/cuda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In ABACUS, we provide the option to use GPU devices to accelerate performance. T
1212

1313
- **Parallel strategy**: K point parallel.
1414

15-
Unlike PW basis, only the grid integration module (module_gint) and the diagonalization of the Hamiltonian matrix (module_hsolver) have been implemented with GPU acceleration under LCAO basis.
15+
Unlike PW basis, only the grid integration module (module_gint) and the diagonalization of the Hamiltonian matrix (source_hsolver) have been implemented with GPU acceleration under LCAO basis.
1616

1717
## Required hardware/software
1818

0 commit comments

Comments
 (0)