Skip to content

Commit

Permalink
rebase develop and fix nks
Browse files Browse the repository at this point in the history
  • Loading branch information
maki49 committed May 31, 2024
1 parent 15c38e9 commit 848b43e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions source/module_hamilt_lcao/hamilt_lcaodft/foverlap_k.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ void Force_LCAO<std::complex<double>>::cal_foverlap(const bool isforce,
ModuleBase::timer::tick("Force_LCAO_k", "cal_edm_2d");

ModuleBase::matrix wgEkb;
wgEkb.create(kv->nks, GlobalV::NBANDS);
ModuleBase::Memory::record("Force::wgEkb", sizeof(double) * kv->nks * GlobalV::NBANDS);
wgEkb.create(kv->get_nks(), GlobalV::NBANDS);
ModuleBase::Memory::record("Force::wgEkb", sizeof(double) * kv->get_nks() * GlobalV::NBANDS);
#ifdef _OPENMP
#pragma omp parallel for collapse(2) schedule(static, 1024)
#endif
for (int ik = 0; ik < kv->nks; ik++)
for (int ik = 0; ik < kv->get_nks(); ik++)
{
for (int ib = 0; ib < GlobalV::NBANDS; ib++)
{
wgEkb(ik, ib) = pelec->wg(ik, ib) * pelec->ekb(ik, ib);
}
}
std::vector<ModuleBase::ComplexMatrix> edm_k(kv->nks);
std::vector<ModuleBase::ComplexMatrix> edm_k(kv->get_nks());

// use the original formula (Hamiltonian matrix) to calculate energy density matrix
if (DM->EDMK.size())
{
#ifdef _OPENMP
#pragma omp parallel for schedule(static, 1024)
#endif
for (int ik = 0; ik < kv->nks; ++ik)
for (int ik = 0; ik < kv->get_nks(); ++ik)
{
//edm_k[ik] = loc.edm_k_tddft[ik];
EDM.set_DMK_pointer(ik,DM->EDMK[ik].c);
Expand Down

0 comments on commit 848b43e

Please sign in to comment.