Skip to content

Commit f8e85bd

Browse files
committed
resolve confilct
1 parent 9e5acd8 commit f8e85bd

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

source/source_lcao/module_gint/gint_old.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ void Gint::transfer_DM2DtoGrid(std::vector<hamilt::HContainer<double>*> DM2D) {
269269
Parallel_Orbitals pv{};
270270
pv.set(mg, ng, nb, blacs_ctxt);
271271
pv.set_atomic_trace(iat2iwt.data(), ucell->nat, mg);
272-
auto ijr_info = DM2D[0]->get_ijr_info();
273272
this-> dm2d_tmp = new hamilt::HContainer<double>(&pv, nullptr, &ijr_info);
274273
#else
275274
if (this->dm2d_tmp != nullptr) {

source/source_lcao/module_gint/temp_gint/gint_common.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ void transfer_dm_2d_to_gint(
237237
Parallel_Orbitals pv{};
238238
pv.set(mg, ng, nb, blacs_ctxt);
239239
pv.set_atomic_trace(iat2iwt.data(), ucell->nat, mg);
240-
auto ijr_info = dm[0]->get_ijr_info();
241240
HContainer<T> dm2d_tmp(&pv, nullptr, &ijr_info);
242241
#else
243242
auto* dm2d_tmp = new hamilt::HContainer<T>(ucell->nat);

0 commit comments

Comments
 (0)