Skip to content

Commit 6c7c658

Browse files
mohanchenabacus_fixer
andauthored
Refactor source_psi, remove some unnecessary dependency (#7675)
* remove some PARAM in source_psi * remove the dependency on klist.cpp * move psi_initializer to psi_base * remove nonlocal pseudopotential dependency * update * update * some small updates * fix a bug * fix another bug * update * update atomic * update * remove parameter.h * update psi init tests * update * update source_psi documents * delete useless terms * update ik2iktot * refactor nkstot and lmaxkb parameters * remove useless variables * update --------- Co-authored-by: abacus_fixer <mohanchen@pku.eud.cn>
1 parent ee03f01 commit 6c7c658

35 files changed

Lines changed: 860 additions & 622 deletions

source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ target_link_libraries(
679679
cell
680680
parameter
681681
psi_overall_init
682-
psi_initializer
682+
psi_init
683683
psi
684684
dftu
685685
deltaspin

source/Makefile.Objects

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ OBJS_ORBITAL=ORB_atomic.o\
455455

456456
OBJS_PSI=psi.o\
457457

458-
OBJS_PSI_INITIALIZER=psi_initializer.o\
458+
OBJS_PSI_INITIALIZER=psi_base.o\
459459
psi_init_random.o\
460460
psi_init_file.o\
461461
psi_init_atomic.o\

source/source_esolver/esolver_ks_pw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void ESolver_KS_PW<T, Device>::before_all_runners(BaseCell& basecell, const Inpu
9292
this->solvent,
9393
inp);
9494

95-
this->stp.before_runner(ucell, this->kv, this->sf, *this->pw_wfc, this->ppcell, PARAM.inp);
95+
this->stp.before_runner(ucell, this->kv, this->sf, *this->pw_wfc, this->ppcell.lmaxkb, PARAM.inp);
9696

9797
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "INIT BASIS");
9898

source/source_io/module_ctrl/ctrl_output_pw.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
#include "source_base/module_device/device.h" // use Device
55
#include "source_psi/psi.h" // define psi
66
#include "source_estate/elecstate_lcao.h" // use pelec
7-
#include "source_psi/setup_psi_pw.h" // use Setup_Psi class
7+
#include "source_psi/setup_psi_pw.h" // use Setup_Psi class
8+
9+
class pseudopot_cell_vnl;
810

911
namespace ModuleIO
1012
{

source/source_io/module_parameter/read_input_item_postprocess.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void ReadInput::item_postprocess()
403403
404404
In the future lcao_in_pw will have its own ESolver.
405405
406-
2023/12/22 use new psi_initializer to expand numerical
406+
2023/12/22 use new psi_base to expand numerical
407407
atomic orbitals, ykhuang
408408
*/
409409
if (para.input.towannier90 && para.input.basis_type == "lcao_in_pw")

source/source_io/module_wannier/to_wannier90_lcao_in_pw.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ void toWannier90_LCAO_IN_PW::calculate(
4444
Structure_Factor* sf_ptr = const_cast<Structure_Factor*>(&sf);
4545
ModulePW::PW_Basis_K* wfcpw_ptr = const_cast<ModulePW::PW_Basis_K*>(wfcpw);
4646
delete this->psi_initer_;
47-
this->psi_initer_ = new psi_init_nao<std::complex<double>>();
48-
this->psi_initer_->initialize(sf_ptr, wfcpw_ptr, &ucell, &kv, 1, nullptr, GlobalV::MY_RANK);
47+
psi_init_nao<std::complex<double>>* nao_initer = new psi_init_nao<std::complex<double>>();
48+
nao_initer->prepare_params(PARAM.globalv.nqx, PARAM.globalv.dq, PARAM.inp.nspin, PARAM.inp.orbital_dir);
49+
this->psi_initer_ = nao_initer;
50+
this->psi_initer_->initialize(sf_ptr, wfcpw_ptr, &ucell, kv.ik2iktot, 1, GlobalV::MY_RANK, PARAM.globalv.npol, PARAM.inp.nbands);
4951
this->psi_initer_->tabulate();
5052
delete this->psi;
5153
const int nks_psi = (PARAM.inp.calculation == "nscf" && PARAM.inp.mem_saver == 1)? 1 : wfcpw->nks;

source/source_io/module_wannier/to_wannier90_lcao_in_pw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#ifdef __LCAO
2323
#include "source_basis/module_ao/parallel_orbitals.h"
24-
#include "source_psi/psi_initializer.h"
24+
#include "source_psi/psi_base.h"
2525

2626
class toWannier90_LCAO_IN_PW : public toWannier90_PW
2727
{
@@ -59,7 +59,7 @@ class toWannier90_LCAO_IN_PW : public toWannier90_PW
5959
protected:
6060
const Parallel_Orbitals* ParaV = nullptr;
6161
/// @brief psi initializer for expanding nao in planewave basis
62-
psi_initializer<std::complex<double>>* psi_initer_ = nullptr;
62+
psi_base<std::complex<double>>* psi_initer_ = nullptr;
6363

6464
psi::Psi<std::complex<double>, base_device::DEVICE_CPU>* psi = nullptr;
6565

source/source_lcao/module_rdmft/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif()
1111

1212
# if(ENABLE_COVERAGE)
1313
# add_coverage(psi)
14-
# add_coverage(psi_initializer)
14+
# add_coverage(psi_init)
1515
# endif()
1616

1717
# if (BUILD_TESTING)

source/source_lcao/module_ri/exx_lip.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "source_estate/elecstate.h"
2020
#include "source_basis/module_pw/pw_basis_k.h"
2121
#include "source_cell/module_symmetry/symmetry.h"
22-
#include "source_psi/psi_initializer.h"
22+
#include "source_psi/psi_base.h"
2323
#include "source_pw/module_pwdft/structure_factor.h"
2424
#include "source_base/tool_title.h"
2525
#include "source_base/timer.h"

source/source_psi/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ add_library(
1313
)
1414

1515
add_library(
16-
psi_initializer
16+
psi_init
1717
OBJECT
18-
psi_initializer.cpp
18+
psi_base.cpp
1919
psi_init_random.cpp
2020
psi_init_file.cpp
2121
psi_init_atomic.cpp
@@ -27,7 +27,7 @@ add_library(
2727

2828
if(ENABLE_COVERAGE)
2929
add_coverage(psi)
30-
add_coverage(psi_initializer)
30+
add_coverage(psi_init)
3131
endif()
3232

3333
if (BUILD_TESTING)

0 commit comments

Comments
 (0)