diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 66f65d5c94..a26a02f37a 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -71,7 +71,8 @@ For those who are interested in the source code, the following figure shows the | |-- module_dftu The module for defining the Hamiltonian in DFT+U calculations. | |-- module_gint The module for performing grid integral in LCAO calculations. | |-- module_hcontainer The module for storing the Hamiltonian matrix in LCAO calculations. -| `-- module_tddft The module for defining the Hamiltonian in TDDFT calculations. +| |-- module_tddft The module for defining the Hamiltonian in TDDFT calculations. +| `-- module_ri The module for performing RI calculations. |-- source_pw The module for defining the Hamiltonian in PW calculations. | |-- hamilt_ofdft The module for defining the Hamiltonian in OFDFT calculations. | |-- hamilt_pwdft The module for defining the Hamiltonian in PW-DFT calculations. @@ -82,10 +83,7 @@ For those who are interested in the source code, the following figure shows the |-- source_io The module for reading of INPUT files and output properties including band structure, density of states, charge density, etc. |-- source_md The module for performing molecular dynamics. |-- source_psi The module for defining the wave function and its operations. -|-- source_relax The module for performing structural optimization. -| |-- relax_new The module for performing structural optimization with new algorithm, optimized for cell and ion simultaneously. -| `-- relax_old The module for performing structural optimization with old algorithm, optimized for cell and ion separately. -|-- module_ri The module for performing RI calculations. +`-- source_relax The module for performing structural optimization, optimized for cell and ion simultaneously. ``` ## Submitting an Issue diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 04a8f3dc24..691fcc3ceb 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -14,12 +14,12 @@ add_subdirectory(source_esolver) add_subdirectory(source_lcao/module_gint) add_subdirectory(source_io) add_subdirectory(source_relax) -add_subdirectory(module_ri) +add_subdirectory(source_lcao/module_ri) add_subdirectory(module_parameter) add_subdirectory(module_lr) # add by jghan -add_subdirectory(module_rdmft) +add_subdirectory(source_lcao/module_rdmft) add_library( driver diff --git a/source/Makefile.Objects b/source/Makefile.Objects index a28ed8d11d..ce639eef66 100644 --- a/source/Makefile.Objects +++ b/source/Makefile.Objects @@ -67,7 +67,7 @@ VPATH=./src_global:\ ./source_io:\ ./source_io/json_output:\ ./src_ri:\ -./module_ri:\ +./source_lcao/module_ri:\ ./module_parameter:\ ./module_lr:\ ./module_lr/ao_to_mo_transformer:\ @@ -75,7 +75,7 @@ VPATH=./src_global:\ ./module_lr/operator_casida:\ ./module_lr/potentials:\ ./module_lr/utils:\ -./module_rdmft:\ +./source_lcao/module_rdmft:\ ./\ OBJS_ABACUS_PW=${OBJS_MAIN}\ diff --git a/source/module_lr/esolver_lrtd_lcao.h b/source/module_lr/esolver_lrtd_lcao.h index b630716c41..d234340908 100644 --- a/source/module_lr/esolver_lrtd_lcao.h +++ b/source/module_lr/esolver_lrtd_lcao.h @@ -20,7 +20,7 @@ #include "source_lcao/module_gint/temp_gint/gint_info.h" #ifdef __EXX // #include -#include "module_ri/Exx_LRI.h" +#include "source_lcao/module_ri/Exx_LRI.h" #endif namespace LR { diff --git a/source/module_lr/hamilt_casida.h b/source/module_lr/hamilt_casida.h index 75093bd580..7b5b21fedc 100644 --- a/source/module_lr/hamilt_casida.h +++ b/source/module_lr/hamilt_casida.h @@ -9,7 +9,7 @@ #ifdef __EXX #include "module_lr/operator_casida/operator_lr_exx.h" #include "module_lr/ri_benchmark/operator_ri_hartree.h" -#include "module_ri/LRI_CV_Tools.h" +#include "source_lcao/module_ri/LRI_CV_Tools.h" #endif namespace LR { diff --git a/source/module_lr/operator_casida/operator_lr_exx.h b/source/module_lr/operator_casida/operator_lr_exx.h index ebf6a337d8..3e6f313ef7 100644 --- a/source/module_lr/operator_casida/operator_lr_exx.h +++ b/source/module_lr/operator_casida/operator_lr_exx.h @@ -2,7 +2,7 @@ #pragma once #include "source_hamilt/operator.h" #include "source_estate/module_dm/density_matrix.h" -#include "module_ri/Exx_LRI.h" +#include "source_lcao/module_ri/Exx_LRI.h" #include "module_lr/utils/lr_util.h" namespace LR { diff --git a/source/source_base/abfs-vector3_order.h b/source/source_base/abfs-vector3_order.h index e0f9442f99..3f675e4b57 100644 --- a/source/source_base/abfs-vector3_order.h +++ b/source/source_base/abfs-vector3_order.h @@ -6,7 +6,7 @@ #ifndef ABFS_VECTOR3_ORDER_H #define ABFS_VECTOR3_ORDER_H -#include "module_ri/abfs.h" +#include "source_lcao/module_ri/abfs.h" // mohan comment out 2021-02-06 //#include diff --git a/source/source_base/test/abfs-vector3_order_test.cpp b/source/source_base/test/abfs-vector3_order_test.cpp index 1a8f1b9569..a73041921e 100644 --- a/source/source_base/test/abfs-vector3_order_test.cpp +++ b/source/source_base/test/abfs-vector3_order_test.cpp @@ -1,7 +1,7 @@ #include "source_base/abfs-vector3_order.h" #include "source_base/vector3.h" #include "gtest/gtest.h" -#include "module_ri/abfs.h" +#include "source_lcao/module_ri/abfs.h" /************************************************ * unit test of functions in class Abfs::vector3_order diff --git a/source/source_cell/bcast_cell.cpp b/source/source_cell/bcast_cell.cpp index 826d4343f7..dc63f8f155 100644 --- a/source/source_cell/bcast_cell.cpp +++ b/source/source_cell/bcast_cell.cpp @@ -2,7 +2,7 @@ #include "source_base/parallel_common.h" #include "module_parameter/parameter.h" #ifdef __EXX -#include "module_ri/serialization_cereal.h" +#include "source_lcao/module_ri/serialization_cereal.h" #include "source_pw/hamilt_pwdft/global.h" #endif namespace unitcell diff --git a/source/source_cell/read_atom_species.cpp b/source/source_cell/read_atom_species.cpp index 2a24c41276..ef4834fbaa 100644 --- a/source/source_cell/read_atom_species.cpp +++ b/source/source_cell/read_atom_species.cpp @@ -4,7 +4,7 @@ #include "source_base/tool_title.h" #ifdef __EXX #include "source_pw/hamilt_pwdft/global.h" -#include "module_ri/serialization_cereal.h" +#include "source_lcao/module_ri/serialization_cereal.h" #endif namespace unitcell { diff --git a/source/source_esolver/esolver_ks_lcao.cpp b/source/source_esolver/esolver_ks_lcao.cpp index 30e918e83e..4e2112402a 100644 --- a/source/source_esolver/esolver_ks_lcao.cpp +++ b/source/source_esolver/esolver_ks_lcao.cpp @@ -59,7 +59,7 @@ #include "source_hsolver/hsolver_lcao.h" // test RDMFT -#include "module_rdmft/rdmft.h" +#include "source_lcao/module_rdmft/rdmft.h" #include "source_lcao/module_gint/temp_gint/gint_info.h" diff --git a/source/source_esolver/esolver_ks_lcao.h b/source/source_esolver/esolver_ks_lcao.h index 09f9d5e10d..1ca827076e 100644 --- a/source/source_esolver/esolver_ks_lcao.h +++ b/source/source_esolver/esolver_ks_lcao.h @@ -22,12 +22,12 @@ // for EXX #ifdef __EXX -#include "module_ri/Exx_LRI_interface.h" -#include "module_ri/Mix_DMk_2D.h" +#include "source_lcao/module_ri/Exx_LRI_interface.h" +#include "source_lcao/module_ri/Mix_DMk_2D.h" #endif // for RDMFT -#include "module_rdmft/rdmft.h" +#include "source_lcao/module_rdmft/rdmft.h" #include diff --git a/source/source_esolver/esolver_ks_lcaopw.h b/source/source_esolver/esolver_ks_lcaopw.h index 24c5f659e9..c5eac500e9 100644 --- a/source/source_esolver/esolver_ks_lcaopw.h +++ b/source/source_esolver/esolver_ks_lcaopw.h @@ -4,7 +4,7 @@ #include "source_hsolver/hsolver_lcaopw.h" #ifdef __EXX -#include "module_ri/exx_lip.h" +#include "source_lcao/module_ri/exx_lip.h" #endif namespace ModuleESolver { diff --git a/source/source_hamilt/module_xc/exx_info.h b/source/source_hamilt/module_xc/exx_info.h index 9167b99262..e5b8a702a8 100644 --- a/source/source_hamilt/module_xc/exx_info.h +++ b/source/source_hamilt/module_xc/exx_info.h @@ -1,7 +1,7 @@ #ifndef EXX_INFO_H #define EXX_INFO_H -#include "module_ri/conv_coulomb_pot_k.h" +#include "source_lcao/module_ri/conv_coulomb_pot_k.h" #include "xc_functional.h" #include diff --git a/source/source_io/ctrl_output_lcao.cpp b/source/source_io/ctrl_output_lcao.cpp index 6cab6b94ab..e7d0cd738d 100644 --- a/source/source_io/ctrl_output_lcao.cpp +++ b/source/source_io/ctrl_output_lcao.cpp @@ -24,10 +24,10 @@ #include "source_lcao/module_deepks/LCAO_deepks_interface.h" #endif #ifdef __EXX -#include "module_ri/Exx_LRI_interface.h" // use EXX codes -#include "module_ri/RPA_LRI.h" // use RPA code +#include "source_lcao/module_ri/Exx_LRI_interface.h" // use EXX codes +#include "source_lcao/module_ri/RPA_LRI.h" // use RPA code #endif -#include "module_rdmft/rdmft.h" // use RDMFT codes +#include "source_lcao/module_rdmft/rdmft.h" // use RDMFT codes #include "source_io/to_qo.h" // use toQO namespace ModuleIO diff --git a/source/source_io/ctrl_output_lcao.h b/source/source_io/ctrl_output_lcao.h index 0d596e8ae2..44429462ea 100644 --- a/source/source_io/ctrl_output_lcao.h +++ b/source/source_io/ctrl_output_lcao.h @@ -12,9 +12,9 @@ #include "source_lcao/module_gint/gint_k.h" // use Gint_k #include "source_basis/module_pw/pw_basis_k.h" // use ModulePW::PW_Basis_K and ModulePW::PW_Basis #include "source_pw/hamilt_pwdft/structure_factor.h" // use Structure_Factor -#include "module_rdmft/rdmft.h" // use RDMFT codes +#include "source_lcao/module_rdmft/rdmft.h" // use RDMFT codes #ifdef __EXX -#include "module_ri/Exx_LRI_interface.h" // use EXX codes +#include "source_lcao/module_ri/Exx_LRI_interface.h" // use EXX codes #endif namespace ModuleIO diff --git a/source/source_io/input_conv.cpp b/source/source_io/input_conv.cpp index 4f4e6cbfd1..afba1a718b 100644 --- a/source/source_io/input_conv.cpp +++ b/source/source_io/input_conv.cpp @@ -15,7 +15,7 @@ #include #ifdef __EXX -#include "module_ri/exx_abfs-jle.h" +#include "source_lcao/module_ri/exx_abfs-jle.h" #endif #include "source_lcao/module_dftu/dftu.h" diff --git a/source/source_io/restart_exx_csr.h b/source/source_io/restart_exx_csr.h index 94edbd709b..1e259f9933 100644 --- a/source/source_io/restart_exx_csr.h +++ b/source/source_io/restart_exx_csr.h @@ -1,7 +1,7 @@ #pragma once #include "source_base/abfs-vector3_order.h" #include "source_cell/unitcell.h" -#include "module_ri/serialization_cereal.h" +#include "source_lcao/module_ri/serialization_cereal.h" #include #include diff --git a/source/source_io/restart_exx_csr.hpp b/source/source_io/restart_exx_csr.hpp index 9292007f85..75027faff5 100644 --- a/source/source_io/restart_exx_csr.hpp +++ b/source/source_io/restart_exx_csr.hpp @@ -3,7 +3,7 @@ #include "source_cell/unitcell.h" #include "source_io/csr_reader.h" #include "source_io/write_HS_sparse.h" -#include "module_ri/serialization_cereal.h" +#include "source_lcao/module_ri/serialization_cereal.h" #include #include diff --git a/source/source_io/write_vxc_r.hpp b/source/source_io/write_vxc_r.hpp index b6fc55ce1d..31a08a90e1 100644 --- a/source/source_io/write_vxc_r.hpp +++ b/source/source_io/write_vxc_r.hpp @@ -8,7 +8,7 @@ #include "source_io/write_HS_sparse.h" #ifdef __EXX #include "source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.h" -#include "module_ri/RI_2D_Comm.h" +#include "source_lcao/module_ri/RI_2D_Comm.h" #endif #ifndef TGINT_H diff --git a/source/source_lcao/hamilt_lcaodft/FORCE_STRESS.h b/source/source_lcao/hamilt_lcaodft/FORCE_STRESS.h index 8ec9afe942..eb3b765499 100644 --- a/source/source_lcao/hamilt_lcaodft/FORCE_STRESS.h +++ b/source/source_lcao/hamilt_lcaodft/FORCE_STRESS.h @@ -11,7 +11,7 @@ #include "source_io/input_conv.h" #include "source_psi/psi.h" #ifdef __EXX -#include "module_ri/Exx_LRI_interface.h" +#include "source_lcao/module_ri/Exx_LRI_interface.h" #endif #include "force_stress_arrays.h" #include "source_lcao/module_gint/gint_gamma.h" diff --git a/source/source_lcao/hamilt_lcaodft/LCAO_hamilt.hpp b/source/source_lcao/hamilt_lcaodft/LCAO_hamilt.hpp index d1ee69c2d4..ed05a2a3c3 100644 --- a/source/source_lcao/hamilt_lcaodft/LCAO_hamilt.hpp +++ b/source/source_lcao/hamilt_lcaodft/LCAO_hamilt.hpp @@ -7,7 +7,7 @@ #include "source_base/global_variable.h" #include "source_base/timer.h" #include "source_lcao/hamilt_lcaodft/spar_exx.h" -#include "module_ri/RI_2D_Comm.h" +#include "source_lcao/module_ri/RI_2D_Comm.h" #include #include diff --git a/source/source_lcao/hamilt_lcaodft/hamilt_lcao.cpp b/source/source_lcao/hamilt_lcaodft/hamilt_lcao.cpp index 0a4fd2a802..a1b6db7b13 100644 --- a/source/source_lcao/hamilt_lcaodft/hamilt_lcao.cpp +++ b/source/source_lcao/hamilt_lcaodft/hamilt_lcao.cpp @@ -15,7 +15,7 @@ #endif #ifdef __EXX -#include "module_ri/Exx_LRI_interface.h" +#include "source_lcao/module_ri/Exx_LRI_interface.h" #include "operator_lcao/op_exx_lcao.h" #endif diff --git a/source/source_lcao/hamilt_lcaodft/hamilt_lcao.h b/source/source_lcao/hamilt_lcaodft/hamilt_lcao.h index 5ae426bdda..4cafeb7d5e 100644 --- a/source/source_lcao/hamilt_lcaodft/hamilt_lcao.h +++ b/source/source_lcao/hamilt_lcaodft/hamilt_lcao.h @@ -19,7 +19,7 @@ #endif #ifdef __EXX -#include "module_ri/Exx_LRI.h" +#include "source_lcao/module_ri/Exx_LRI.h" #endif namespace hamilt { diff --git a/source/source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.hpp b/source/source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.hpp index e2b628df13..ee6f725f8e 100644 --- a/source/source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.hpp +++ b/source/source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.hpp @@ -4,7 +4,7 @@ #include "op_exx_lcao.h" #include "module_parameter/parameter.h" -#include "module_ri/RI_2D_Comm.h" +#include "source_lcao/module_ri/RI_2D_Comm.h" #include "source_pw/hamilt_pwdft/global.h" #include "source_hamilt/module_xc/xc_functional.h" #include "source_io/restart_exx_csr.h" diff --git a/source/module_rdmft/CMakeLists.txt b/source/source_lcao/module_rdmft/CMakeLists.txt similarity index 100% rename from source/module_rdmft/CMakeLists.txt rename to source/source_lcao/module_rdmft/CMakeLists.txt diff --git a/source/module_rdmft/rdmft.cpp b/source/source_lcao/module_rdmft/rdmft.cpp similarity index 99% rename from source/module_rdmft/rdmft.cpp rename to source/source_lcao/module_rdmft/rdmft.cpp index 50fec6cef1..b4e0b4c17f 100644 --- a/source/module_rdmft/rdmft.cpp +++ b/source/source_lcao/module_rdmft/rdmft.cpp @@ -4,7 +4,7 @@ //========================================================== #include "rdmft.h" -#include "module_rdmft/rdmft_tools.h" +#include "source_lcao/module_rdmft/rdmft_tools.h" #include "source_base/timer.h" #include "source_pw/hamilt_pwdft/global.h" #include "source_base/parallel_reduce.h" diff --git a/source/module_rdmft/rdmft.h b/source/source_lcao/module_rdmft/rdmft.h similarity index 98% rename from source/module_rdmft/rdmft.h rename to source/source_lcao/module_rdmft/rdmft.h index f4d5c65b73..b38e53476e 100644 --- a/source/module_rdmft/rdmft.h +++ b/source/source_lcao/module_rdmft/rdmft.h @@ -23,8 +23,8 @@ #include "source_lcao/hamilt_lcaodft/hs_matrix_k.hpp" #ifdef __EXX -#include "module_ri/Exx_LRI.h" -#include "module_ri/module_exx_symmetry/symmetry_rotation.h" +#include "source_lcao/module_ri/Exx_LRI.h" +#include "source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.h" // there are some operator reload to print data in different formats #endif diff --git a/source/module_rdmft/rdmft_pot.cpp b/source/source_lcao/module_rdmft/rdmft_pot.cpp similarity index 99% rename from source/module_rdmft/rdmft_pot.cpp rename to source/source_lcao/module_rdmft/rdmft_pot.cpp index a6dd143f65..182af5cf2c 100644 --- a/source/module_rdmft/rdmft_pot.cpp +++ b/source/source_lcao/module_rdmft/rdmft_pot.cpp @@ -4,12 +4,12 @@ //========================================================== #include "rdmft.h" -#include "module_rdmft/rdmft_tools.h" +#include "source_lcao/module_rdmft/rdmft_tools.h" #include "source_psi/psi.h" #include "source_estate/module_dm/cal_dm_psi.h" #ifdef __EXX -#include "module_ri/RI_2D_Comm.h" +#include "source_lcao/module_ri/RI_2D_Comm.h" #include "source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.h" #endif #include "source_lcao/hamilt_lcaodft/operator_lcao/ekinetic_new.h" diff --git a/source/module_rdmft/rdmft_tools.cpp b/source/source_lcao/module_rdmft/rdmft_tools.cpp similarity index 99% rename from source/module_rdmft/rdmft_tools.cpp rename to source/source_lcao/module_rdmft/rdmft_tools.cpp index ad9d7c0073..4d598d3963 100644 --- a/source/module_rdmft/rdmft_tools.cpp +++ b/source/source_lcao/module_rdmft/rdmft_tools.cpp @@ -2,7 +2,7 @@ // Author: Jingang Han // DATE : 2024-03-11 //========================================================== -#include "module_rdmft/rdmft_tools.h" +#include "source_lcao/module_rdmft/rdmft_tools.h" #include "source_pw/hamilt_pwdft/global.h" // used by class Veff_rdmft #include "source_base/tool_title.h" diff --git a/source/module_rdmft/rdmft_tools.h b/source/source_lcao/module_rdmft/rdmft_tools.h similarity index 99% rename from source/module_rdmft/rdmft_tools.h rename to source/source_lcao/module_rdmft/rdmft_tools.h index 2a4279c4c0..7246317f38 100644 --- a/source/module_rdmft/rdmft_tools.h +++ b/source/source_lcao/module_rdmft/rdmft_tools.h @@ -27,8 +27,8 @@ #ifdef __EXX -#include "module_ri/RI_2D_Comm.h" -#include "module_ri/Exx_LRI.h" +#include "source_lcao/module_ri/RI_2D_Comm.h" +#include "source_lcao/module_ri/Exx_LRI.h" // there are some operator reload to print data in different formats #endif diff --git a/source/module_rdmft/update_state_rdmft.cpp b/source/source_lcao/module_rdmft/update_state_rdmft.cpp similarity index 99% rename from source/module_rdmft/update_state_rdmft.cpp rename to source/source_lcao/module_rdmft/update_state_rdmft.cpp index 62500d8ac3..88a6761d1b 100644 --- a/source/module_rdmft/update_state_rdmft.cpp +++ b/source/source_lcao/module_rdmft/update_state_rdmft.cpp @@ -4,7 +4,7 @@ //========================================================== #include "rdmft.h" -#include "module_rdmft/rdmft_tools.h" +#include "source_lcao/module_rdmft/rdmft_tools.h" #include "source_estate/module_dm/cal_dm_psi.h" #include "source_estate/module_dm/density_matrix.h" #include "source_estate/module_charge/symmetry_rho.h" diff --git a/source/module_ri/ABFs_Construct-PCA.cpp b/source/source_lcao/module_ri/ABFs_Construct-PCA.cpp similarity index 94% rename from source/module_ri/ABFs_Construct-PCA.cpp rename to source/source_lcao/module_ri/ABFs_Construct-PCA.cpp index 59b246b7cc..f1c9030630 100644 --- a/source/module_ri/ABFs_Construct-PCA.cpp +++ b/source/source_lcao/module_ri/ABFs_Construct-PCA.cpp @@ -1,12 +1,12 @@ #include "ABFs_Construct-PCA.h" #include "exx_abfs-abfs_index.h" -#include "../source_base/lapack_connector.h" -#include "../source_base/global_function.h" -#include "../source_base/element_basis_index.h" -#include "../source_base/matrix.h" -#include "../module_ri/Matrix_Orbs11.h" -#include "../module_ri/Matrix_Orbs21.h" +#include "../../source_base/lapack_connector.h" +#include "../../source_base/global_function.h" +#include "../../source_base/element_basis_index.h" +#include "../../source_base/matrix.h" +#include "../../source_lcao/module_ri/Matrix_Orbs11.h" +#include "../../source_lcao/module_ri/Matrix_Orbs21.h" #include #include diff --git a/source/module_ri/ABFs_Construct-PCA.h b/source/source_lcao/module_ri/ABFs_Construct-PCA.h similarity index 93% rename from source/module_ri/ABFs_Construct-PCA.h rename to source/source_lcao/module_ri/ABFs_Construct-PCA.h index dc97adda8d..a8cbed30fd 100644 --- a/source/module_ri/ABFs_Construct-PCA.h +++ b/source/source_lcao/module_ri/ABFs_Construct-PCA.h @@ -1,7 +1,7 @@ #ifndef ABFS_CONSTRUCT_PCA_H #define ABFS_CONSTRUCT_PCA_H -#include "../source_basis/module_ao/ORB_read.h" +#include "../../source_basis/module_ao/ORB_read.h" #include "source_cell/unitcell.h" #include #include diff --git a/source/module_ri/CMakeLists.txt b/source/source_lcao/module_ri/CMakeLists.txt similarity index 100% rename from source/module_ri/CMakeLists.txt rename to source/source_lcao/module_ri/CMakeLists.txt diff --git a/source/module_ri/Exx_LRI.h b/source/source_lcao/module_ri/Exx_LRI.h similarity index 100% rename from source/module_ri/Exx_LRI.h rename to source/source_lcao/module_ri/Exx_LRI.h diff --git a/source/module_ri/Exx_LRI.hpp b/source/source_lcao/module_ri/Exx_LRI.hpp similarity index 97% rename from source/module_ri/Exx_LRI.hpp rename to source/source_lcao/module_ri/Exx_LRI.hpp index 9f6f6d4367..c5d7892474 100644 --- a/source/module_ri/Exx_LRI.hpp +++ b/source/source_lcao/module_ri/Exx_LRI.hpp @@ -10,13 +10,13 @@ #include "Exx_LRI.h" #include "RI_2D_Comm.h" #include "RI_Util.h" -#include "module_ri/exx_abfs-construct_orbs.h" -#include "module_ri/exx_abfs-io.h" -#include "module_ri/conv_coulomb_pot_k.h" +#include "source_lcao/module_ri/exx_abfs-construct_orbs.h" +#include "source_lcao/module_ri/exx_abfs-io.h" +#include "source_lcao/module_ri/conv_coulomb_pot_k.h" #include "source_base/tool_title.h" #include "source_base/timer.h" -#include "module_ri/serialization_cereal.h" -#include "module_ri/Mix_DMk_2D.h" +#include "source_lcao/module_ri/serialization_cereal.h" +#include "source_lcao/module_ri/Mix_DMk_2D.h" #include "source_basis/module_ao/parallel_orbitals.h" #include diff --git a/source/module_ri/Exx_LRI_interface.h b/source/source_lcao/module_ri/Exx_LRI_interface.h similarity index 97% rename from source/module_ri/Exx_LRI_interface.h rename to source/source_lcao/module_ri/Exx_LRI_interface.h index 68b1710385..ff76dbbc7d 100644 --- a/source/module_ri/Exx_LRI_interface.h +++ b/source/source_lcao/module_ri/Exx_LRI_interface.h @@ -2,8 +2,8 @@ #define EXX_LRI_INTERFACE_H #include "Exx_LRI.h" -#include "module_ri/Mix_DMk_2D.h" -#include "module_ri/module_exx_symmetry/symmetry_rotation.h" +#include "source_lcao/module_ri/Mix_DMk_2D.h" +#include "source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.h" #include class LCAO_Matrix; diff --git a/source/module_ri/Exx_LRI_interface.hpp b/source/source_lcao/module_ri/Exx_LRI_interface.hpp similarity index 99% rename from source/module_ri/Exx_LRI_interface.hpp rename to source/source_lcao/module_ri/Exx_LRI_interface.hpp index 3c199654b2..bfbf87aa30 100644 --- a/source/module_ri/Exx_LRI_interface.hpp +++ b/source/source_lcao/module_ri/Exx_LRI_interface.hpp @@ -3,8 +3,8 @@ #include "module_parameter/parameter.h" #include "Exx_LRI_interface.h" -#include "module_ri/exx_abfs-jle.h" -#include "module_ri/exx_opt_orb.h" +#include "source_lcao/module_ri/exx_abfs-jle.h" +#include "source_lcao/module_ri/exx_opt_orb.h" #include "source_lcao/hamilt_lcaodft/hamilt_lcao.h" #include "source_lcao/hamilt_lcaodft/operator_lcao/op_exx_lcao.h" #include "source_base/parallel_common.h" diff --git a/source/module_ri/Inverse_Matrix.h b/source/source_lcao/module_ri/Inverse_Matrix.h similarity index 100% rename from source/module_ri/Inverse_Matrix.h rename to source/source_lcao/module_ri/Inverse_Matrix.h diff --git a/source/module_ri/Inverse_Matrix.hpp b/source/source_lcao/module_ri/Inverse_Matrix.hpp similarity index 100% rename from source/module_ri/Inverse_Matrix.hpp rename to source/source_lcao/module_ri/Inverse_Matrix.hpp diff --git a/source/module_ri/LRI_CV.h b/source/source_lcao/module_ri/LRI_CV.h similarity index 100% rename from source/module_ri/LRI_CV.h rename to source/source_lcao/module_ri/LRI_CV.h diff --git a/source/module_ri/LRI_CV.hpp b/source/source_lcao/module_ri/LRI_CV.hpp similarity index 96% rename from source/module_ri/LRI_CV.hpp rename to source/source_lcao/module_ri/LRI_CV.hpp index c5800f46c5..56b5250cb2 100644 --- a/source/module_ri/LRI_CV.hpp +++ b/source/source_lcao/module_ri/LRI_CV.hpp @@ -10,9 +10,9 @@ #include "LRI_CV_Tools.h" #include "exx_abfs-abfs_index.h" #include "RI_Util.h" -#include "../source_base/tool_title.h" -#include "../source_base/timer.h" -#include "../source_pw/hamilt_pwdft/global.h" +#include "../../source_base/tool_title.h" +#include "../../source_base/timer.h" +#include "../../source_pw/hamilt_pwdft/global.h" #include #include diff --git a/source/module_ri/LRI_CV_Tools.h b/source/source_lcao/module_ri/LRI_CV_Tools.h similarity index 96% rename from source/module_ri/LRI_CV_Tools.h rename to source/source_lcao/module_ri/LRI_CV_Tools.h index 43eea41ada..90200b71b9 100644 --- a/source/module_ri/LRI_CV_Tools.h +++ b/source/source_lcao/module_ri/LRI_CV_Tools.h @@ -7,7 +7,7 @@ #define LRI_CV_TOOLS_H #include "source_base/abfs-vector3_order.h" -#include "module_ri/abfs.h" +#include "source_lcao/module_ri/abfs.h" #include diff --git a/source/module_ri/LRI_CV_Tools.hpp b/source/source_lcao/module_ri/LRI_CV_Tools.hpp similarity index 96% rename from source/module_ri/LRI_CV_Tools.hpp rename to source/source_lcao/module_ri/LRI_CV_Tools.hpp index 5d1ab11893..c37bc10ad9 100644 --- a/source/module_ri/LRI_CV_Tools.hpp +++ b/source/source_lcao/module_ri/LRI_CV_Tools.hpp @@ -8,8 +8,8 @@ #include "LRI_CV_Tools.h" #include "Inverse_Matrix.h" -#include "../source_base/mathzone.h" -#include "../source_pw/hamilt_pwdft/global.h" +#include "../../source_base/mathzone.h" +#include "../../source_pw/hamilt_pwdft/global.h" template RI::Tensor diff --git a/source/module_ri/Matrix_Orbs11.cpp b/source/source_lcao/module_ri/Matrix_Orbs11.cpp similarity index 100% rename from source/module_ri/Matrix_Orbs11.cpp rename to source/source_lcao/module_ri/Matrix_Orbs11.cpp diff --git a/source/module_ri/Matrix_Orbs11.h b/source/source_lcao/module_ri/Matrix_Orbs11.h similarity index 100% rename from source/module_ri/Matrix_Orbs11.h rename to source/source_lcao/module_ri/Matrix_Orbs11.h diff --git a/source/module_ri/Matrix_Orbs11.hpp b/source/source_lcao/module_ri/Matrix_Orbs11.hpp similarity index 100% rename from source/module_ri/Matrix_Orbs11.hpp rename to source/source_lcao/module_ri/Matrix_Orbs11.hpp diff --git a/source/module_ri/Matrix_Orbs21.cpp b/source/source_lcao/module_ri/Matrix_Orbs21.cpp similarity index 100% rename from source/module_ri/Matrix_Orbs21.cpp rename to source/source_lcao/module_ri/Matrix_Orbs21.cpp diff --git a/source/module_ri/Matrix_Orbs21.h b/source/source_lcao/module_ri/Matrix_Orbs21.h similarity index 100% rename from source/module_ri/Matrix_Orbs21.h rename to source/source_lcao/module_ri/Matrix_Orbs21.h diff --git a/source/module_ri/Matrix_Orbs21.hpp b/source/source_lcao/module_ri/Matrix_Orbs21.hpp similarity index 100% rename from source/module_ri/Matrix_Orbs21.hpp rename to source/source_lcao/module_ri/Matrix_Orbs21.hpp diff --git a/source/module_ri/Matrix_Orbs22.cpp b/source/source_lcao/module_ri/Matrix_Orbs22.cpp similarity index 100% rename from source/module_ri/Matrix_Orbs22.cpp rename to source/source_lcao/module_ri/Matrix_Orbs22.cpp diff --git a/source/module_ri/Matrix_Orbs22.h b/source/source_lcao/module_ri/Matrix_Orbs22.h similarity index 100% rename from source/module_ri/Matrix_Orbs22.h rename to source/source_lcao/module_ri/Matrix_Orbs22.h diff --git a/source/module_ri/Matrix_Orbs22.hpp b/source/source_lcao/module_ri/Matrix_Orbs22.hpp similarity index 100% rename from source/module_ri/Matrix_Orbs22.hpp rename to source/source_lcao/module_ri/Matrix_Orbs22.hpp diff --git a/source/module_ri/Mix_DMk_2D.cpp b/source/source_lcao/module_ri/Mix_DMk_2D.cpp similarity index 100% rename from source/module_ri/Mix_DMk_2D.cpp rename to source/source_lcao/module_ri/Mix_DMk_2D.cpp diff --git a/source/module_ri/Mix_DMk_2D.h b/source/source_lcao/module_ri/Mix_DMk_2D.h similarity index 100% rename from source/module_ri/Mix_DMk_2D.h rename to source/source_lcao/module_ri/Mix_DMk_2D.h diff --git a/source/module_ri/Mix_Matrix.cpp b/source/source_lcao/module_ri/Mix_Matrix.cpp similarity index 100% rename from source/module_ri/Mix_Matrix.cpp rename to source/source_lcao/module_ri/Mix_Matrix.cpp diff --git a/source/module_ri/Mix_Matrix.h b/source/source_lcao/module_ri/Mix_Matrix.h similarity index 100% rename from source/module_ri/Mix_Matrix.h rename to source/source_lcao/module_ri/Mix_Matrix.h diff --git a/source/module_ri/RI_2D_Comm.cpp b/source/source_lcao/module_ri/RI_2D_Comm.cpp similarity index 100% rename from source/module_ri/RI_2D_Comm.cpp rename to source/source_lcao/module_ri/RI_2D_Comm.cpp diff --git a/source/module_ri/RI_2D_Comm.h b/source/source_lcao/module_ri/RI_2D_Comm.h similarity index 100% rename from source/module_ri/RI_2D_Comm.h rename to source/source_lcao/module_ri/RI_2D_Comm.h diff --git a/source/module_ri/RI_2D_Comm.hpp b/source/source_lcao/module_ri/RI_2D_Comm.hpp similarity index 100% rename from source/module_ri/RI_2D_Comm.hpp rename to source/source_lcao/module_ri/RI_2D_Comm.hpp diff --git a/source/module_ri/RI_Util.h b/source/source_lcao/module_ri/RI_Util.h similarity index 100% rename from source/module_ri/RI_Util.h rename to source/source_lcao/module_ri/RI_Util.h diff --git a/source/module_ri/RI_Util.hpp b/source/source_lcao/module_ri/RI_Util.hpp similarity index 100% rename from source/module_ri/RI_Util.hpp rename to source/source_lcao/module_ri/RI_Util.hpp diff --git a/source/module_ri/RPA_LRI.h b/source/source_lcao/module_ri/RPA_LRI.h similarity index 98% rename from source/module_ri/RPA_LRI.h rename to source/source_lcao/module_ri/RPA_LRI.h index 3f27132639..f6b4c68d6f 100644 --- a/source/module_ri/RPA_LRI.h +++ b/source/source_lcao/module_ri/RPA_LRI.h @@ -11,7 +11,7 @@ // #include "module_xc/exx_info.h" // #include "source_basis/module_ao/ORB_atomic_lm.h" #include "source_base/matrix.h" -// #include "module_ri/Exx_LRI.h" +// #include "source_lcao/module_ri/Exx_LRI.h" // #include #include #include diff --git a/source/module_ri/RPA_LRI.hpp b/source/source_lcao/module_ri/RPA_LRI.hpp similarity index 99% rename from source/module_ri/RPA_LRI.hpp rename to source/source_lcao/module_ri/RPA_LRI.hpp index 79c851fa3a..b7876ead44 100644 --- a/source/module_ri/RPA_LRI.hpp +++ b/source/source_lcao/module_ri/RPA_LRI.hpp @@ -9,7 +9,7 @@ #include #include #include -#include "module_ri/module_exx_symmetry/symmetry_rotation.h" +#include "source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.h" #include "RPA_LRI.h" #include "module_parameter/parameter.h" diff --git a/source/module_ri/abfs.h b/source/source_lcao/module_ri/abfs.h similarity index 74% rename from source/module_ri/abfs.h rename to source/source_lcao/module_ri/abfs.h index 926e514cc3..ecf8977be9 100644 --- a/source/module_ri/abfs.h +++ b/source/source_lcao/module_ri/abfs.h @@ -1,8 +1,8 @@ #ifndef ABFS_H #define ABFS_H -#include "../source_base/vector3.h" -#include "../source_base/matrix.h" +#include "../../source_base/vector3.h" +#include "../../source_base/matrix.h" #include "exx_abfs.h" #include diff --git a/source/module_ri/conv_coulomb_pot_k.cpp b/source/source_lcao/module_ri/conv_coulomb_pot_k.cpp similarity index 96% rename from source/module_ri/conv_coulomb_pot_k.cpp rename to source/source_lcao/module_ri/conv_coulomb_pot_k.cpp index 82d6e5c7c4..c3a868b9fd 100644 --- a/source/module_ri/conv_coulomb_pot_k.cpp +++ b/source/source_lcao/module_ri/conv_coulomb_pot_k.cpp @@ -1,8 +1,8 @@ #include "conv_coulomb_pot_k.h" -#include "../source_base/constants.h" +#include "../../source_base/constants.h" #include "module_parameter/parameter.h" -#include "../source_basis/module_ao/ORB_atomic_lm.h" -#include "../source_pw/hamilt_pwdft/global.h" +#include "../../source_basis/module_ao/ORB_atomic_lm.h" +#include "../../source_pw/hamilt_pwdft/global.h" namespace Conv_Coulomb_Pot_K { diff --git a/source/module_ri/conv_coulomb_pot_k.h b/source/source_lcao/module_ri/conv_coulomb_pot_k.h similarity index 100% rename from source/module_ri/conv_coulomb_pot_k.h rename to source/source_lcao/module_ri/conv_coulomb_pot_k.h diff --git a/source/module_ri/conv_coulomb_pot_k.hpp b/source/source_lcao/module_ri/conv_coulomb_pot_k.hpp similarity index 100% rename from source/module_ri/conv_coulomb_pot_k.hpp rename to source/source_lcao/module_ri/conv_coulomb_pot_k.hpp diff --git a/source/module_ri/exx_abfs-abfs_index.cpp b/source/source_lcao/module_ri/exx_abfs-abfs_index.cpp similarity index 94% rename from source/module_ri/exx_abfs-abfs_index.cpp rename to source/source_lcao/module_ri/exx_abfs-abfs_index.cpp index 7a13a6b724..9826afd63f 100644 --- a/source/module_ri/exx_abfs-abfs_index.cpp +++ b/source/source_lcao/module_ri/exx_abfs-abfs_index.cpp @@ -1,5 +1,5 @@ #include "exx_abfs-abfs_index.h" -#include "../source_basis/module_ao/ORB_read.h" +#include "../../source_basis/module_ao/ORB_read.h" ModuleBase::Element_Basis_Index::Range Exx_Abfs::Abfs_Index::construct_range( const LCAO_Orbitals &orb ) diff --git a/source/module_ri/exx_abfs-abfs_index.h b/source/source_lcao/module_ri/exx_abfs-abfs_index.h similarity index 80% rename from source/module_ri/exx_abfs-abfs_index.h rename to source/source_lcao/module_ri/exx_abfs-abfs_index.h index 1d89acc2ab..40dce3c5c6 100644 --- a/source/module_ri/exx_abfs-abfs_index.h +++ b/source/source_lcao/module_ri/exx_abfs-abfs_index.h @@ -4,8 +4,8 @@ #include "exx_abfs.h" #include -#include "../source_base/element_basis_index.h" -#include "../source_basis/module_ao/ORB_atomic_lm.h" +#include "../../source_base/element_basis_index.h" +#include "../../source_basis/module_ao/ORB_atomic_lm.h" class LCAO_Orbitals; diff --git a/source/module_ri/exx_abfs-construct_orbs.cpp b/source/source_lcao/module_ri/exx_abfs-construct_orbs.cpp similarity index 99% rename from source/module_ri/exx_abfs-construct_orbs.cpp rename to source/source_lcao/module_ri/exx_abfs-construct_orbs.cpp index 3f83b12b5c..592c9ffb66 100644 --- a/source/module_ri/exx_abfs-construct_orbs.cpp +++ b/source/source_lcao/module_ri/exx_abfs-construct_orbs.cpp @@ -6,7 +6,7 @@ #include "source_base/gram_schmidt_orth.h" #include "source_basis/module_ao/ORB_read.h" #include "source_pw/hamilt_pwdft/global.h" //for ucell -#include "module_ri/test_code/exx_abfs-construct_orbs-test.h" // Peize Lin test +#include "source_lcao/module_ri/test_code/exx_abfs-construct_orbs-test.h" // Peize Lin test std::vector>> Exx_Abfs::Construct_Orbs::change_orbs( const LCAO_Orbitals &orbs_in, diff --git a/source/module_ri/exx_abfs-construct_orbs.h b/source/source_lcao/module_ri/exx_abfs-construct_orbs.h similarity index 97% rename from source/module_ri/exx_abfs-construct_orbs.h rename to source/source_lcao/module_ri/exx_abfs-construct_orbs.h index 3720b33369..3267786bca 100644 --- a/source/module_ri/exx_abfs-construct_orbs.h +++ b/source/source_lcao/module_ri/exx_abfs-construct_orbs.h @@ -5,7 +5,7 @@ #include #include "source_cell/unitcell.h" -#include "../source_basis/module_ao/ORB_atomic_lm.h" +#include "../../source_basis/module_ao/ORB_atomic_lm.h" class LCAO_Orbitals; diff --git a/source/module_ri/exx_abfs-io.cpp b/source/source_lcao/module_ri/exx_abfs-io.cpp similarity index 96% rename from source/module_ri/exx_abfs-io.cpp rename to source/source_lcao/module_ri/exx_abfs-io.cpp index 864422f286..96a4b1a381 100644 --- a/source/module_ri/exx_abfs-io.cpp +++ b/source/source_lcao/module_ri/exx_abfs-io.cpp @@ -5,10 +5,10 @@ #include "exx_abfs-io.h" #include "exx_abfs-jle.h" #include "exx_abfs-abfs_index.h" -#include "../source_pw/hamilt_pwdft/global.h" -#include "../source_basis/module_ao/ORB_read.h" -#include "../source_base/global_function.h" -#include "../source_base/math_integral.h" // mohan add 2021-04-03 +#include "../../source_pw/hamilt_pwdft/global.h" +#include "../../source_basis/module_ao/ORB_read.h" +#include "../../source_base/global_function.h" +#include "../../source_base/math_integral.h" // mohan add 2021-04-03 std::vector>> Exx_Abfs::IO::construct_abfs( diff --git a/source/module_ri/exx_abfs-io.h b/source/source_lcao/module_ri/exx_abfs-io.h similarity index 87% rename from source/module_ri/exx_abfs-io.h rename to source/source_lcao/module_ri/exx_abfs-io.h index aebdd9fe89..354eb78b18 100644 --- a/source/module_ri/exx_abfs-io.h +++ b/source/source_lcao/module_ri/exx_abfs-io.h @@ -5,9 +5,9 @@ #include #include -#include "../source_basis/module_ao/ORB_atomic_lm.h" -#include "../source_base/matrix.h" -#include "../source_base/element_basis_index.h" +#include "../../source_basis/module_ao/ORB_atomic_lm.h" +#include "../../source_base/matrix.h" +#include "../../source_base/element_basis_index.h" #include "source_cell/klist.h" #ifdef __MPI #include "mpi.h" diff --git a/source/module_ri/exx_abfs-jle.cpp b/source/source_lcao/module_ri/exx_abfs-jle.cpp similarity index 86% rename from source/module_ri/exx_abfs-jle.cpp rename to source/source_lcao/module_ri/exx_abfs-jle.cpp index 9d636968bf..9fb1b6346d 100644 --- a/source/module_ri/exx_abfs-jle.cpp +++ b/source/source_lcao/module_ri/exx_abfs-jle.cpp @@ -1,11 +1,11 @@ #include "exx_abfs-jle.h" #include "module_parameter/parameter.h" -#include "../source_pw/hamilt_pwdft/global.h" -#include "../source_basis/module_ao/ORB_read.h" -#include "../source_base/global_function.h" -#include "../source_base/mathzone.h" -#include "../source_base/math_sphbes.h" // mohan add 2021-05-06 +#include "../../source_pw/hamilt_pwdft/global.h" +#include "../../source_basis/module_ao/ORB_read.h" +#include "../../source_base/global_function.h" +#include "../../source_base/mathzone.h" +#include "../../source_base/math_sphbes.h" // mohan add 2021-05-06 bool Exx_Abfs::Jle::generate_matrix = false; int Exx_Abfs::Jle::Lmax = 2; diff --git a/source/module_ri/exx_abfs-jle.h b/source/source_lcao/module_ri/exx_abfs-jle.h similarity index 90% rename from source/module_ri/exx_abfs-jle.h rename to source/source_lcao/module_ri/exx_abfs-jle.h index 84a9b6b355..d1ea211eaf 100644 --- a/source/module_ri/exx_abfs-jle.h +++ b/source/source_lcao/module_ri/exx_abfs-jle.h @@ -5,7 +5,7 @@ #include #include "source_cell/unitcell.h" -#include "../source_basis/module_ao/ORB_read.h" +#include "../../source_basis/module_ao/ORB_read.h" class Exx_Abfs::Jle { diff --git a/source/module_ri/exx_abfs.h b/source/source_lcao/module_ri/exx_abfs.h similarity index 64% rename from source/module_ri/exx_abfs.h rename to source/source_lcao/module_ri/exx_abfs.h index dd0e3e578f..bda52e69d2 100644 --- a/source/module_ri/exx_abfs.h +++ b/source/source_lcao/module_ri/exx_abfs.h @@ -7,10 +7,10 @@ using std::vector; using std::map; #include -#include "../source_basis/module_ao/ORB_atomic_lm.h" -#include "../source_base/element_basis_index.h" -#include "../source_base/matrix.h" -#include "../source_base/vector3.h" +#include "../../source_basis/module_ao/ORB_atomic_lm.h" +#include "../../source_base/element_basis_index.h" +#include "../../source_base/matrix.h" +#include "../../source_base/vector3.h" class Exx_Abfs { diff --git a/source/module_ri/exx_lip.h b/source/source_lcao/module_ri/exx_lip.h similarity index 100% rename from source/module_ri/exx_lip.h rename to source/source_lcao/module_ri/exx_lip.h diff --git a/source/module_ri/exx_lip.hpp b/source/source_lcao/module_ri/exx_lip.hpp similarity index 100% rename from source/module_ri/exx_lip.hpp rename to source/source_lcao/module_ri/exx_lip.hpp diff --git a/source/module_ri/exx_opt_orb-print.cpp b/source/source_lcao/module_ri/exx_opt_orb-print.cpp similarity index 99% rename from source/module_ri/exx_opt_orb-print.cpp rename to source/source_lcao/module_ri/exx_opt_orb-print.cpp index 76a7fedde7..3c496b1033 100644 --- a/source/module_ri/exx_opt_orb-print.cpp +++ b/source/source_lcao/module_ri/exx_opt_orb-print.cpp @@ -1,5 +1,5 @@ #include "exx_opt_orb.h" -#include "../source_pw/hamilt_pwdft/global.h" +#include "../../source_pw/hamilt_pwdft/global.h" #include "exx_abfs-jle.h" void Exx_Opt_Orb::print_matrix( diff --git a/source/module_ri/exx_opt_orb.cpp b/source/source_lcao/module_ri/exx_opt_orb.cpp similarity index 97% rename from source/module_ri/exx_opt_orb.cpp rename to source/source_lcao/module_ri/exx_opt_orb.cpp index 0591bf59ec..74f5de6625 100644 --- a/source/module_ri/exx_opt_orb.cpp +++ b/source/source_lcao/module_ri/exx_opt_orb.cpp @@ -6,13 +6,13 @@ #include "exx_abfs-construct_orbs.h" #include "exx_abfs-jle.h" #include "source_basis/module_ao/ORB_read.h" -#include "module_ri/Matrix_Orbs11.h" -#include "module_ri/Matrix_Orbs21.h" -#include "module_ri/Matrix_Orbs22.h" -#include "module_ri/LRI_CV_Tools.h" +#include "source_lcao/module_ri/Matrix_Orbs11.h" +#include "source_lcao/module_ri/Matrix_Orbs21.h" +#include "source_lcao/module_ri/Matrix_Orbs22.h" +#include "source_lcao/module_ri/LRI_CV_Tools.h" -#include "../module_ri/test_code/element_basis_index-test.h" -#include "../module_ri/test_code/test_function.h" +#include "../../source_lcao/module_ri/test_code/element_basis_index-test.h" +#include "../../source_lcao/module_ri/test_code/test_function.h" #include void Exx_Opt_Orb::generate_matrix(const K_Vectors &kv, const UnitCell& ucell, const LCAO_Orbitals& orb) const diff --git a/source/module_ri/exx_opt_orb.h b/source/source_lcao/module_ri/exx_opt_orb.h similarity index 94% rename from source/module_ri/exx_opt_orb.h rename to source/source_lcao/module_ri/exx_opt_orb.h index de85a11541..5bebe91771 100644 --- a/source/module_ri/exx_opt_orb.h +++ b/source/source_lcao/module_ri/exx_opt_orb.h @@ -1,8 +1,8 @@ #ifndef EXX_OPT_ORB_H #define EXX_OPT_ORB_H -#include "../source_base/matrix.h" -#include "../source_base/element_basis_index.h" +#include "../../source_base/matrix.h" +#include "../../source_base/element_basis_index.h" #include "source_cell/klist.h" #include "source_basis/module_ao/ORB_read.h" #include diff --git a/source/module_ri/module_exx_symmetry/CMakeLists.txt b/source/source_lcao/module_ri/module_exx_symmetry/CMakeLists.txt similarity index 100% rename from source/module_ri/module_exx_symmetry/CMakeLists.txt rename to source/source_lcao/module_ri/module_exx_symmetry/CMakeLists.txt diff --git a/source/module_ri/module_exx_symmetry/irreducible_sector.cpp b/source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector.cpp similarity index 99% rename from source/module_ri/module_exx_symmetry/irreducible_sector.cpp rename to source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector.cpp index 9cb889b831..45d578f225 100644 --- a/source/module_ri/module_exx_symmetry/irreducible_sector.cpp +++ b/source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector.cpp @@ -1,4 +1,4 @@ -#include "module_ri/module_exx_symmetry/irreducible_sector.h" +#include "source_lcao/module_ri/module_exx_symmetry/irreducible_sector.h" #include "module_parameter/parameter.h" namespace ModuleSymmetry { diff --git a/source/module_ri/module_exx_symmetry/irreducible_sector.h b/source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector.h similarity index 100% rename from source/module_ri/module_exx_symmetry/irreducible_sector.h rename to source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector.h diff --git a/source/module_ri/module_exx_symmetry/irreducible_sector_bvk.cpp b/source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector_bvk.cpp similarity index 100% rename from source/module_ri/module_exx_symmetry/irreducible_sector_bvk.cpp rename to source/source_lcao/module_ri/module_exx_symmetry/irreducible_sector_bvk.cpp diff --git a/source/module_ri/module_exx_symmetry/symmetry_rotation.cpp b/source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.cpp similarity index 100% rename from source/module_ri/module_exx_symmetry/symmetry_rotation.cpp rename to source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.cpp diff --git a/source/module_ri/module_exx_symmetry/symmetry_rotation.h b/source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.h similarity index 100% rename from source/module_ri/module_exx_symmetry/symmetry_rotation.h rename to source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation.h diff --git a/source/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp b/source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp similarity index 99% rename from source/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp rename to source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp index d2301576fd..d8cb6d0e3a 100644 --- a/source/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp +++ b/source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation_R.hpp @@ -1,5 +1,5 @@ #include "symmetry_rotation.h" -#include "module_ri/RI_Util.h" +#include "source_lcao/module_ri/RI_Util.h" #include "source_base/blas_connector.h" #include "source_base/timer.h" #include diff --git a/source/module_ri/module_exx_symmetry/symmetry_rotation_R_hcontainer.hpp b/source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation_R_hcontainer.hpp similarity index 100% rename from source/module_ri/module_exx_symmetry/symmetry_rotation_R_hcontainer.hpp rename to source/source_lcao/module_ri/module_exx_symmetry/symmetry_rotation_R_hcontainer.hpp diff --git a/source/module_ri/module_exx_symmetry/test/CMakeLists.txt b/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt similarity index 77% rename from source/module_ri/module_exx_symmetry/test/CMakeLists.txt rename to source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt index c5f716ddc1..6a3a263dc9 100644 --- a/source/module_ri/module_exx_symmetry/test/CMakeLists.txt +++ b/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt @@ -5,6 +5,6 @@ AddTest( TARGET MODULE_RI_EXX_SYMMETRY_rotation LIBS base ${math_libs} device symmetry neighbor parameter SOURCES symmetry_rotation_test.cpp ../symmetry_rotation.cpp ../irreducible_sector.cpp ../irreducible_sector_bvk.cpp - ../../../source_basis/module_ao/parallel_orbitals.cpp - ../../../source_io/output.cpp + ../../../../source_basis/module_ao/parallel_orbitals.cpp + ../../../../source_io/output.cpp ) \ No newline at end of file diff --git a/source/module_ri/module_exx_symmetry/test/symmetry_rotation_test.cpp b/source/source_lcao/module_ri/module_exx_symmetry/test/symmetry_rotation_test.cpp similarity index 100% rename from source/module_ri/module_exx_symmetry/test/symmetry_rotation_test.cpp rename to source/source_lcao/module_ri/module_exx_symmetry/test/symmetry_rotation_test.cpp diff --git a/source/module_ri/serialization_boost.h b/source/source_lcao/module_ri/serialization_boost.h similarity index 94% rename from source/module_ri/serialization_boost.h rename to source/source_lcao/module_ri/serialization_boost.h index c187155489..baaa68a423 100644 --- a/source/module_ri/serialization_boost.h +++ b/source/source_lcao/module_ri/serialization_boost.h @@ -11,10 +11,10 @@ #include #include -#include "../source_base/vector3.h" -#include "../source_base/abfs-vector3_order.h" -#include "../source_base/matrix.h" -#include "../source_base/matrix_wrapper.h" +#include "../../source_base/vector3.h" +#include "../../source_base/abfs-vector3_order.h" +#include "../../source_base/matrix.h" +#include "../../source_base/matrix_wrapper.h" namespace boost { diff --git a/source/module_ri/serialization_cereal.h b/source/source_lcao/module_ri/serialization_cereal.h similarity index 93% rename from source/module_ri/serialization_cereal.h rename to source/source_lcao/module_ri/serialization_cereal.h index 802449f624..cc7101a88d 100644 --- a/source/module_ri/serialization_cereal.h +++ b/source/source_lcao/module_ri/serialization_cereal.h @@ -9,9 +9,9 @@ #include #include -#include "../source_base/vector3.h" -#include "../source_base/abfs-vector3_order.h" -#include "../source_base/matrix.h" +#include "../../source_base/vector3.h" +#include "../../source_base/abfs-vector3_order.h" +#include "../../source_base/matrix.h" diff --git a/source/module_ri/test/CMakeLists.txt b/source/source_lcao/module_ri/test/CMakeLists.txt similarity index 100% rename from source/module_ri/test/CMakeLists.txt rename to source/source_lcao/module_ri/test/CMakeLists.txt diff --git a/source/module_ri/test/dm_mixing_test.cpp b/source/source_lcao/module_ri/test/dm_mixing_test.cpp similarity index 98% rename from source/module_ri/test/dm_mixing_test.cpp rename to source/source_lcao/module_ri/test/dm_mixing_test.cpp index 5f8124e2e3..e478c6a120 100644 --- a/source/module_ri/test/dm_mixing_test.cpp +++ b/source/source_lcao/module_ri/test/dm_mixing_test.cpp @@ -1,8 +1,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "source_base/module_mixing/broyden_mixing.h" -#include "module_ri/Mix_DMk_2D.h" -#include "module_ri/Mix_Matrix.h" +#include "source_lcao/module_ri/Mix_DMk_2D.h" +#include "source_lcao/module_ri/Mix_Matrix.h" /************************************************ * unit test of charge_mixing.cpp & Mix_DMk_2D.cpp diff --git a/source/module_ri/test/ri_cv_io_test.cpp b/source/source_lcao/module_ri/test/ri_cv_io_test.cpp similarity index 100% rename from source/module_ri/test/ri_cv_io_test.cpp rename to source/source_lcao/module_ri/test/ri_cv_io_test.cpp diff --git a/source/module_ri/test/support/CMakeLists.txt b/source/source_lcao/module_ri/test/support/CMakeLists.txt similarity index 100% rename from source/module_ri/test/support/CMakeLists.txt rename to source/source_lcao/module_ri/test/support/CMakeLists.txt diff --git a/source/module_ri/test/support/Cs b/source/source_lcao/module_ri/test/support/Cs similarity index 100% rename from source/module_ri/test/support/Cs rename to source/source_lcao/module_ri/test/support/Cs diff --git a/source/module_ri/test/support/Vs b/source/source_lcao/module_ri/test/support/Vs similarity index 100% rename from source/module_ri/test/support/Vs rename to source/source_lcao/module_ri/test/support/Vs diff --git a/source/module_ri/test_code/Inverse_Matrix-test.h b/source/source_lcao/module_ri/test_code/Inverse_Matrix-test.h similarity index 93% rename from source/module_ri/test_code/Inverse_Matrix-test.h rename to source/source_lcao/module_ri/test_code/Inverse_Matrix-test.h index 355c31fbb1..d73262c520 100644 --- a/source/module_ri/test_code/Inverse_Matrix-test.h +++ b/source/source_lcao/module_ri/test_code/Inverse_Matrix-test.h @@ -6,7 +6,7 @@ #ifndef INVERSE_MATRIX_TEST_H #define INVERSE_MATRIX_TEST_H -#include "module_ri/Inverse_Matrix.h" +#include "source_lcao/module_ri/Inverse_Matrix.h" #include namespace Inverse_Matrix_Test diff --git a/source/module_ri/test_code/element_basis_index-test.h b/source/source_lcao/module_ri/test_code/element_basis_index-test.h similarity index 100% rename from source/module_ri/test_code/element_basis_index-test.h rename to source/source_lcao/module_ri/test_code/element_basis_index-test.h diff --git a/source/module_ri/test_code/element_basis_index-unittest.cpp b/source/source_lcao/module_ri/test_code/element_basis_index-unittest.cpp similarity index 100% rename from source/module_ri/test_code/element_basis_index-unittest.cpp rename to source/source_lcao/module_ri/test_code/element_basis_index-unittest.cpp diff --git a/source/module_ri/test_code/exx_abfs-construct_orbs-test.h b/source/source_lcao/module_ri/test_code/exx_abfs-construct_orbs-test.h similarity index 100% rename from source/module_ri/test_code/exx_abfs-construct_orbs-test.h rename to source/source_lcao/module_ri/test_code/exx_abfs-construct_orbs-test.h diff --git a/source/module_ri/test_code/make_gaunt_table-unittest.h b/source/source_lcao/module_ri/test_code/make_gaunt_table-unittest.h similarity index 100% rename from source/module_ri/test_code/make_gaunt_table-unittest.h rename to source/source_lcao/module_ri/test_code/make_gaunt_table-unittest.h diff --git a/source/module_ri/test_code/scalapack-test.cpp b/source/source_lcao/module_ri/test_code/scalapack-test.cpp similarity index 100% rename from source/module_ri/test_code/scalapack-test.cpp rename to source/source_lcao/module_ri/test_code/scalapack-test.cpp diff --git a/source/module_ri/test_code/test_function.h b/source/source_lcao/module_ri/test_code/test_function.h similarity index 100% rename from source/module_ri/test_code/test_function.h rename to source/source_lcao/module_ri/test_code/test_function.h diff --git a/source/module_ri/write_ri_cv.hpp b/source/source_lcao/module_ri/write_ri_cv.hpp similarity index 98% rename from source/module_ri/write_ri_cv.hpp rename to source/source_lcao/module_ri/write_ri_cv.hpp index 05b3a69cb8..a90fa3c490 100644 --- a/source/module_ri/write_ri_cv.hpp +++ b/source/source_lcao/module_ri/write_ri_cv.hpp @@ -1,4 +1,4 @@ -// #include "module_ri/LRI_CV_Tools.h" +// #include "source_lcao/module_ri/LRI_CV_Tools.h" #include #include #define IZ(x) int x = 0; diff --git a/source/source_pw/hamilt_pwdft/global.h b/source/source_pw/hamilt_pwdft/global.h index f99c3ca21b..150d8b1dc1 100644 --- a/source/source_pw/hamilt_pwdft/global.h +++ b/source/source_pw/hamilt_pwdft/global.h @@ -9,7 +9,7 @@ #include "source_relax/relax_driver.h" #ifdef __EXX #include "source_hamilt/module_xc/exx_info.h" -#include "module_ri/exx_lip.h" +#include "source_lcao/module_ri/exx_lip.h" #endif #include "source_estate/magnetism.h" #include "source_hamilt/module_xc/xc_functional.h" diff --git a/source/source_pw/hamilt_pwdft/hamilt_lcaopw.h b/source/source_pw/hamilt_pwdft/hamilt_lcaopw.h index 18e109e712..b66091f31f 100644 --- a/source/source_pw/hamilt_pwdft/hamilt_lcaopw.h +++ b/source/source_pw/hamilt_pwdft/hamilt_lcaopw.h @@ -3,7 +3,7 @@ #include "source_pw/hamilt_pwdft/hamilt_pw.h" #ifdef __EXX -#include "module_ri/exx_lip.h" +#include "source_lcao/module_ri/exx_lip.h" #endif namespace hamilt