@@ -253,9 +253,9 @@ void Parallel_Global::init_pools(const int& NPROC,
253253 const int & MY_RANK,
254254 const int & BNDPAR,
255255 const int & KPAR,
256- int & NPROC_IN_STOGROUP ,
256+ int & NPROC_IN_BNDGROUP ,
257257 int & RANK_IN_BPGROUP,
258- int & MY_STOGROUP ,
258+ int & MY_BNDGROUP ,
259259 int & NPROC_IN_POOL,
260260 int & RANK_IN_POOL,
261261 int & MY_POOL)
@@ -268,9 +268,9 @@ void Parallel_Global::init_pools(const int& NPROC,
268268 MY_RANK,
269269 BNDPAR,
270270 KPAR,
271- NPROC_IN_STOGROUP ,
271+ NPROC_IN_BNDGROUP ,
272272 RANK_IN_BPGROUP,
273- MY_STOGROUP ,
273+ MY_BNDGROUP ,
274274 NPROC_IN_POOL,
275275 RANK_IN_POOL,
276276 MY_POOL);
@@ -316,16 +316,16 @@ void Parallel_Global::divide_pools(const int& NPROC,
316316 const int & MY_RANK,
317317 const int & BNDPAR,
318318 const int & KPAR,
319- int & NPROC_IN_STOGROUP ,
319+ int & NPROC_IN_BNDGROUP ,
320320 int & RANK_IN_BPGROUP,
321- int & MY_STOGROUP ,
321+ int & MY_BNDGROUP ,
322322 int & NPROC_IN_POOL,
323323 int & RANK_IN_POOL,
324324 int & MY_POOL)
325325{
326326 // note: the order of k-point parallelization and band parallelization is important
327327 // The order will not change the behavior of INTER_POOL or PARAPW_WORLD, and MY_POOL
328- // and MY_STOGROUP will be the same as well.
328+ // and MY_BNDGROUP will be the same as well.
329329 if (BNDPAR > 1 && NPROC %(BNDPAR * KPAR) != 0 )
330330 {
331331 std::cout << " Error: When BNDPAR = " << BNDPAR << " > 1, number of processes (" << NPROC << " ) must be divisible by the number of groups ("
@@ -358,17 +358,17 @@ void Parallel_Global::divide_pools(const int& NPROC,
358358
359359 if (BNDPAR > 1 )
360360 {
361- NPROC_IN_STOGROUP = kpar_group.ngroups * bndpar_group.nprocs_in_group ;
361+ NPROC_IN_BNDGROUP = kpar_group.ngroups * bndpar_group.nprocs_in_group ;
362362 RANK_IN_BPGROUP = kpar_group.my_group * bndpar_group.nprocs_in_group + bndpar_group.rank_in_group ;
363- MY_STOGROUP = bndpar_group.my_group ;
364- MPI_Comm_split (MPI_COMM_WORLD, MY_STOGROUP , RANK_IN_BPGROUP, &STO_WORLD);
363+ MY_BNDGROUP = bndpar_group.my_group ;
364+ MPI_Comm_split (MPI_COMM_WORLD, MY_BNDGROUP , RANK_IN_BPGROUP, &STO_WORLD);
365365 MPI_Comm_dup (bndpar_group.inter_comm , &PARAPW_WORLD);
366366 }
367367 else
368368 {
369- NPROC_IN_STOGROUP = NPROC;
369+ NPROC_IN_BNDGROUP = NPROC;
370370 RANK_IN_BPGROUP = MY_RANK;
371- MY_STOGROUP = 0 ;
371+ MY_BNDGROUP = 0 ;
372372 MPI_Comm_dup (MPI_COMM_WORLD, &STO_WORLD);
373373 MPI_Comm_split (MPI_COMM_WORLD, MY_RANK, 0 , &PARAPW_WORLD);
374374 }
0 commit comments