Skip to content

Commit cdde2c5

Browse files
author
abacus_fixer
committed
Rename DFT+U LCAO files to reflect roles
Three LCAO DFT+U files had confusing names that hid which was the main implementation, the new operator, and the legacy operator. Rename for clarity: - dftu.h/.cpp -> dftu_lcao.h/.cpp : Plus_U class (LCAO DFT+U physics, subclass of Plus_U_Base in dftu_base.h). The name now mirrors dftu_base.h. - dftu_lcao.h/.cpp -> dftu_lcao_op.h/.cpp : hamilt::DFTU operator (new method, dft_plus_u==1, onsite_radius projections). Operators now carry the _op suffix. - op_dftu_lcao.h/.cpp -> dftu_lcao_op_legacy.h/.cpp : hamilt::OperatorDFTU operator (old method, dft_plus_u==2, NAO first zeta projections, test-only). Renamed to mark it as legacy and group it with the new operator. Class names are unchanged in this step (Plus_U, hamilt::DFTU, hamilt::OperatorDFTU); only filenames and #include paths change. Updated all ~40 includers across source_lcao, source_pw, source_esolver, source_estate, source_io, plus the module and test CMakeLists (the dftu_lcao_test links the new-operator cpp ../dftu_lcao_op.cpp, not the Plus_U cpp).
1 parent c3c3fcb commit cdde2c5

46 files changed

Lines changed: 1413 additions & 1413 deletions

Some content is hidden

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

source/source_esolver/esolver_ks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "source_hamilt/module_xc/xc_functional.h"
1414
#include "source_io/module_output/output_log.h" // use write_head
1515
#include "source_estate/elecstate_print.h" // print_etot
16-
#include "source_lcao/module_dftu/dftu.h" // mohan add 2025-11-07
16+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 2025-11-07
1717
#include "source_hamilt/module_xc/general_exx_info.h" // for init_general_exx_info
1818

1919
namespace ModuleESolver

source/source_esolver/esolver_ks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "source_hamilt/hamilt.h" // use Hamiltonian
99
#include "source_hamilt/hamilt_base.h" // use Hamiltonian base class
1010
#include "source_hamilt/module_xc/general_exx_info.h" // ESolver owns General_Exx_Info value
11-
#include "source_lcao/module_dftu/dftu.h" // mohan add 20251107
11+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 20251107
1212
#include "source_pw/module_pwdft/vnl_pw.h"
1313

1414
namespace ModuleESolver

source/source_esolver/lcao_others.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "source_cell/cal_ux.h"
33
#include "source_estate/module_charge/symm_rho.h"
44
#include "source_lcao/hamilt_lcao.h"
5-
#include "source_lcao/module_dftu/dftu.h"
5+
#include "source_lcao/module_dftu/dftu_lcao.h"
66
#include "source_hamilt/module_gint/gint.h"
77
#include "source_base/formatter.h"
88
#include "source_base/timer.h"

source/source_estate/module_charge/chgmixing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "source_estate/module_charge/chgmixing.h"
22
#include "source_estate/update_pot.h"
3-
#include "source_lcao/module_dftu/dftu.h"
3+
#include "source_lcao/module_dftu/dftu_lcao.h"
44
#include "source_lcao/module_deltaspin/spin_constrain.h"
55

66
void module_charge::chgmixing_ks(const int iter, // scf iteration number

source/source_estate/module_charge/chgmixing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "source_estate/module_charge/charge_mixing.h" // use p_chgmix
77
#include "source_io/module_parameter/input_parameter.h" // use Input_para
88
#include "source_cell/unitcell.h"
9-
#include "source_lcao/module_dftu/dftu.h" // mohan add 2025-11-06
9+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 2025-11-06
1010

1111
namespace module_charge
1212
{

source/source_io/module_ctrl/ctrl_scf_lcao.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "source_estate/module_dm/density_matrix.h" // mohan add 2025-11-04
1010
#include "source_hamilt/module_surchem/surchem.h" // use surchem (for dH veff pots)
1111
#include "source_lcao/hamilt_lcao.h" // use hamilt::HamiltLCAO<TK, TR>
12-
#include "source_lcao/module_dftu/dftu.h" // mohan add 20251107
12+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 20251107
1313
#include "source_lcao/module_rdmft/rdmft.h" // use RDMFT codes
1414
#include "source_lcao/setup_deepks.h" // for deepks, mohan add 20251008
1515
#include "source_lcao/setup_exx.h" // for exx, mohan add 20251008

source/source_io/module_hs/output_mat_sparse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "source_cell/klist.h"
77
#include "source_hamilt/hamilt.h"
88
#include "source_cell/module_neighbor/sltk_grid_driver.h"
9-
#include "source_lcao/module_dftu/dftu.h" // mohan add 20251107
9+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 20251107
1010

1111
namespace ModuleIO
1212
{

source/source_io/module_hs/write_hs_r.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "source_cell/klist.h"
77
#include "source_hamilt/hamilt.h"
88
#include "source_lcao/lcao_hs_arrays.hpp"
9-
#include "source_lcao/module_dftu/dftu.h" // mohan add 20251107
9+
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 20251107
1010

1111
#ifdef __EXX
1212
#include "RI/global/Tensor.h" // for RI::Tensor

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_dftu/op_dftu_lcao.h"
7+
#include "source_lcao/module_dftu/dftu_lcao_op_legacy.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_dftu/op_dftu_lcao.h"
5+
#include "source_lcao/module_dftu/dftu_lcao_op_legacy.h"
66
#include "source_lcao/module_operator_lcao/veff_lcao.h"
77
#include "source_lcao/spar_hsr.h"
88
#ifdef __EXX

0 commit comments

Comments
 (0)