fix bug

Author: Qianruipku

source/module_base/parallel_comm.cpp

@@ -4,7 +4,7 @@
 #include "parallel_global.h"
 
 MPI_Comm POOL_WORLD;
-MPI_Comm INTER_POOL = MPI_COMM_NULL; // communicator among different pools
+MPI_Comm INTER_POOL; // communicator among different pools
 MPI_Comm STO_WORLD;
 MPI_Comm PARAPW_WORLD;
 MPI_Comm GRID_WORLD; // mohan add 2012-01-13

source/module_base/parallel_global.cpp

@@ -328,7 +328,7 @@ void Parallel_Global::divide_pools(const int& NPROC,
     //       and MY_STOGROUP will be the same as well.
     if(BNDPAR > 1 && NPROC %(BNDPAR * KPAR) != 0)
     {
-        std::cout << "Error: When " << BNDPAR << " > 1, number of processes (" << NPROC << ") must be divisible by the number of groups ("
+        std::cout << "Error: When BNDPAR = " << BNDPAR << " > 1, number of processes (" << NPROC << ") must be divisible by the number of groups ("
                   << BNDPAR * KPAR << ")." << std::endl;
         exit(1);
     }
@@ -351,6 +351,10 @@ void Parallel_Global::divide_pools(const int& NPROC,
     {
         MPI_Comm_dup(kpar_group.inter_comm, &INTER_POOL);
     }
+    else
+    {
+        INTER_POOL = MPI_COMM_NULL;
+    }
 
     if(BNDPAR > 1)
     {

source/module_base/test_parallel/parallel_global_test.cpp

@@ -4,6 +4,7 @@
 #include "mpi.h"
 
 #include "gtest/gtest.h"
+#include "gmock/gmock.h"
 #include <complex>
 #include <cstring>
 #include <string>
@@ -165,8 +166,8 @@ TEST_F(ParaGlobal, InitPools)
     mpi.kpar = 3;
     mpi.nstogroup = 3;
     my_rank = 5;
-
-    Parallel_Global::init_pools(nproc,
+    testing::internal::CaptureStdout();
+    EXPECT_EXIT(Parallel_Global::init_pools(nproc,
                                 my_rank,
                                 mpi.nstogroup,
                                 mpi.kpar,
@@ -175,45 +176,11 @@ TEST_F(ParaGlobal, InitPools)
                                 mpi.my_stogroup,
                                 mpi.nproc_in_pool,
                                 mpi.rank_in_pool,
-                                mpi.my_pool);
-    EXPECT_EQ(mpi.nproc_in_stogroup, 4);
-    EXPECT_EQ(mpi.my_stogroup, 1);
-    EXPECT_EQ(mpi.rank_in_stogroup, 1);
-    EXPECT_EQ(mpi.my_pool, 0);
-    EXPECT_EQ(mpi.rank_in_pool, 1);
-    EXPECT_EQ(mpi.nproc_in_pool, 2);
-    EXPECT_EQ(MPI_COMM_WORLD != STO_WORLD, true);
-    EXPECT_EQ(STO_WORLD != POOL_WORLD, true);
-    EXPECT_EQ(MPI_COMM_WORLD != PARAPW_WORLD, true);
+                                mpi.my_pool), ::testing::ExitedWithCode(1), "");
+    std::string output = testing::internal::GetCapturedStdout();
+    EXPECT_THAT(output, testing::HasSubstr("Error:"));
 }
 
-TEST_F(ParaGlobal, DividePools)
-{
-    nproc = 12;
-    mpi.kpar = 3;
-    mpi.nstogroup = 3;
-    this->my_rank = 5;
-
-    Parallel_Global::divide_pools(nproc,
-                                  this->my_rank,
-                                  mpi.nstogroup,
-                                  mpi.kpar,
-                                  mpi.nproc_in_stogroup,
-                                  mpi.rank_in_stogroup,
-                                  mpi.my_stogroup,
-                                  mpi.nproc_in_pool,
-                                  mpi.rank_in_pool,
-                                  mpi.my_pool);
-    EXPECT_EQ(mpi.nproc_in_stogroup, 4);
-    EXPECT_EQ(mpi.my_stogroup, 1);
-    EXPECT_EQ(mpi.rank_in_stogroup, 1);
-    EXPECT_EQ(mpi.my_pool, 0);
-    EXPECT_EQ(mpi.rank_in_pool, 1);
-    EXPECT_EQ(mpi.nproc_in_pool, 2);
-    EXPECT_EQ(MPI_COMM_WORLD != STO_WORLD, true);
-    EXPECT_EQ(STO_WORLD != POOL_WORLD, true);
-    EXPECT_EQ(MPI_COMM_WORLD != PARAPW_WORLD, true);
-}
 
 TEST_F(ParaGlobal, DivideMPIPools)
 {

source/module_elecstate/test_mpi/charge_mpi_test.cpp

@@ -66,7 +66,7 @@ TEST_F(ChargeMpiTest, reduce_diff_pools1)
     if (GlobalV::NPROC >= 2 && GlobalV::NPROC % 2 == 0)
     {
         GlobalV::KPAR = 2;
-        Parallel_Global::divide_pools(GlobalV::NPROC,
+        Parallel_Global::init_pools(GlobalV::NPROC,
                                       GlobalV::MY_RANK,
                                       PARAM.input.bndpar,
                                       GlobalV::KPAR,