Skip to content

Commit e41207b

Browse files
QianruipkuQianruipku
committed
fix compile
1 parent c5dc8ce commit e41207b

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎source/module_base/test_parallel/parallel_global_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class MPIContext
5555
int rank_in_pool;
5656

5757
int nstogroup;
58-
int my_stogroup;
58+
int MY_BNDGROUP;
5959
int rank_in_stogroup;
6060
int nproc_in_stogroup;
6161

@@ -173,7 +173,7 @@ TEST_F(ParaGlobal, InitPools)
173173
mpi.kpar,
174174
mpi.nproc_in_stogroup,
175175
mpi.rank_in_stogroup,
176-
mpi.my_stogroup,
176+
mpi.MY_BNDGROUP,
177177
mpi.nproc_in_pool,
178178
mpi.rank_in_pool,
179179
mpi.my_pool), ::testing::ExitedWithCode(1), "");

‎source/module_cell/cal_atoms_info.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CalAtomsInfo
7070
elecstate::cal_nbands(para.inp.nelec, para.sys.nlocal, nelec_spin, para.input.nbands);
7171
// calculate the number of nbands_local
7272
para.sys.nbands_l = para.inp.nbands;
73-
if (inp.ks_solver == "bpcg") // only bpcg support band parallel
73+
if (para.inp.ks_solver == "bpcg") // only bpcg support band parallel
7474
{
7575
para.sys.nbands_l = para.inp.nbands / para.inp.bndpar;
7676
if (GlobalV::RANK_IN_BPGROUP < para.inp.nbands % para.inp.bndpar)

‎source/module_cell/test/klist_test_para.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ TEST_F(KlistParaTest, Set)
231231
GlobalV::KPAR,
232232
GlobalV::NPROC_IN_BNDGROUP,
233233
GlobalV::RANK_IN_BPGROUP,
234-
GlobalV::MY_STOGROUP,
234+
GlobalV::MY_BNDGROUP,
235235
GlobalV::NPROC_IN_POOL,
236236
GlobalV::RANK_IN_POOL,
237237
GlobalV::MY_POOL);
@@ -288,7 +288,7 @@ TEST_F(KlistParaTest, SetAfterVC)
288288
GlobalV::KPAR,
289289
GlobalV::NPROC_IN_BNDGROUP,
290290
GlobalV::RANK_IN_BPGROUP,
291-
GlobalV::MY_STOGROUP,
291+
GlobalV::MY_BNDGROUP,
292292
GlobalV::NPROC_IN_POOL,
293293
GlobalV::RANK_IN_POOL,
294294
GlobalV::MY_POOL);

‎source/module_elecstate/test_mpi/charge_mpi_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TEST_F(ChargeMpiTest, reduce_diff_pools1)
7272
GlobalV::KPAR,
7373
GlobalV::NPROC_IN_BNDGROUP,
7474
GlobalV::RANK_IN_BPGROUP,
75-
GlobalV::MY_STOGROUP,
75+
GlobalV::MY_BNDGROUP,
7676
GlobalV::NPROC_IN_POOL,
7777
GlobalV::RANK_IN_POOL,
7878
GlobalV::MY_POOL);
@@ -118,7 +118,7 @@ TEST_F(ChargeMpiTest, reduce_diff_pools2)
118118
GlobalV::KPAR,
119119
GlobalV::NPROC_IN_BNDGROUP,
120120
GlobalV::RANK_IN_BPGROUP,
121-
GlobalV::MY_STOGROUP,
121+
GlobalV::MY_BNDGROUP,
122122
GlobalV::NPROC_IN_POOL,
123123
GlobalV::RANK_IN_POOL,
124124
GlobalV::MY_POOL);
@@ -173,7 +173,7 @@ TEST_F(ChargeMpiTest, rho_mpi)
173173
GlobalV::KPAR,
174174
GlobalV::NPROC_IN_BNDGROUP,
175175
GlobalV::RANK_IN_BPGROUP,
176-
GlobalV::MY_STOGROUP,
176+
GlobalV::MY_BNDGROUP,
177177
GlobalV::NPROC_IN_POOL,
178178
GlobalV::RANK_IN_POOL,
179179
GlobalV::MY_POOL);

‎source/module_hsolver/test/test_hsolver_sdft.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class TestHSolverPW_SDFT : public ::testing::Test
252252
// stowf.nchip_max = 0;
253253
// psi_test_cd.resize(1, 2, 3);
254254
// PARAM.input.nelec = 1.0;
255-
// GlobalV::MY_STOGROUP = 0.0;
255+
// GlobalV::MY_BNDGROUP = 0.0;
256256
// int istep = 0;
257257
// int iter = 0;
258258

