Skip to content

Commit c873197

Browse files
authored
[Refactor] Move module_parameter to source_io. Reorganize source_lcao (#6358)
* Move module_parameter to source_io * Move operator_lcao out and rename * Modify source_lcao folder structure * Fix test probelm * Fix Conflict and fix compilation
1 parent 83709c9 commit c873197

File tree

524 files changed

+724
-722
lines changed

Some content is hidden

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

524 files changed

+724
-722
lines changed

python/pyabacus/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ set(BASE_BINARY_DIR "${PROJECT_SOURCE_DIR}/build/base")
7979
add_subdirectory(${ABACUS_SOURCE_DIR}/source_base ${BASE_BINARY_DIR})
8080
# add parameter
8181
set(PARAMETER_BINARY_DIR "${PROJECT_SOURCE_DIR}/build/parameter")
82-
add_subdirectory(${ABACUS_SOURCE_DIR}/module_parameter ${PARAMETER_BINARY_DIR})
82+
add_subdirectory(${ABACUS_SOURCE_DIR}/source_io/module_parameter ${PARAMETER_BINARY_DIR})
8383
# add orb
8484
set(ORB_BINARY_DIR "${PROJECT_SOURCE_DIR}/build/orb")
8585
add_subdirectory(${ABACUS_SOURCE_DIR}/source_basis/module_ao ${ORB_BINARY_DIR})

python/pyabacus/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ add_subdirectory(source_lcao/module_gint)
1515
add_subdirectory(source_io)
1616
add_subdirectory(source_relax)
1717
add_subdirectory(source_lcao/module_ri)
18-
add_subdirectory(module_parameter)
18+
add_subdirectory(source_io/module_parameter)
1919
add_subdirectory(module_lr)
2020

2121
# add by jghan

source/Makefile.Objects

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ VPATH=./src_global:\
5454
./source_pw/module_pwdft/module_exx_helper:\
5555
./source_pw/module_stodft/kernels:\
5656
./source_lcao/module_hcontainer:\
57-
./source_lcao/hamilt_lcaodft:\
57+
./source_lcao:\
5858
./source_lcao/module_rt:\
5959
./source_lcao/module_deepks:\
6060
./source_lcao/module_dftu:\
6161
./source_lcao/module_deltaspin:\
62-
./source_lcao/hamilt_lcaodft/operator_lcao:\
62+
./source_lcao/module_operator_lcao:\
6363
./source_lcao/module_gint:\
6464
./source_lcao/module_gint/temp_gint:\
6565
./source_relax:\
@@ -68,7 +68,7 @@ VPATH=./src_global:\
6868
./source_io/json_output:\
6969
./src_ri:\
7070
./source_lcao/module_ri:\
71-
./module_parameter:\
71+
./source_io/module_parameter:\
7272
./module_lr:\
7373
./module_lr/ao_to_mo_transformer:\
7474
./module_lr/dm_trans:\

source/module_lr/dm_trans/dmr_complex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "source_estate/module_dm/density_matrix.h"
22
#include "source_base/timer.h"
3-
#include "module_parameter/parameter.h"
3+
#include "source_io/module_parameter/parameter.h"
44
#include "source_base/libm/libm.h"
55
namespace elecstate
66
{

source/module_lr/esolver_lrtd_lcao.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#include "module_lr/hsolver_lrtd.hpp"
88
#include "module_lr/lr_spectrum.h"
99
#include <memory>
10-
#include "source_lcao/hamilt_lcaodft/hamilt_lcao.h"
10+
#include "source_lcao/hamilt_lcao.h"
1111
#include "source_io/read_wfc_nao.h"
1212
#include "source_io/cube_io.h"
1313
#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"
17-
#include "module_parameter/parameter.h"
17+
#include "source_io/module_parameter/parameter.h"
1818
#include "module_lr/ri_benchmark/ri_benchmark.h"
1919
#include "module_lr/operator_casida/operator_lr_diag.h" // for precondition
2020

source/module_lr/esolver_lrtd_lcao.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "source_esolver/esolver_fp.h"
3-
#include "module_parameter/input_parameter.h"
3+
#include "source_io/module_parameter/input_parameter.h"
44
#include "source_cell/unitcell.h"
55
#include "source_hamilt/hamilt.h"
66
#include "source_estate/elecstate.h"

source/module_lr/hsolver_lrtd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "module_parameter/parameter.h"
2+
#include "source_io/module_parameter/parameter.h"
33
#include "source_hsolver/diago_david.h"
44
#include "source_hsolver/diago_dav_subspace.h"
55
#include "source_hsolver/diago_cg.h"

source/module_lr/lr_spectrum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lr_spectrum.h"
22
#include "module_lr/utils/lr_util.h"
3-
#include "module_parameter/parameter.h"
3+
#include "source_io/module_parameter/parameter.h"
44
#include "module_lr/dm_trans/dm_trans.h"
55
#include "source_base/parallel_reduce.h"
66
#include "module_lr/utils/lr_util.h"

source/module_lr/lr_spectrum_velocity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "module_lr/dm_trans/dm_trans.h"
33
#include "module_lr/utils/lr_util_hcontainer.h"
44
#include "math.h"
5-
#include "module_parameter/parameter.h"
5+
#include "source_io/module_parameter/parameter.h"
66
#include "source_lcao/module_hcontainer/hcontainer_funcs.h"
77
namespace LR
88
{

0 commit comments

Comments
 (0)