Skip to content

Commit 48639db

Browse files
author
abacus_fixer
committed
refactor(dftu): move DFT+U operator from module_operator_lcao to module_dftu
Move DFTU/OperatorDFTU<OperatorLCAO> operator implementation files (dftu.hpp, dftu_lcao.h/cpp, dftu_fs.cpp, op_dftu_lcao.h/cpp) and the related unit test (test_dftu.cpp -> dftu_lcao_test.cpp) from module_operator_lcao to module_dftu. This is a step toward removing module_operator_lcao and grouping DFT+U code by physical domain. CMake changes: - module_dftu CMakeLists adds the 3 cpp files guarded by ENABLE_LCAO, since module_dftu is unconditionally added by source_lcao while these files depend on operator_lcao.h - module_operator_lcao CMakeLists drops the 3 cpp files - source_lcao CMakeLists drops the 3 cpp entries from the hamilt_lcao OBJECT library (now provided by the dftu OBJECT library) - New dftu_lcao_test target guarded by ENABLE_LCAO AND ENABLE_MPI matches the original MODULE_LCAO_operator_dftu_test build condition Include path updates in 5 external call sites plus op_dftu_lcao.h internal operator_lcao.h path (changed from same-directory relative to full path since the file is no longer co-located). Verified: cmake configure, make abacus_max_para + dftu_lcao_test, and ctest dftu_pw_test/dftu_core_test/dftu_operator_test/dftu_lcao_test all pass; agent_governance_check reports only include-path change warnings with no errors.
1 parent 22659fc commit 48639db

16 files changed

Lines changed: 31 additions & 22 deletions

File tree

source/source_io/module_hs/write_vxc.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "source_base/parallel_reduce.h"
55
#include "source_base/module_container/base/third_party/blas.h"
66
#include "source_base/module_external/scalapack_connector.h"
7-
#include "source_lcao/module_operator_lcao/op_dftu_lcao.h"
7+
#include "source_lcao/module_dftu/op_dftu_lcao.h"
88
#include "source_lcao/module_operator_lcao/veff_lcao.h"
99
#include "source_hamilt/module_xc/exx_info.h"
1010
#ifdef __EXX

source/source_io/module_hs/write_vxc_r.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define __WRITE_VXC_R_H_
33
#include "source_io/module_parameter/parameter.h"
44
#include "source_io/module_hs/write_hs_sparse.h"
5-
#include "source_lcao/module_operator_lcao/op_dftu_lcao.h"
5+
#include "source_lcao/module_dftu/op_dftu_lcao.h"
66
#include "source_lcao/module_operator_lcao/veff_lcao.h"
77
#include "source_lcao/spar_hsr.h"
88
#ifdef __EXX

source/source_lcao/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ if(ENABLE_LCAO)
1515
module_operator_lcao/veff_lcao.cpp
1616
module_operator_lcao/veff_dh.cpp
1717
module_operator_lcao/meta_lcao.cpp
18-
module_operator_lcao/op_dftu_lcao.cpp
1918
module_operator_lcao/deepks_lcao.cpp
2019
module_operator_lcao/op_exx_lcao.cpp
2120
module_operator_lcao/overlap.cpp
@@ -32,8 +31,6 @@ if(ENABLE_LCAO)
3231
module_operator_lcao/td_pot_hybrid_fs.cpp
3332
module_operator_lcao/dspin_lcao.cpp
3433
module_operator_lcao/dspin_fs.cpp
35-
module_operator_lcao/dftu_lcao.cpp
36-
module_operator_lcao/dftu_fs.cpp
3734
module_operator_lcao/operator_fs_utils.cpp
3835
setup_dftu_lcao.cpp
3936
pulay_fs_center2.cpp

source/source_lcao/force_stress_lcao.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "source_lcao/module_deepks/lcao_deepks_io.h" // mohan add 2024-07-22
2121
#include "source_lcao/module_deepks/deepks_force.h"
2222
#endif
23-
#include "source_lcao/module_operator_lcao/dftu_lcao.h"
23+
#include "source_lcao/module_dftu/dftu_lcao.h"
2424
#include "source_lcao/module_operator_lcao/dspin_lcao.h"
2525
#include "source_lcao/module_operator_lcao/nonlocal.h"
2626
#include "source_lcao/module_operator_lcao/ekinetic.h"

source/source_lcao/hamilt_lcao.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#include "source_lcao/module_deltaspin/spin_constrain.h"
3232
#include "source_hamilt/module_hcontainer/hcontainer_funcs.h"
3333
#include "source_hsolver/hsolver_lcao.h"
34-
#include "module_operator_lcao/dftu_lcao.h"
34+
#include "module_dftu/dftu_lcao.h"
3535
#include "module_operator_lcao/dspin_lcao.h"
3636
#include "module_operator_lcao/ekinetic.h"
3737
#include "module_operator_lcao/meta_lcao.h"
3838
#include "module_operator_lcao/nonlocal.h"
39-
#include "module_operator_lcao/op_dftu_lcao.h"
39+
#include "module_dftu/op_dftu_lcao.h"
4040
#include "module_operator_lcao/op_exx_lcao.h"
4141
#include "module_operator_lcao/overlap.h"
4242
#include "module_operator_lcao/td_ekinetic_lcao.h"

source/source_lcao/module_dftu/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ list(APPEND objects
88
dftu_hamilt.cpp
99
)
1010

11+
if(ENABLE_LCAO)
12+
list(APPEND objects
13+
dftu_lcao.cpp
14+
dftu_fs.cpp
15+
op_dftu_lcao.cpp
16+
)
17+
endif()
18+
1119
add_library(
1220
dftu
1321
OBJECT
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)