Skip to content

Commit a5dea9d

Browse files
authored
Update get_wf codes and output formats (#6154)
* delete some useless integrate tests (in my opinions, we are wasting time to test these tests) to accelerate CICD efficiency * update get_wf for gamma_only, rename the output files name * change get_wf integreat tests to spin=2 case for multi-k algorithm in LCA * update get_wf_lcao outputs * update CASES_CPU.txt * update 212 and 312 integreate tests about get_wf, refactor the output formats of get_wf * update catch_properties * delete useless sum_xxx codes in integrate/tools * update clean.sh * update integrate tests * change back general_info * update get_pchg and get_wf * fix get_wf_lcao
1 parent 8a08196 commit a5dea9d

Some content is hidden

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

46 files changed

+408
-474
lines changed

source/module_cell/klist.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,12 +1413,6 @@ void K_Vectors::set_after_vc(const int& nspin_in,
14131413
ModuleBase::Matrix3 RT = latvec.Transpose();
14141414
for (int i = 0; i < nks; i++)
14151415
{
1416-
// std::cout << " ik=" << i
1417-
// << " kvec.x=" << kvec_c[i].x
1418-
// << " kvec.y=" << kvec_c[i].y
1419-
// << " kvec.z=" << kvec_c[i].z << std::endl;
1420-
// wrong! kvec_d[i] = RT * kvec_c[i];
1421-
// mohan fixed bug 2011-03-07
14221416
kvec_d[i] = kvec_c[i] * RT;
14231417
}
14241418
kd_done = true;

source/module_esolver/lcao_others.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,10 @@ void ESolver_KS_LCAO<TK, TR>::others(UnitCell& ucell, const int istep)
345345
else if (cal_type == "get_wf")
346346
{
347347
std::cout << FmtCore::format("\n * * * * * *\n << Start %s.\n", "getting wave function");
348-
IState_Envelope wavefunc(this->pelec);
348+
Get_wf_lcao get_wf(this->pelec);
349349
if (PARAM.globalv.gamma_only_local)
350350
{
351-
wavefunc.begin(ucell,
351+
get_wf.begin(ucell,
352352
this->psi,
353353
this->pw_rhod,
354354
this->pw_wfc,
@@ -370,7 +370,7 @@ void ESolver_KS_LCAO<TK, TR>::others(UnitCell& ucell, const int istep)
370370
}
371371
else
372372
{
373-
wavefunc.begin(ucell,
373+
get_wf.begin(ucell,
374374
this->psi,
375375
this->pw_rhod,
376376
this->pw_wfc,

source/module_io/get_pchg_pw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void get_pchg_pw(const std::vector<int>& bands_to_print,
4646
// Check if length of bands_to_print is valid
4747
if (static_cast<int>(bands_to_print.size()) > nbands)
4848
{
49-
ModuleBase::WARNING_QUIT("ESolver_KS_PW::get_pchg_pw",
49+
ModuleBase::WARNING_QUIT("ModuleIO::get_pchg_pw",
5050
"The number of bands specified by `bands_to_print` in the "
5151
"INPUT file exceeds `nbands`!");
5252
}
@@ -56,7 +56,7 @@ void get_pchg_pw(const std::vector<int>& bands_to_print,
5656
{
5757
if (value != 0 && value != 1)
5858
{
59-
ModuleBase::WARNING_QUIT("ESolver_KS_PW::get_pchg_pw",
59+
ModuleBase::WARNING_QUIT("ModuleIO::get_pchg_pw",
6060
"The elements of `bands_to_print` must be either 0 or 1. "
6161
"Invalid values found!");
6262
}

0 commit comments

Comments
 (0)