Skip to content

Commit 3d057a7

Browse files
committed
update the ucell in set func
1 parent 61bdb5b commit 3d057a7

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

source/module_cell/klist.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ void K_Vectors::set(const ModuleSymmetry::Symmetry& symm,
6464
const int& nspin_in,
6565
const ModuleBase::Matrix3& reciprocal_vec,
6666
const ModuleBase::Matrix3& latvec,
67+
const UnitCell& ucell,
6768
std::ofstream& ofs)
6869
{
6970
ModuleBase::TITLE("K_Vectors", "set");
@@ -113,7 +114,7 @@ void K_Vectors::set(const ModuleSymmetry::Symmetry& symm,
113114
{
114115
bool match = true;
115116
// calculate kpoints in IBZ and reduce kpoints according to symmetry
116-
this->ibz_kpoint(symm, ModuleSymmetry::Symmetry::symm_flag, skpt1, GlobalC::ucell, match);
117+
this->ibz_kpoint(symm, ModuleSymmetry::Symmetry::symm_flag, skpt1, ucell, match);
117118
#ifdef __MPI
118119
Parallel_Common::bcast_bool(match);
119120
#endif
@@ -128,7 +129,7 @@ void K_Vectors::set(const ModuleSymmetry::Symmetry& symm,
128129
std::cout << "Automatically set symmetry to 0 and continue ..." << std::endl;
129130
ModuleSymmetry::Symmetry::symm_flag = 0;
130131
match = true;
131-
this->ibz_kpoint(symm, ModuleSymmetry::Symmetry::symm_flag, skpt1, GlobalC::ucell, match);
132+
this->ibz_kpoint(symm, ModuleSymmetry::Symmetry::symm_flag, skpt1, ucell, match);
132133
} else {
133134
ModuleBase::WARNING_QUIT("K_Vectors::ibz_kpoint",
134135
"Possible solutions: \n \

source/module_cell/klist.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class K_Vectors
5555
const int& nspin,
5656
const ModuleBase::Matrix3& reciprocal_vec,
5757
const ModuleBase::Matrix3& latvec,
58+
const UnitCell& ucell,
5859
std::ofstream& ofs);
5960

6061
/**

source/module_cell/test/klist_test_para.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ TEST_F(KlistParaTest, Set)
235235
GlobalV::RANK_IN_POOL,
236236
GlobalV::MY_POOL);
237237
ModuleSymmetry::Symmetry::symm_flag = 1;
238-
kv->set(symm, k_file, kv->nspin, GlobalC::ucell.G, GlobalC::ucell.latvec, GlobalV::ofs_running);
238+
kv->set(symm, k_file, kv->nspin, GlobalC::ucell.G, GlobalC::ucell.latvec, GlobalC::ucell, GlobalV::ofs_running);
239239
EXPECT_EQ(kv->get_nkstot(), 35);
240240
EXPECT_TRUE(kv->kc_done);
241241
EXPECT_TRUE(kv->kd_done);
@@ -292,7 +292,7 @@ TEST_F(KlistParaTest, SetAfterVC)
292292
GlobalV::RANK_IN_POOL,
293293
GlobalV::MY_POOL);
294294
ModuleSymmetry::Symmetry::symm_flag = 1;
295-
kv->set(symm, k_file, kv->nspin, GlobalC::ucell.G, GlobalC::ucell.latvec, GlobalV::ofs_running);
295+
kv->set(symm, k_file, kv->nspin, GlobalC::ucell.G, GlobalC::ucell.latvec, GlobalC::ucell,GlobalV::ofs_running);
296296
EXPECT_EQ(kv->get_nkstot(), 35);
297297
EXPECT_TRUE(kv->kc_done);
298298
EXPECT_TRUE(kv->kd_done);

source/module_esolver/esolver_gets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void ESolver_GetS::before_all_runners(UnitCell& ucell, const Input_para& inp)
3838
}
3939

4040
// 1.3) Setup k-points according to symmetry.
41-
this->kv.set(ucell.symm, inp.kpoint_file, inp.nspin, ucell.G, ucell.latvec, GlobalV::ofs_running);
41+
this->kv.set(ucell.symm, inp.kpoint_file, inp.nspin, ucell.G, ucell.latvec, ucell,GlobalV::ofs_running);
4242
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "INIT K-POINTS");
4343

4444
ModuleIO::setup_parameters(ucell, this->kv);

source/module_esolver/esolver_ks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void ESolver_KS<T, Device>::before_all_runners(UnitCell& ucell, const Input_para
209209
}
210210

211211
//! 6) Setup the k points according to symmetry.
212-
this->kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec, GlobalV::ofs_running);
212+
this->kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec,ucell, GlobalV::ofs_running);
213213

214214
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "INIT K-POINTS");
215215

source/module_esolver/esolver_of.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void ESolver_OF::before_all_runners(UnitCell& ucell, const Input_para& inp)
8989
}
9090

9191
// Setup the k points according to symmetry.
92-
kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec, GlobalV::ofs_running);
92+
kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec,ucell, GlobalV::ofs_running);
9393
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "INIT K-POINTS");
9494

9595
// print information

source/module_lr/esolver_lrtd_lcao.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ LR::ESolver_LR<T, TR>::ESolver_LR(const Input_para& inp, UnitCell& ucell) : inpu
258258
GlobalC::ucell.symm.analy_sys(ucell.lat, ucell.st, ucell.atoms, GlobalV::ofs_running);
259259
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "SYMMETRY");
260260
}
261-
this->kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec, GlobalV::ofs_running);
261+
this->kv.set(ucell.symm, PARAM.inp.kpoint_file, PARAM.inp.nspin, ucell.G, ucell.latvec, ucell,GlobalV::ofs_running);
262262
ModuleBase::GlobalFunc::DONE(GlobalV::ofs_running, "INIT K-POINTS");
263263
ModuleIO::setup_parameters(ucell, this->kv);
264264

0 commit comments

Comments
 (0)