Skip to content

Commit 6ec2919

Browse files
dzzz2001mohanchen
andauthored
Refactor: replace pvpr with hcontainer (#5490)
* replace pvpr in gint_k with hcontainer * replace pvpr with hcontainer in gpu code of gint_vl * replace pvpr with hcontainer in cal_dh * delete some unused function and variables * small change * fix mpi compiling error * Update some comment of base_matrix.h * fix an error * small fix --------- Co-authored-by: Mohan Chen <[email protected]>
1 parent 376f28e commit 6ec2919

24 files changed

+619
-1395
lines changed

source/Makefile.Objects

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@ OBJS_LCAO=evolve_elec.o\
582582
LCAO_set_fs.o\
583583
LCAO_set_st.o\
584584
LCAO_nl_mu.o\
585-
LCAO_nnr.o\
586585
LCAO_set_zero.o\
587586
LCAO_allocate.o\
588587
LCAO_set_mat2d.o\

source/module_esolver/set_matrix_grid.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ void ESolver_KS_LCAO<TK, TR>::set_matrix_grid(Record_adj& ra)
6868
this->pw_rho->nplane,
6969
this->pw_rho->startz_current,
7070
GlobalC::ucell,
71+
GlobalC::GridD,
7172
dr_uniform,
7273
rcuts,
7374
psi_u,
@@ -85,14 +86,7 @@ void ESolver_KS_LCAO<TK, TR>::set_matrix_grid(Record_adj& ra)
8586
// and allocate the space for H(R) and S(R).
8687
// If k point is used here, allocate HlocR after atom_arrange.
8788
ra.for_2d(this->pv, PARAM.globalv.gamma_only_local, orb_.cutoffs());
88-
89-
if (!PARAM.globalv.gamma_only_local)
90-
{
91-
// need to first calculae lgd.
92-
// using GridT.init.
93-
this->GridT.cal_nnrg(&this->pv, orb_.cutoffs());
94-
}
95-
89+
9690
ModuleBase::timer::tick("ESolver_KS_LCAO", "set_matrix_grid");
9791
return;
9892
}

source/module_hamilt_lcao/hamilt_lcaodft/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ if(ENABLE_LCAO)
2727
spar_hsr.cpp
2828
spar_st.cpp
2929
spar_u.cpp
30-
LCAO_nnr.cpp
3130
LCAO_set_fs.cpp
3231
LCAO_set_st.cpp
3332
LCAO_nl_mu.cpp

source/module_hamilt_lcao/hamilt_lcaodft/LCAO_nnr.cpp

Lines changed: 0 additions & 293 deletions
This file was deleted.

source/module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ HamiltLCAO<TK, TR>::HamiltLCAO(Gint_Gamma* GG_in,
255255
// reset spin index and real space Hamiltonian matrix
256256
int start_spin = -1;
257257
GK_in->reset_spin(start_spin);
258-
GK_in->destroy_pvpR();
259-
GK_in->allocate_pvpR();
260258
}
261259
}
262260

0 commit comments

Comments
 (0)