Skip to content

Commit adaa38e

Browse files
authored
Rename module_md module_relax module_hamilt_lcao module_io (#6340)
1 parent 96730e8 commit adaa38e

File tree

834 files changed

+842
-842
lines changed

Some content is hidden

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

834 files changed

+842
-842
lines changed

docs/CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ For those who are interested in the source code, the following figure shows the
6464
| |-- module_surchem The module for calculating the surface charge correction.
6565
| |-- module_vdw The module for calculating the van der Waals correction.
6666
| |-- module_xc The module for calculating the exchange-correlation energy and potential.
67-
|-- module_hamilt_lcao The module for defining the Hamiltonian in LCAO calculations.
67+
|-- source_lcao The module for defining the Hamiltonian in LCAO calculations.
6868
| |-- hamilt_lcaodft The module for defining the Hamiltonian in LCAO-DFT calculations.
6969
| | |-- operator_lcao The module for defining the operators in LCAO-DFT calculations.
7070
| |-- module_deepks The module for defining the Hamiltonian in DeepKS calculations.
@@ -79,10 +79,10 @@ For those who are interested in the source code, the following figure shows the
7979
| `-- hamilt_stodft The module for defining the Hamiltonian in STODFT calculations.
8080
|-- 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.
82-
|-- module_io The module for reading of INPUT files and output properties including band structure, density of states, charge density, etc.
83-
|-- module_md The module for performing molecular dynamics.
82+
|-- source_io The module for reading of INPUT files and output properties including band structure, density of states, charge density, etc.
83+
|-- source_md The module for performing molecular dynamics.
8484
|-- source_psi The module for defining the wave function and its operations.
85-
|-- module_relax The module for performing structural optimization.
85+
|-- source_relax The module for performing structural optimization.
8686
| |-- relax_new The module for performing structural optimization with new algorithm, optimized for cell and ion simultaneously.
8787
| `-- relax_old The module for performing structural optimization with old algorithm, optimized for cell and ion separately.
8888
|-- module_ri The module for performing RI calculations.
@@ -101,7 +101,7 @@ For comments that need to be shown in documents, these formats should be used --
101101

102102
A helpful VS Code extension -- [Doxygen Documentation Generator](https://marketplace.visualstudio.com/items?itemName=cschlosser.doxdocgen), can help you formating comments.
103103

104-
An practical example is class [LCAO_Deepks](https://github.com/deepmodeling/abacus-develop/blob/deepks/source/module_hamilt_lcao/module_deepks/LCAO_deepks.h), the effects can be seen on [readthedocs page](https://abacus-deepks.readthedocs.io/en/latest/DeePKS_API/classLCAO__Descriptor.html#exhale-class-classLCAO-Descriptor)
104+
An practical example is class [LCAO_Deepks](https://github.com/deepmodeling/abacus-develop/blob/deepks/source/source_lcao/module_deepks/LCAO_deepks.h), the effects can be seen on [readthedocs page](https://abacus-deepks.readthedocs.io/en/latest/DeePKS_API/classLCAO__Descriptor.html#exhale-class-classLCAO-Descriptor)
105105

106106
- Tips
107107
- Only comments in .h file will be visible in generated by Doxygen + Sphinx;

docs/advanced/json/json_add.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ AbacusJson::add_json({"Json","key6","key7",3}, "cp2k", false);
145145
146146
The current code structure of JSON functionality in Abacus is roughly as follows:
147147
148-
- source/module_io
148+
- source/source_io
149149
- para_json.cpp: Contains JSON generation and output interfaces directly called by the device in Abacus.
150150
- json_output/: Contains the functionality encapsulation class `abacusjson.cpp` of RapidJSON in Abacus and code classes for parameter generation in various JSON modules.
151151
- test: Code testing files in `json_output`.
@@ -160,7 +160,7 @@ In Abacus JSON addition, the following principles need to be followed:
160160
161161
3. Use classes as function parameters as much as possible instead of using global classes for obtained parameters. (For example, in `gen_general_info`, `Input`)
162162
163-
4. After adding parameters, supplement test code in `module_io/json_output/test`.
163+
4. After adding parameters, supplement test code in `source_io/json_output/test`.
164164
165165
For the current JSON file, there are two JSON modules: `init` and `general_info`, `output_info`.
166166
Taking `general_info` as an example, the code to be added is as follows:

source/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ add_subdirectory(source_psi)
44
add_subdirectory(source_estate)
55
add_subdirectory(source_hamilt)
66
add_subdirectory(source_pw)
7-
add_subdirectory(module_hamilt_lcao)
7+
add_subdirectory(source_lcao)
88
add_subdirectory(source_hsolver)
99
add_subdirectory(source_basis/module_ao)
1010
add_subdirectory(source_basis/module_nao)
11-
add_subdirectory(module_md)
11+
add_subdirectory(source_md)
1212
add_subdirectory(source_basis/module_pw)
1313
add_subdirectory(source_esolver)
14-
add_subdirectory(module_hamilt_lcao/module_gint)
15-
add_subdirectory(module_io)
16-
add_subdirectory(module_relax)
14+
add_subdirectory(source_lcao/module_gint)
15+
add_subdirectory(source_io)
16+
add_subdirectory(source_relax)
1717
add_subdirectory(module_ri)
1818
add_subdirectory(module_parameter)
1919
add_subdirectory(module_lr)

source/Makefile.Objects

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ VPATH=./src_global:\
2626
./source_base/module_container/ATen/ops:\
2727
./source_base/module_device:\
2828
./source_base/module_mixing:\
29-
./module_md:\
29+
./source_md:\
3030
./source_basis/module_pw:\
3131
./source_basis/module_pw/module_fft:\
3232
./source_esolver:\
@@ -53,19 +53,19 @@ VPATH=./src_global:\
5353
./source_pw/hamilt_pwdft/kernels:\
5454
./source_pw/hamilt_pwdft/module_exx_helper:\
5555
./source_pw/hamilt_stodft/kernels:\
56-
./module_hamilt_lcao/module_hcontainer:\
57-
./module_hamilt_lcao/hamilt_lcaodft:\
58-
./module_hamilt_lcao/module_tddft:\
59-
./module_hamilt_lcao/module_deepks:\
60-
./module_hamilt_lcao/module_dftu:\
61-
./module_hamilt_lcao/module_deltaspin:\
62-
./module_hamilt_lcao/hamilt_lcaodft/operator_lcao:\
63-
./module_hamilt_lcao/module_gint:\
64-
./module_hamilt_lcao/module_gint/temp_gint:\
65-
./module_relax:\
56+
./source_lcao/module_hcontainer:\
57+
./source_lcao/hamilt_lcaodft:\
58+
./source_lcao/module_tddft:\
59+
./source_lcao/module_deepks:\
60+
./source_lcao/module_dftu:\
61+
./source_lcao/module_deltaspin:\
62+
./source_lcao/hamilt_lcaodft/operator_lcao:\
63+
./source_lcao/module_gint:\
64+
./source_lcao/module_gint/temp_gint:\
65+
./source_relax:\
6666
./source_hamilt/module_vdw:\
67-
./module_io:\
68-
./module_io/json_output:\
67+
./source_io:\
68+
./source_io/json_output:\
6969
./src_ri:\
7070
./module_ri:\
7171
./module_parameter:\

source/module_lr/esolver_lrtd_lcao.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include "module_lr/hsolver_lrtd.hpp"
88
#include "module_lr/lr_spectrum.h"
99
#include <memory>
10-
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
11-
#include "module_io/read_wfc_nao.h"
12-
#include "module_io/cube_io.h"
13-
#include "module_io/print_info.h"
10+
#include "source_lcao/hamilt_lcaodft/hamilt_lcao.h"
11+
#include "source_io/read_wfc_nao.h"
12+
#include "source_io/cube_io.h"
13+
#include "source_io/print_info.h"
1414
#include "source_cell/module_neighbor/sltk_atom_arrange.h"
1515
#include "module_lr/utils/lr_util_print.h"
1616
#include "source_base/scalapack_connector.h"

source/module_lr/esolver_lrtd_lcao.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
#include <memory>
1212

1313
#include "source_esolver/esolver_ks_lcao.h" //for the move constructor
14-
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
15-
#include "module_hamilt_lcao/module_gint/gint_k.h"
16-
#include "module_hamilt_lcao/module_gint/grid_technique.h"
14+
#include "source_lcao/module_gint/gint_gamma.h"
15+
#include "source_lcao/module_gint/gint_k.h"
16+
#include "source_lcao/module_gint/grid_technique.h"
1717
#include "source_estate/module_dm/density_matrix.h"
1818
#include "module_lr/potentials/pot_hxc_lrtd.h"
1919
#include "module_lr/hamilt_casida.h"
20-
#include "module_hamilt_lcao/module_gint/temp_gint/gint_info.h"
20+
#include "source_lcao/module_gint/temp_gint/gint_info.h"
2121
#ifdef __EXX
2222
// #include <RI/physics/Exx.h>
2323
#include "module_ri/Exx_LRI.h"

source/module_lr/lr_spectrum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "module_lr/utils/lr_util.h"
77
#include "module_lr/utils/lr_util_hcontainer.h"
88
#include "module_lr/utils/lr_util_print.h"
9-
#include "module_hamilt_lcao/module_gint/temp_gint/gint_interface.h"
9+
#include "source_lcao/module_gint/temp_gint/gint_interface.h"
1010

1111
template <typename T>
1212
elecstate::DensityMatrix<T, T> LR::LR_Spectrum<T>::cal_transition_density_matrix(const int istate, const T* X_in, const bool need_R)

source/module_lr/lr_spectrum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "source_estate/module_dm/density_matrix.h"
66
#include "module_lr/utils/lr_util.h"
77
#include "source_basis/module_nao/two_center_bundle.h"
8-
#include "module_hamilt_lcao/module_tddft/td_current.h"
8+
#include "source_lcao/module_tddft/td_current.h"
99
namespace LR
1010
{
1111
template<typename T>

source/module_lr/lr_spectrum_velocity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "module_lr/utils/lr_util_hcontainer.h"
44
#include "math.h"
55
#include "module_parameter/parameter.h"
6-
#include "module_hamilt_lcao/module_hcontainer/hcontainer_funcs.h"
6+
#include "source_lcao/module_hcontainer/hcontainer_funcs.h"
77
namespace LR
88
{
99
/// get the velocity matrix v(R)

source/module_lr/operator_casida/operator_lr_hxc.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#include "module_lr/utils/lr_util.h"
77
#include "module_lr/utils/lr_util_hcontainer.h"
88
#include "module_lr/utils/lr_util_print.h"
9-
// #include "module_hamilt_lcao/hamilt_lcaodft/DM_gamma_2d_to_grid.h"
10-
#include "module_hamilt_lcao/module_hcontainer/hcontainer_funcs.h"
9+
// #include "source_lcao/hamilt_lcaodft/DM_gamma_2d_to_grid.h"
10+
#include "source_lcao/module_hcontainer/hcontainer_funcs.h"
1111
#include "module_lr/ao_to_mo_transformer/ao_to_mo.h"
1212
#include "source_pw/hamilt_pwdft/global.h"
13-
#include "module_hamilt_lcao/module_gint/temp_gint/gint_interface.h"
13+
#include "source_lcao/module_gint/temp_gint/gint_interface.h"
1414

1515
inline double conj(double a) { return a; }
1616
inline std::complex<double> conj(std::complex<double> a) { return std::conj(a); }

0 commit comments

Comments
 (0)