Skip to content

Commit 68a9e7a

Browse files
committed
Rename module_hamilt_general to source_hamilt
1 parent d95e38f commit 68a9e7a

File tree

201 files changed

+177
-177
lines changed

Some content is hidden

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

201 files changed

+177
-177
lines changed

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For those who are interested in the source code, the following figure shows the
5959
| |-- potentials The module for calculating the potentials, including Hartree, exchange-correlation, local pseudopotential, etc.
6060
|-- 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.
62-
|-- module_hamilt_general The module for defining general Hamiltonian that can be used both in PW and LCAO calculations.
62+
|-- source_hamilt 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.
6464
| |-- module_surchem The module for calculating the surface charge correction.
6565
| |-- module_vdw The module for calculating the van der Waals correction.

docs/advanced/input_files/input-main.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ calculations.
10481048

10491049
- **Type**: String
10501050
- **Description**: In our package, the XC functional can either be set explicitly using the `dft_functional` keyword in `INPUT` file. If `dft_functional` is not specified, ABACUS will use the xc functional indicated in the pseudopotential file.
1051-
On the other hand, if dft_functional is specified, it will overwrite the functional from pseudopotentials and performs calculation with whichever functional the user prefers. We further offer two ways of supplying exchange-correlation functional. The first is using 'short-hand' names such as 'LDA', 'PBE', 'SCAN'. A complete list of 'short-hand' expressions can be found in [the source code](../../../source/module_hamilt_general/module_xc/xc_functional.cpp). The other way is only available when ***compiling with LIBXC***, and it allows for supplying exchange-correlation functionals as combinations of LIBXC keywords for functional components, joined by a plus sign, for example, dft_functional='LDA_X_1D_EXPONENTIAL+LDA_C_1D_CSC'. The list of LIBXC keywords can be found on its [website](https://libxc.gitlab.io/functionals/). In this way, **we support all the LDA,GGA and mGGA functionals provided by LIBXC**.
1051+
On the other hand, if dft_functional is specified, it will overwrite the functional from pseudopotentials and performs calculation with whichever functional the user prefers. We further offer two ways of supplying exchange-correlation functional. The first is using 'short-hand' names such as 'LDA', 'PBE', 'SCAN'. A complete list of 'short-hand' expressions can be found in [the source code](../../../source/source_hamilt/module_xc/xc_functional.cpp). The other way is only available when ***compiling with LIBXC***, and it allows for supplying exchange-correlation functionals as combinations of LIBXC keywords for functional components, joined by a plus sign, for example, dft_functional='LDA_X_1D_EXPONENTIAL+LDA_C_1D_CSC'. The list of LIBXC keywords can be found on its [website](https://libxc.gitlab.io/functionals/). In this way, **we support all the LDA,GGA and mGGA functionals provided by LIBXC**.
10521052

10531053
Furthermore, the old INPUT parameter exx_hybrid_type for hybrid functionals has been absorbed into dft_functional. Options are `hf` (pure Hartree-Fock), `pbe0`(PBE0), `hse` (Note: in order to use HSE functional, LIBXC is required). Note also that HSE has been tested while PBE0 has NOT been fully tested yet, and the maximum CPU cores for running exx in parallel is $N(N+1)/2$, with N being the number of atoms.
10541054

@@ -3474,7 +3474,7 @@ These variables are used to control vdW-corrected related parameters.
34743474

34753475
- **Type**: String
34763476
- **Availability**: `vdw_method` is set to `d2`
3477-
- **Description**: Specifies the name of the file containing $C_6$ parameters for each element when using the D2 method. If not set, ABACUS uses the default $C_6$ parameters (Jnm6/mol) stored in the [program](https://github.com/deepmodeling/abacus-develop/blob/develop/source/module_hamilt_general/module_vdw/vdwd2_parameters.cpp). To manually set the $C_6$ parameters, provide a file containing the parameters. An example is given by:
3477+
- **Description**: Specifies the name of the file containing $C_6$ parameters for each element when using the D2 method. If not set, ABACUS uses the default $C_6$ parameters (Jnm6/mol) stored in the [program](https://github.com/deepmodeling/abacus-develop/blob/develop/source/source_hamilt/module_vdw/vdwd2_parameters.cpp). To manually set the $C_6$ parameters, provide a file containing the parameters. An example is given by:
34783478

34793479
```text
34803480
H 0.1
@@ -3497,7 +3497,7 @@ These variables are used to control vdW-corrected related parameters.
34973497

34983498
- **Type**: String
34993499
- **Availability**: `vdw_method` is set to `d2`
3500-
- **Description**: Specifies the name of the file containing $R_0$ parameters for each element when using the D2 method. If not set, ABACUS uses the default $R_0$ parameters (Angstrom) stored in the [program](https://github.com/deepmodeling/abacus-develop/blob/develop/source/module_hamilt_general/module_vdw/vdwd2_parameters.cpp). To manually set the $R_0$ parameters, provide a file containing the parameters. An example is given by:
3500+
- **Description**: Specifies the name of the file containing $R_0$ parameters for each element when using the D2 method. If not set, ABACUS uses the default $R_0$ parameters (Angstrom) stored in the [program](https://github.com/deepmodeling/abacus-develop/blob/develop/source/source_hamilt/module_vdw/vdwd2_parameters.cpp). To manually set the $R_0$ parameters, provide a file containing the parameters. An example is given by:
35013501

35023502
```text
35033503
Li 1.0

docs/advanced/scf/construct_H.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
In our package, the XC functional can be set explicitly using the `dft_functional` keyword in `INPUT` file. If `dft_functional` is not specified, ABACUS will use the xc functional indicated in the pseudopotential file.
66

7-
Several common functionals are implemented in ABACUS, such as PZ and PBE. Users can check out this [file](../../../source/module_hamilt_general/module_xc/xc_funcs.h) for a complete list of functionals implemented in ABACUS. Furthermore, if ABACUS is compiled with LIBXC, we also support all the LDA, GGA and meta-GGA functionals provided therein.
7+
Several common functionals are implemented in ABACUS, such as PZ and PBE. Users can check out this [file](../../../source/source_hamilt/module_xc/xc_funcs.h) for a complete list of functionals implemented in ABACUS. Furthermore, if ABACUS is compiled with LIBXC, we also support all the LDA, GGA and meta-GGA functionals provided therein.
88

99
Here, we use a simple [example calculation](https://github.com/deepmodeling/abacus-develop/tree/develop/examples/scf/lcao_Si2) for illustration.
1010

@@ -45,7 +45,7 @@ Here, we use a simple [example calculation](https://github.com/deepmodeling/abac
4545
dft_functional SCAN
4646
```
4747
48-
Note that in the case of PBE and SCAN, we are using 'short-hand' names to represent the entire functional, which is made up of individual exchange and correlation components. A complete list of 'short-hand' expressions supported by ABACUS can be found in [source code](../../../source/module_hamilt_general/module_xc/xc_functional.cpp).
48+
Note that in the case of PBE and SCAN, we are using 'short-hand' names to represent the entire functional, which is made up of individual exchange and correlation components. A complete list of 'short-hand' expressions supported by ABACUS can be found in [source code](../../../source/source_hamilt/module_xc/xc_functional.cpp).
4949
5050
Apart from the 'short-hand' names, ABACUS also allow supplying exchange-correlation functionals as combinations of LIBXC keywords for functional components, joined by plus sign, for example, setting:
5151

source/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_subdirectory(source_base)
22
add_subdirectory(source_cell)
33
add_subdirectory(source_psi)
44
add_subdirectory(source_estate)
5-
add_subdirectory(module_hamilt_general)
5+
add_subdirectory(source_hamilt)
66
add_subdirectory(source_pw)
77
add_subdirectory(module_hamilt_lcao)
88
add_subdirectory(source_hsolver)
@@ -53,7 +53,7 @@ list(APPEND device_srcs
5353
source_pw/hamilt_pwdft/kernels/wf_op.cpp
5454
source_pw/hamilt_pwdft/kernels/vnl_op.cpp
5555
source_base/kernels/math_ylm_op.cpp
56-
module_hamilt_general/module_xc/kernels/xc_functional_op.cpp
56+
source_hamilt/module_xc/kernels/xc_functional_op.cpp
5757
)
5858

5959
if(USE_CUDA)
@@ -79,7 +79,7 @@ if(USE_CUDA)
7979
source_base/kernels/cuda/math_ylm_op.cu
8080
source_base/kernels/cuda/math_kernel_op.cu
8181
source_base/kernels/cuda/math_kernel_op_vec.cu
82-
module_hamilt_general/module_xc/kernels/cuda/xc_functional_op.cu
82+
source_hamilt/module_xc/kernels/cuda/xc_functional_op.cu
8383
)
8484
endif()
8585

@@ -106,7 +106,7 @@ if(USE_ROCM)
106106
source_base/kernels/rocm/math_kernel_op.hip.cu
107107
source_base/kernels/rocm/math_kernel_op_vec.hip.cu
108108
source_base/kernels/rocm/math_ylm_op.hip.cu
109-
module_hamilt_general/module_xc/kernels/rocm/xc_functional_op.hip.cu
109+
source_hamilt/module_xc/kernels/rocm/xc_functional_op.hip.cu
110110
)
111111
endif()
112112

source/Makefile.Objects

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ VPATH=./src_global:\
4141
./source_estate/module_dm:\
4242
./source_psi:\
4343
./source_psi/kernels:\
44-
./module_hamilt_general:\
45-
./module_hamilt_general/module_ewald:\
46-
./module_hamilt_general/module_surchem:\
47-
./module_hamilt_general/module_xc:\
48-
./module_hamilt_general/module_xc/kernels:\
44+
./source_hamilt:\
45+
./source_hamilt/module_ewald:\
46+
./source_hamilt/module_surchem:\
47+
./source_hamilt/module_xc:\
48+
./source_hamilt/module_xc/kernels:\
4949
./source_pw/hamilt_pwdft:\
5050
./source_pw/hamilt_ofdft:\
5151
./source_pw/hamilt_stodft:\
@@ -62,7 +62,7 @@ VPATH=./src_global:\
6262
./module_hamilt_lcao/hamilt_lcaodft/operator_lcao:\
6363
./module_hamilt_lcao/module_gint:\
6464
./module_relax:\
65-
./module_hamilt_general/module_vdw:\
65+
./source_hamilt/module_vdw:\
6666
./module_io:\
6767
./module_io/json_output:\
6868
./src_ri:\

source/module_hamilt_lcao/hamilt_lcaodft/FORCE_STRESS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "source_estate/module_pot/H_TDDFT_pw.h" // Taoni add 2025-02-20
1212
#include "source_estate/module_pot/efield.h" // liuyu add 2022-05-18
1313
#include "source_estate/module_pot/gatefield.h" // liuyu add 2022-09-13
14-
#include "module_hamilt_general/module_surchem/surchem.h" //sunml add 2022-08-10
15-
#include "module_hamilt_general/module_vdw/vdw.h"
14+
#include "source_hamilt/module_surchem/surchem.h" //sunml add 2022-08-10
15+
#include "source_hamilt/module_vdw/vdw.h"
1616
#include "module_parameter/parameter.h"
1717
#ifdef __MLALGO
1818
#include "module_hamilt_lcao/module_deepks/LCAO_deepks.h" //caoyu add for deepks 2021-06-03

source/module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#endif
2525

2626
#include "source_estate/module_pot/H_TDDFT_pw.h"
27-
#include "module_hamilt_general/module_xc/xc_functional.h"
27+
#include "source_hamilt/module_xc/xc_functional.h"
2828
#include "module_hamilt_lcao/module_deltaspin/spin_constrain.h"
2929
#include "module_hamilt_lcao/module_hcontainer/hcontainer_funcs.h"
3030
#include "source_hsolver/hsolver_lcao.h"

source/module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "source_cell/module_neighbor/sltk_atom_arrange.h"
77
#include "source_estate/module_dm/density_matrix.h"
88
#include "source_estate/module_pot/potential_new.h"
9-
#include "module_hamilt_general/hamilt.h"
9+
#include "source_hamilt/hamilt.h"
1010
#include "module_hamilt_lcao/hamilt_lcaodft/hs_matrix_k.hpp"
1111
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
1212
#include "module_hamilt_lcao/module_gint/gint_k.h"

source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "module_parameter/parameter.h"
77
#include "module_ri/RI_2D_Comm.h"
88
#include "source_pw/hamilt_pwdft/global.h"
9-
#include "module_hamilt_general/module_xc/xc_functional.h"
9+
#include "source_hamilt/module_xc/xc_functional.h"
1010
#include "module_io/restart_exx_csr.h"
1111

1212
namespace hamilt

source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/operator_lcao.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef OPERATORLCAO_H
22
#define OPERATORLCAO_H
33
#include "source_base/vector3.h"
4-
#include "module_hamilt_general/matrixblock.h"
5-
#include "module_hamilt_general/operator.h"
4+
#include "source_hamilt/matrixblock.h"
5+
#include "source_hamilt/operator.h"
66
#include "module_hamilt_lcao/module_hcontainer/hcontainer.h"
77
#include "module_hamilt_lcao/hamilt_lcaodft/hs_matrix_k.hpp"
88

0 commit comments

Comments
 (0)