test : modify google test

scope : test*.cpp utest.h utest.cpp

Author: Qianruipku

source/module_pw/pw_basis.h

@@ -10,14 +10,14 @@
 namespace ModulePW
 {
 
-//
-//A class which can convert a function of "r" to the corresponding linear 
-// superposition of plane waves (real space to reciprocal space)
-// or convert a linear superposition of plane waves to the function 
-// of "r" (reciprocal to real).
-//plane waves: <r|g>=1/sqrt(V) * exp(igr)
-// f(r) = 1/sqrt(V) * \sum_g{c(g)*exp(igr)}
-//
+///
+/// A class which can convert a function of "r" to the corresponding linear 
+/// superposition of plane waves (real space to reciprocal space)
+/// or convert a linear superposition of plane waves to the function 
+/// of "r" (reciprocal to real).
+/// plane waves: <r|g>=1/sqrt(V) * exp(igr)
+/// f(r) = 1/sqrt(V) * \sum_g{c(g)*exp(igr)}
+///
 class PW_Basis
 {
 

source/module_pw/pw_basis_k.h

@@ -5,11 +5,11 @@
 namespace ModulePW
 {
 
-//
-//Special pw_basis class.
-//It includes different k-points
-//plane waves: <r|g,k>=1/sqrt(V) * exp(i(k+g)r)
-//
+///
+/// Special pw_basis class.
+/// It includes different k-points
+/// plane waves: <r|g,k>=1/sqrt(V) * exp(i(k+g)r)
+///
 class PW_Basis_K : public PW_Basis
 {
 

source/module_pw/unittest/Makefile renamed to source/module_pw/test/Makefile

@@ -1,36 +1,27 @@
 #include "../pw_basis.h"
-#include "../../src_parallel/parallel_global.h"
 #ifdef __MPI
 #include "test_tool.h"
+#include "../../src_parallel/parallel_global.h"
 #include "mpi.h"
 #endif
-#include "../../module_base/timer.h"
 #include "../../module_base/global_function.h"
+#include "gtest/gtest.h"
+extern int nproc_in_pool,rank_in_pool;
 
-int main(int argc,char **argv)
+TEST(PWTEST,test1_1)
 {
+    //--------------------------------------------------
     ModuleBase::Matrix3 latvec(1,0,0,0,1,0,0,0,1);
     bool gamma_only = true;
     double ecut = 100;
     double lat0 = 1;
-    int nproc, myrank;
-    int nproc_in_pool, npool, mypool, rank_in_pool;
-    npool = 1;
-#ifdef __MPI
-    setupmpi(argc,argv,nproc, myrank);
-    divide_pools(nproc, myrank, nproc_in_pool, npool, mypool, rank_in_pool);
-#else
-    nproc = nproc_in_pool = npool = 1;
-    myrank = mypool = rank_in_pool = 0;
-#endif
-
-    ModuleBase::timer::start();
-
     int distribution_type = 1;
+    //--------------------------------------------------
+
     ModulePW::PW_Basis pwtest;
 
     pwtest.initgrids(lat0, latvec, ecut);
-    pwtest.initparameters(gamma_only, ecut, nproc, rank_in_pool, distribution_type);
+    pwtest.initparameters(gamma_only, ecut, nproc_in_pool, rank_in_pool, distribution_type);
     pwtest.distribute_r();
     pwtest.distribute_g();
 
@@ -41,6 +32,7 @@ int main(int argc,char **argv)
 #else
     tot_npw = pwtest.npw;
 #endif
+
     for (int ip = 0; ip < nproc; ip++)
     {
 #ifdef __MPI
@@ -95,10 +87,4 @@ int main(int argc,char **argv)
             std::cout << "\n";
         }
     }
-    if(rank_in_pool==0) ModuleBase::timer::finish(GlobalV::ofs_running, true);
-#ifdef __MPI
-    finishmpi();
-#endif
-
-    return 0;
 }

source/module_pw/unittest/Makefile.gnu renamed to source/module_pw/test/Makefile.gnu

@@ -9,13 +9,12 @@
 #endif
 #include "../../module_base/constants.h"
 #include "../../module_base/global_function.h"
-#include <iomanip>
-#include "gtest/gtest.h"
-extern int nproc_in_pool,rank_in_pool;
+#include "utest.h"
 
 using namespace std;
-TEST(PWTEST,test1_2)
+TEST_F(PWTEST,test1_2)
 {
+    cout<<"dividemthd 1, gamma_only: off, double precision"<<endl;
     ModulePW::PW_Basis pwtest;
     ModuleBase::Matrix3 latvec;
     int nx,ny,nz;  //f*G
@@ -28,12 +27,13 @@ TEST(PWTEST,test1_2)
     latvec = la;
     wfcecut = 10;
     gamma_only = false;
+    int distribution_type = 1;
     //--------------------------------------------------
 
     //init
     pwtest.initgrids(lat0,latvec,wfcecut);
     //pwtest.initgrids(lat0,latvec,5,7,7);
-    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,distribution_type);
     pwtest.setuptransform();
     pwtest.collect_local_pw();
 

source/module_pw/unittest/Makefile.intel renamed to source/module_pw/test/Makefile.intel

@@ -9,13 +9,12 @@
 #endif
 #include "../../module_base/constants.h"
 #include "../../module_base/global_function.h"
-#include <iomanip>
-#include "gtest/gtest.h"
-extern int nproc_in_pool,rank_in_pool;
+#include "utest.h"
 
 using namespace std;
-TEST(PWTEST,test1_2f)
+TEST_F(PWTEST,test1_2f)
 {
+    cout<<"dividemthd 1, gamma_only: off, float precision"<<endl;
     ModulePW::PW_Basis pwtest;
     ModuleBase::Matrix3 latvec;
     int nx,ny,nz;  //f*G
@@ -28,12 +27,13 @@ TEST(PWTEST,test1_2f)
     latvec = la;
     wfcecut = 10;
     gamma_only = false;
+    int distribution_type = 1;
     //--------------------------------------------------
 
     //init
     pwtest.initgrids(lat0,latvec,wfcecut);
     //pwtest.initgrids(lat0,latvec,5,7,7);
-    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,distribution_type);
     pwtest.setuptransform();
     pwtest.collect_local_pw();
 

source/module_pw/unittest/test1-1.cpp renamed to source/module_pw/test/test1-1.cpp

@@ -9,13 +9,12 @@
 #endif
 #include "../../module_base/constants.h"
 #include "../../module_base/global_function.h"
-#include <iomanip>
-#include "gtest/gtest.h"
-extern int nproc_in_pool,rank_in_pool;
+#include "utest.h"
 
 using namespace std;
-TEST(PWTEST,test1_3)
+TEST_F(PWTEST,test1_3)
 {
+    cout<<"dividemthd 1, gamma_only: on, double precision"<<endl;
     ModulePW::PW_Basis pwtest;
     ModuleBase::Matrix3 latvec;
     int nx,ny,nz;  //f*G
@@ -28,12 +27,13 @@ TEST(PWTEST,test1_3)
     latvec = la;
     wfcecut = 20;
     gamma_only = true;
+    int distribution_type = 1;
     //--------------------------------------------------
 
     //init
     pwtest.initgrids(lat0,latvec,1.5*wfcecut);
     //pwtest.initgrids(lat0,latvec,5,7,7);
-    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,distribution_type);
     pwtest.setuptransform();
     pwtest.collect_local_pw();
 

source/module_pw/unittest/test1-2.cpp renamed to source/module_pw/test/test1-2.cpp

@@ -9,13 +9,12 @@
 #endif
 #include "../../module_base/constants.h"
 #include "../../module_base/global_function.h"
-#include <iomanip>
-#include "gtest/gtest.h"
-extern int nproc_in_pool,rank_in_pool;
+#include "utest.h"
 
 using namespace std;
-TEST(PWTEST,test1_3f)
+TEST_F(PWTEST,test1_3f)
 {
+    cout<<"dividemthd 1, gamma_only: on, float precision"<<endl;
     ModulePW::PW_Basis pwtest;
     ModuleBase::Matrix3 latvec;
     int nx,ny,nz;  //f*G
@@ -28,12 +27,13 @@ TEST(PWTEST,test1_3f)
     latvec = la;
     wfcecut = 20;
     gamma_only = true;
+    int distribution_type = 1;
     //--------------------------------------------------
 
     //init
     pwtest.initgrids(lat0,latvec,1.5*wfcecut);
     //pwtest.initgrids(lat0,latvec,5,7,7);
-    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,distribution_type);
     pwtest.setuptransform();
     pwtest.collect_local_pw();