Skip to content

Commit 9bc8960

Browse files
authored
Refactor: move psiinit file to hsolver folder (deepmodeling#5601)
* move psiinit to esolver * update file name
1 parent 6df5c6d commit 9bc8960

File tree

9 files changed

+12
-6
lines changed

9 files changed

+12
-6
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ target_link_libraries(
709709
hamilt_stodft
710710
psi
711711
psi_initializer
712+
psi_overall_init
712713
esolver
713714
vdw
714715
device

source/Makefile.Objects

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ OBJS_SRCPW=H_Ewald_pw.o\
666666
symmetry_rhog.o\
667667
wavefunc.o\
668668
wf_atomic.o\
669-
psiinit.o\
669+
psi_init.o\
670670
elecond.o\
671671
sto_tool.o\
672672
sto_elecond.o\

source/module_esolver/esolver_ks_pw.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define ESOLVER_KS_PW_H
33
#include "./esolver_ks.h"
44
#include "module_hamilt_pw/hamilt_pwdft/operator_pw/velocity_pw.h"
5-
#include "module_hamilt_pw/hamilt_pwdft/psiinit.h"
5+
#include "module_psi/psi_init.h"
66

77
#include <memory>
88
#include <module_base/macros.h>

source/module_hamilt_lcao/module_deepks/test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ target_link_libraries(
1414
neighbor orb io_basic io_advanced relax gint driver esolver hsolver psi elecstate
1515
hamilt_general hamilt_pwdft hamilt_lcao tddft hamilt_ofdft hamilt_stodft planewave
1616
pthread vdw dftu deltaspin hcontainer
17-
deepks device numerical_atomic_orbitals container psi_initializer
17+
deepks device numerical_atomic_orbitals container psi_initializer psi_overall_init
1818
${ABACUS_LINK_LIBRARIES}
1919
)
2020

source/module_hamilt_pw/hamilt_pwdft/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ list(APPEND objects
2828
VNL_grad_pw.cpp
2929
wavefunc.cpp
3030
wf_atomic.cpp
31-
psiinit.cpp
3231
structure_factor.cpp
3332
structure_factor_k.cpp
3433
soc.cpp

source/module_psi/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ add_library(
44
psi.cpp
55
)
66

7+
add_library(
8+
psi_overall_init
9+
OBJECT
10+
psi_init.cpp
11+
)
12+
713
add_library(
814
psi_initializer
915
OBJECT

source/module_hamilt_pw/hamilt_pwdft/psiinit.cpp renamed to source/module_psi/psi_init.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "psiinit.h"
1+
#include "psi_init.h"
22

33
#include "module_base/macros.h"
44
#include "module_base/timer.h"

source/module_ri/exx_lip.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "module_elecstate/elecstate.h"
2222
#include "module_basis/module_pw/pw_basis_k.h"
2323
#include "module_cell/module_symmetry/symmetry.h"
24-
#include "module_hamilt_pw/hamilt_pwdft/psiinit.h"
24+
#include "module_psi/psi_init.h"
2525
#include "module_hamilt_pw/hamilt_pwdft/structure_factor.h"
2626
#include "module_base/tool_title.h"
2727
#include "module_base/timer.h"

0 commit comments

Comments
 (0)