@@ -291,7 +291,7 @@ class TestHSolverPW_SDFT : public ::testing::Test
291291
// psi_test_no.nbands = 0;
292292
// psi_test_no.nbasis = 0;
293293
// PARAM.input.nelec = 1.0;
294-
// GlobalV::MY_STOGROUP = 0.0;
294+
// GlobalV::MY_BNDGROUP = 0.0;
295295
// PARAM.input.nspin = 1;
296296
// elecstate_test.charge = new Charge;
297297
// elecstate_test.charge->rho = new double*[1];

‎source/module_io/test/read_wfc_to_rho_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ int main(int argc, char** argv)
286286
GlobalV::KPAR,
287287
GlobalV::NPROC_IN_BNDGROUP,
288288
GlobalV::RANK_IN_BPGROUP,
289-
GlobalV::MY_STOGROUP,
289+
GlobalV::MY_BNDGROUP,
290290
GlobalV::NPROC_IN_POOL,
291291
GlobalV::RANK_IN_POOL,
292292
GlobalV::MY_POOL);

‎source/module_io/test/write_istate_info_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TEST_F(IstateInfoTest, OutIstateInfoS1)
5555
GlobalV::KPAR,
5656
GlobalV::NPROC_IN_BNDGROUP,
5757
GlobalV::RANK_IN_BPGROUP,
58-
GlobalV::MY_STOGROUP,
58+
GlobalV::MY_BNDGROUP,
5959
GlobalV::NPROC_IN_POOL,
6060
GlobalV::RANK_IN_POOL,
6161
GlobalV::MY_POOL);
@@ -105,7 +105,7 @@ TEST_F(IstateInfoTest, OutIstateInfoS2)
105105
GlobalV::KPAR,
106106
GlobalV::NPROC_IN_BNDGROUP,
107107
GlobalV::RANK_IN_BPGROUP,
108-
GlobalV::MY_STOGROUP,
108+
GlobalV::MY_BNDGROUP,
109109
GlobalV::NPROC_IN_POOL,
110110
GlobalV::RANK_IN_POOL,
111111
GlobalV::MY_POOL);

‎source/module_io/test_serial/io_system_variable_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST_F(InputTest, Item_test)
4444

4545
{
4646
param.input.suffix = "test";
47-
readinput.set_globalv(param);
47+
readinput.set_globalv(param.inp, param.sys);
4848
EXPECT_EQ(param.sys.global_out_dir, "OUT.test/");
4949
EXPECT_EQ(param.sys.global_stru_dir, "OUT.test/STRU/");
5050
EXPECT_EQ(param.sys.global_matrix_dir, "OUT.test/matrix/");
@@ -53,25 +53,25 @@ TEST_F(InputTest, Item_test)
5353
param.input.gamma_only = true;
5454
param.input.esolver_type = "tddft";
5555
param.input.nspin = 2;
56-
readinput.set_globalv(param);
56+
readinput.set_globalv(param.inp, param.sys);
5757
EXPECT_EQ(param.sys.gamma_only_local, 0);
5858

5959
param.input.deepks_scf = true;
6060
param.input.deepks_out_labels = true;
61-
readinput.set_globalv(param);
61+
readinput.set_globalv(param.inp, param.sys);
6262
EXPECT_EQ(param.sys.deepks_setorb, 1);
6363

6464
param.input.nspin = 4;
6565
param.input.noncolin = true;
66-
readinput.set_globalv(param);
66+
readinput.set_globalv(param.inp, param.sys);
6767
EXPECT_EQ(param.sys.domag, 1);
6868
EXPECT_EQ(param.sys.domag_z, 0);
6969
EXPECT_EQ(param.sys.npol, 2);
7070

7171
param.input.nspin = 1;
7272
param.input.lspinorb = true;
7373
param.input.noncolin = false;
74-
readinput.set_globalv(param);
74+
readinput.set_globalv(param.inp, param.sys);
7575
EXPECT_EQ(param.sys.domag, 0);
7676
EXPECT_EQ(param.sys.domag_z, 0);
7777
EXPECT_EQ(param.sys.npol, 1);

‎source/module_psi/psi_init.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void PSIInit<T, Device>::prepare_init(const int& random_seed)
4040
// use new instead, but will cause asymmetric allocation and deallocation, in literal aspect
4141
ModuleBase::timer::tick("PSIInit", "prepare_init");
4242
this->psi_initer.reset();
43-
if (this->init_wfc == "random" || (PARAM.ks_solver == "bpcg" && PARAM.inp.bndpar > 1))
43+
if (this->init_wfc == "random" || (PARAM.inp.ks_solver == "bpcg" && PARAM.inp.bndpar > 1))
4444
{ //temporary solution for band parallel bpcg
4545
this->psi_initer = std::unique_ptr<psi_initializer<T>>(new psi_initializer_random<T>());
4646
}

0 commit comments

Comments
 (0)