Skip to content

Commit 39c688e

Browse files
mohanchenabacus_fixer
andauthored
move hcontainer from source_lcao to source_hamilt (#7708)
Co-authored-by: abacus_fixer <mohanchen@pku.eud.cn>
1 parent 408b661 commit 39c688e

145 files changed

Lines changed: 197 additions & 197 deletions

File tree

Some content is hidden

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

python/pyabacus/src/ModuleESolver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ target_include_directories(_esolver_pack PRIVATE
2727
${ESTATE_PATH}/module_dm
2828
${ESTATE_PATH}/potentials
2929
${LCAO_PATH}
30-
${LCAO_PATH}/module_hcontainer
30+
${HAMILT_PATH}/module_hcontainer
3131
${HAMILT_PATH}
3232
${CELL_PATH}
3333
${PSI_PATH}

python/pyabacus/src/ModuleESolver/py_esolver_lcao.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "source_estate/elecstate.h"
2121
#include "source_estate/module_dm/density_matrix.h"
2222
#include "source_lcao/hamilt_lcao.h"
23-
#include "source_lcao/module_hcontainer/hcontainer.h"
23+
#include "source_hamilt/module_hcontainer/hcontainer.h"
2424
#include "source_basis/module_ao/parallel_orbitals.h"
2525

2626
#include <complex>

source/source_estate/module_dm/density_matrix.h

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

66
#include "source_cell/module_neighbor/sltk_grid_driver.h"
77
#include "source_lcao/record_adj.h"
8-
#include "source_lcao/module_hcontainer/hcontainer.h"
8+
#include "source_hamilt/module_hcontainer/hcontainer.h"
99

1010
namespace elecstate
1111
{

source/source_estate/module_dm/test/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ AddTest(
1212
TARGET MODULE_ESTATE_dm_io_test_serial
1313
LIBS parameter base device cell_info
1414
SOURCES test_dm_io.cpp ../density_matrix.cpp ../density_matrix_io.cpp
15-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/base_matrix.cpp
16-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/hcontainer.cpp
17-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/atom_pair.cpp
15+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/base_matrix.cpp
16+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/hcontainer.cpp
17+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/atom_pair.cpp
1818
${ABACUS_SOURCE_DIR}/source_basis/module_ao/parallel_orbitals.cpp
1919

2020
)
@@ -23,28 +23,28 @@ AddTest(
2323
TARGET MODULE_ESTATE_dm_constructor_test
2424
LIBS parameter base device
2525
SOURCES test_dm_constructor.cpp ../density_matrix.cpp ../density_matrix_io.cpp tmp_mocks.cpp
26-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/base_matrix.cpp
27-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/hcontainer.cpp
28-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/atom_pair.cpp
26+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/base_matrix.cpp
27+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/hcontainer.cpp
28+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/atom_pair.cpp
2929
${ABACUS_SOURCE_DIR}/source_basis/module_ao/parallel_orbitals.cpp
3030
)
3131

3232
AddTest(
3333
TARGET MODULE_ESTATE_dm_init_test
3434
LIBS parameter base device
3535
SOURCES test_dm_R_init.cpp ../density_matrix.cpp ../density_matrix_io.cpp tmp_mocks.cpp
36-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/base_matrix.cpp
37-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/hcontainer.cpp
38-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/atom_pair.cpp
36+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/base_matrix.cpp
37+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/hcontainer.cpp
38+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/atom_pair.cpp
3939
${ABACUS_SOURCE_DIR}/source_basis/module_ao/parallel_orbitals.cpp
4040
)
4141

4242
AddTest(
4343
TARGET MODULE_ESTATE_dm_cal_DMR_test
4444
LIBS parameter base device
4545
SOURCES test_cal_dm_R.cpp ../density_matrix.cpp ../density_matrix_io.cpp tmp_mocks.cpp
46-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/base_matrix.cpp
47-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/hcontainer.cpp
48-
${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/atom_pair.cpp
46+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/base_matrix.cpp
47+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/hcontainer.cpp
48+
${ABACUS_SOURCE_DIR}/source_hamilt/module_hcontainer/atom_pair.cpp
4949
${ABACUS_SOURCE_DIR}/source_basis/module_ao/parallel_orbitals.cpp
5050
)

source/source_estate/module_dm/test/test_cal_dm_R.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "gmock/gmock.h"
44
#include "gtest/gtest.h"
55
#include "source_estate/module_dm/density_matrix.h"
6-
#include "source_lcao/module_hcontainer/hcontainer.h"
6+
#include "source_hamilt/module_hcontainer/hcontainer.h"
77
#include "source_cell/klist.h"
88

99
/************************************************

source/source_estate/module_dm/test/test_cal_dmk_psi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "gmock/gmock.h"
44
#include "gtest/gtest.h"
55
#include "source_estate/module_dm/density_matrix.h"
6-
#include "source_lcao/module_hcontainer/hcontainer.h"
6+
#include "source_hamilt/module_hcontainer/hcontainer.h"
77
#include "source_cell/klist.h"
88

99
/************************************************

source/source_estate/module_dm/test/test_dm_R_init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "gtest/gtest.h"
55
#define private public
66
#include "source_estate/module_dm/density_matrix.h"
7-
#include "source_lcao/module_hcontainer/hcontainer.h"
7+
#include "source_hamilt/module_hcontainer/hcontainer.h"
88
#include "source_cell/klist.h"
99
#undef private
1010
/************************************************

source/source_estate/module_dm/test/test_dm_constructor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "gmock/gmock.h"
44
#include "gtest/gtest.h"
55
#include "source_estate/module_dm/density_matrix.h"
6-
#include "source_lcao/module_hcontainer/hcontainer.h"
6+
#include "source_hamilt/module_hcontainer/hcontainer.h"
77
#include "source_cell/klist.h"
88
/************************************************
99
* unit test of DensityMatrix constructor

source/source_hamilt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
add_subdirectory(module_vdw)
22
add_subdirectory(module_surchem)
33
add_subdirectory(module_xc)
4+
add_subdirectory(module_hcontainer)
45

56
list(APPEND objects
67
operator.cpp
File renamed without changes.

0 commit comments

Comments
 (0)