modify default number of processes to 4

Author: hongriTianqi

source/src_parallel/test/parallel_global_test.cpp

@@ -21,25 +21,21 @@
 
 TEST(ParaGlobal,SplitGrid)
 {
-	// NPROC is set to 6 in parallel_global_test.sh
-	if(GlobalV::NPROC==6)
+	// NPROC is set to 4 in parallel_global_test.sh
+	if(GlobalV::NPROC==4)
 	{
 		Parallel_Global::split_grid_world(2);
-		EXPECT_EQ(GlobalV::GSIZE,3);
+		EXPECT_EQ(GlobalV::GSIZE,2);
 		if(GlobalV::MY_RANK==0) EXPECT_EQ(GlobalV::GRANK,0);
 		if(GlobalV::MY_RANK==1) EXPECT_EQ(GlobalV::GRANK,1);
-		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::GRANK,2);
-		if(GlobalV::MY_RANK==3) EXPECT_EQ(GlobalV::GRANK,0);
-		if(GlobalV::MY_RANK==4) EXPECT_EQ(GlobalV::GRANK,1);
-		if(GlobalV::MY_RANK==5) EXPECT_EQ(GlobalV::GRANK,2);
-		Parallel_Global::split_grid_world(6);
+		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::GRANK,0);
+		if(GlobalV::MY_RANK==3) EXPECT_EQ(GlobalV::GRANK,1);
+		Parallel_Global::split_grid_world(4);
 		EXPECT_EQ(GlobalV::GSIZE,1);
 		if(GlobalV::MY_RANK==0) EXPECT_EQ(GlobalV::GRANK,0);
 		if(GlobalV::MY_RANK==1) EXPECT_EQ(GlobalV::GRANK,0);
 		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::GRANK,0);
 		if(GlobalV::MY_RANK==3) EXPECT_EQ(GlobalV::GRANK,0);
-		if(GlobalV::MY_RANK==4) EXPECT_EQ(GlobalV::GRANK,0);
-		if(GlobalV::MY_RANK==5) EXPECT_EQ(GlobalV::GRANK,0);
 	}
 	else
 	{
@@ -53,25 +49,21 @@ TEST(ParaGlobal,SplitGrid)
 
 TEST(ParaGlobal,SplitDiag)
 {
-	// NPROC is set to 6 in parallel_global_test.sh
-	if(GlobalV::NPROC==6)
+	// NPROC is set to 4 in parallel_global_test.sh
+	if(GlobalV::NPROC==4)
 	{
 		Parallel_Global::split_diag_world(2);
 		EXPECT_EQ(GlobalV::DSIZE,2);
 		if(GlobalV::MY_RANK==0) EXPECT_EQ(GlobalV::DRANK,0);
 		if(GlobalV::MY_RANK==1) EXPECT_EQ(GlobalV::DRANK,0);
-		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::DRANK,0);
+		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::DRANK,1);
 		if(GlobalV::MY_RANK==3) EXPECT_EQ(GlobalV::DRANK,1);
-		if(GlobalV::MY_RANK==4) EXPECT_EQ(GlobalV::DRANK,1);
-		if(GlobalV::MY_RANK==5) EXPECT_EQ(GlobalV::DRANK,1);
-		Parallel_Global::split_diag_world(6);
-		EXPECT_EQ(GlobalV::DSIZE,6);
+		Parallel_Global::split_diag_world(4);
+		EXPECT_EQ(GlobalV::DSIZE,4);
 		if(GlobalV::MY_RANK==0) EXPECT_EQ(GlobalV::DRANK,0);
 		if(GlobalV::MY_RANK==1) EXPECT_EQ(GlobalV::DRANK,1);
 		if(GlobalV::MY_RANK==2) EXPECT_EQ(GlobalV::DRANK,2);
 		if(GlobalV::MY_RANK==3) EXPECT_EQ(GlobalV::DRANK,3);
-		if(GlobalV::MY_RANK==4) EXPECT_EQ(GlobalV::DRANK,4);
-		if(GlobalV::MY_RANK==5) EXPECT_EQ(GlobalV::DRANK,5);
 	}
 	else
 	{

source/src_parallel/test/parallel_global_test.sh

@@ -3,7 +3,7 @@
 np=`cat /proc/cpuinfo | grep "cpu cores" | uniq| awk '{print $NF}'`
 echo "nprocs in this machine is $np"
 
-for i in 6;do
+for i in 4;do
     if [[ $i -gt $np ]];then
         continue
     fi

source/src_parallel/test/parallel_kpoints_test.cpp

@@ -18,7 +18,7 @@
  *      to call another three functions: get_nks_pool(), 
  *      get_startk_pool(), get_whichpool(), which divide all kpoints
  *      into KPAR groups.
- * The default number of processes is set to 6 in parallel_kpoints_test.sh. 
+ * The default number of processes is set to 4 in parallel_kpoints_test.sh. 
  * One may modify it to do more tests, or adapt this unittest to local 
  * environment.
  */

source/src_parallel/test/parallel_kpoints_test.sh

@@ -3,7 +3,7 @@
 np=`cat /proc/cpuinfo | grep "cpu cores" | uniq| awk '{print $NF}'`
 echo "nprocs in this machine is $np"
 
-for i in 6;do
+for i in 4;do
     if [[ $i -gt $np ]];then
         continue
     fi