Skip to content

Commit 025cab6

Browse files
sunliang98sunliang98
committed
Merge branch 'fix_elf' of https://github.com/sunliang98/abacus-develop into fix_elf
2 parents bcedb1a + 94cd6c6 commit 025cab6

Some content is hidden

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

76 files changed

+149
-185
lines changed

‎source/Makefile.Objects‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ VPATH=./src_global:\
5050
./source_pw/module_pwdft:\
5151
./source_pw/module_ofdft:\
5252
./source_pw/module_stodft:\
53-
./source_pw/module_pwdft/operator_pw:\
5453
./source_pw/module_pwdft/kernels:\
5554
./source_pw/module_pwdft/module_exx_helper:\
5655
./source_pw/module_stodft/kernels:\
@@ -168,8 +167,8 @@ OBJS_BASE=abfs-vector3_order.o\
168167
ylm.o\
169168
opt_CG.o\
170169
opt_DCsrch.o\
171-
cubic_spline.o\
172-
spherical_bessel_transformer.o\
170+
cubic_spline.o\
171+
spherical_bessel_transformer.o\
173172
mixing_data.o\
174173
mixing.o\
175174
plain_mixing.o\
@@ -308,20 +307,21 @@ OBJS_GINT=batch_biggrid.o\
308307
OBJS_HAMILT=hamilt_pw.o\
309308
hamilt_sdft_pw.o\
310309
operator.o\
311-
operator_pw.o\
312-
op_exx_pw.o\
313-
ekinetic_pw.o\
310+
op_pw.o\
311+
op_pw_exx.o\
312+
op_pw_ekin.o\
314313
ekinetic_op.o\
315-
exx_pw_ace.o\
316-
exx_pw_pot.o\
314+
op_pw_exx_ace.o\
315+
op_pw_exx_pot.o\
317316
hpsi_norm_op.o\
318-
veff_pw.o\
317+
op_pw_veff.o\
319318
veff_op.o\
320-
nonlocal_pw.o\
319+
op_pw_nl.o\
321320
nonlocal_op.o\
322-
meta_pw.o\
321+
op_pw_meta.o\
323322
meta_op.o\
324-
velocity_pw.o\
323+
op_pw_vel.o\
324+
op_pw_proj.o\
325325
radial_proj.o\
326326
exx_helper.o\
327327
vec_mul_vec_complex_op.o\
@@ -417,18 +417,18 @@ OBJS_ORBITAL=ORB_atomic.o\
417417
ORB_nonlocal_lm.o\
418418
ORB_read.o\
419419
parallel_orbitals.o\
420-
atomic_radials.o\
420+
atomic_radials.o\
421421
hydrogen_radials.o\
422422
pswfc_radials.o\
423-
beta_radials.o\
424-
sphbes_radials.o\
425-
numerical_radial.o\
426-
radial_collection.o\
427-
radial_set.o\
428-
real_gaunt_table.o\
429-
two_center_bundle.o\
430-
two_center_integrator.o\
431-
two_center_table.o\
423+
beta_radials.o\
424+
sphbes_radials.o\
425+
numerical_radial.o\
426+
radial_collection.o\
427+
radial_set.o\
428+
real_gaunt_table.o\
429+
two_center_bundle.o\
430+
two_center_integrator.o\
431+
two_center_table.o\
432432
projgen.o\
433433

434434
OBJS_PSI=psi.o\
@@ -628,8 +628,8 @@ OBJS_LCAO=evolve_elec.o\
628628
boundary_fix.o\
629629
upsi.o\
630630
FORCE_STRESS.o\
631-
FORCE_gamma.o\
632-
FORCE_k.o\
631+
FORCE_gamma.o\
632+
FORCE_k.o\
633633
stress_tools.o\
634634
edm.o\
635635
pulay_fs_center2.o\
@@ -685,9 +685,9 @@ OBJS_PARALLEL=parallel_common.o\
685685

686686
OBJS_SRCPW=H_Ewald_pw.o\
687687
dnrm2.o\
688-
VL_in_pw.o\
689-
VNL_in_pw.o\
690-
VNL_grad_pw.o\
688+
vl_pw.o\
689+
vnl_pw.o\
690+
vnl_pw_grad.o\
691691
chgmixing.o\
692692
charge.o\
693693
charge_init.o\
@@ -728,17 +728,17 @@ OBJS_SRCPW=H_Ewald_pw.o\
728728
sto_func.o\
729729
sto_forces.o\
730730
sto_stress_pw.o\
731-
stress_func_cc.o\
732-
stress_func_ewa.o\
733-
stress_func_exx.o\
734-
stress_func_gga.o\
735-
stress_func_mgga.o\
736-
stress_func_har.o\
737-
stress_func_kin.o\
738-
stress_func_loc.o\
739-
stress_func_nl.o\
740-
stress_func_us.o\
741-
stress_func_onsite.o\
731+
stress_cc.o\
732+
stress_ewa.o\
733+
stress_exx.o\
734+
stress_gga.o\
735+
stress_mgga.o\
736+
stress_har.o\
737+
stress_kin.o\
738+
stress_loc.o\
739+
stress_nl.o\
740+
stress_us.o\
741+
stress_onsite.o\
742742
stress_pw.o\
743743
of_stress_pw.o\
744744
of_print_info.o\
@@ -753,7 +753,7 @@ OBJS_SRCPW=H_Ewald_pw.o\
753753
sto_dos.o\
754754
onsite_projector.o\
755755
onsite_proj_tools.o\
756-
VSep_in_pw.o
756+
vsep_pw.o
757757

758758
OBJS_VDW=vdw.o\
759759
vdwd2_parameters.o\

‎source/source_cell/test/klist_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "source_cell/setup_nonlocal.h"
1313
#include "source_cell/unitcell.h"
1414
#include "source_estate/magnetism.h"
15-
#include "source_pw/module_pwdft/VL_in_pw.h"
16-
#include "source_pw/module_pwdft/VNL_in_pw.h"
15+
#include "source_pw/module_pwdft/vl_pw.h"
16+
#include "source_pw/module_pwdft/vnl_pw.h"
1717
#include "source_pw/module_pwdft/parallel_grid.h"
1818
#include "source_io/berryphase.h"
1919
#include "source_io/module_parameter/parameter.h"

‎source/source_cell/test/klist_test_para.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "source_cell/setup_nonlocal.h"
2020
#include "source_cell/unitcell.h"
2121
#include "source_estate/magnetism.h"
22-
#include "source_pw/module_pwdft/VL_in_pw.h"
23-
#include "source_pw/module_pwdft/VNL_in_pw.h"
22+
#include "source_pw/module_pwdft/vl_pw.h"
23+
#include "source_pw/module_pwdft/vnl_pw.h"
2424
#include "source_pw/module_pwdft/parallel_grid.h"
2525
#include "source_io/berryphase.h"
2626
#undef private

‎source/source_esolver/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ add_library(
2929
esolver
3030
OBJECT
3131
${objects}
32-
../source_pw/module_pwdft/module_exx_helper/exx_helper.cpp
33-
../source_pw/module_pwdft/module_exx_helper/exx_helper.h
32+
../source_pw/module_pwdft/exx_helper.cpp
33+
../source_pw/module_pwdft/exx_helper.h
3434
)
3535

3636
if(ENABLE_COVERAGE)

‎source/source_esolver/esolver_fp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "source_estate/elecstate.h" // electronic states
1111
#include "source_estate/module_charge/charge_extra.h" // charge extrapolation
1212
#include "source_hamilt/module_surchem/surchem.h" // solvation model
13-
#include "source_pw/module_pwdft/VL_in_pw.h" // local pseudopotential
13+
#include "source_pw/module_pwdft/vl_pw.h" // local pseudopotential
1414
#include "source_pw/module_pwdft/structure_factor.h" // structure factor
1515

1616
#include <fstream>

‎source/source_esolver/esolver_ks_pw.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "source_lcao/module_deltaspin/spin_constrain.h"
1313
#include "source_pw/module_pwdft/onsite_projector.h"
1414
#include "source_lcao/module_dftu/dftu.h"
15-
#include "source_pw/module_pwdft/VSep_in_pw.h"
15+
#include "source_pw/module_pwdft/vsep_pw.h"
1616
#include "source_pw/module_pwdft/hamilt_pw.h"
1717

1818
#include "source_pw/module_pwdft/forces.h"

‎source/source_esolver/esolver_ks_pw.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#define ESOLVER_KS_PW_H
33
#include "./esolver_ks.h"
44
#include "source_psi/setup_psi_pw.h" // mohan add 20251012
5-
#include "source_pw/module_pwdft/VSep_in_pw.h"
6-
#include "source_pw/module_pwdft/module_exx_helper/exx_helper.h"
7-
#include "source_pw/module_pwdft/operator_pw/velocity_pw.h"
5+
#include "source_pw/module_pwdft/vsep_pw.h"
6+
#include "source_pw/module_pwdft/exx_helper.h"
7+
#include "source_pw/module_pwdft/op_pw_vel.h"
88

99
#include <memory>
1010
#include <source_base/macros.h>

‎source/source_estate/module_pot/pot_sep.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "pot_base.h"
55
#include "source_base/matrix.h"
6-
#include "source_pw/module_pwdft/VSep_in_pw.h"
6+
#include "source_pw/module_pwdft/vsep_pw.h"
77

88
namespace elecstate
99
{

‎source/source_estate/module_pot/potential_new.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "source_base/complexmatrix.h"
55
#include "source_hamilt/module_surchem/surchem.h"
6-
#include "source_pw/module_pwdft/VNL_in_pw.h"
7-
#include "source_pw/module_pwdft/VSep_in_pw.h"
6+
#include "source_pw/module_pwdft/vnl_pw.h"
7+
#include "source_pw/module_pwdft/vsep_pw.h"
88
#include "source_pw/module_pwdft/structure_factor.h"
99
#include "pot_base.h"
1010

‎source/source_estate/setup_estate_pw.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "source_cell/klist.h"
77
#include "source_pw/module_pwdft/structure_factor.h"
88
#include "source_estate/elecstate.h"
9-
#include "source_pw/module_pwdft/VL_in_pw.h"
10-
#include "source_pw/module_pwdft/VSep_in_pw.h"
9+
#include "source_pw/module_pwdft/vl_pw.h"
10+
#include "source_pw/module_pwdft/vsep_pw.h"
1111

1212
namespace elecstate
1313
{

0 commit comments

Comments
 (0)