update tests

Author: sunliang98

source/module_pw/pw_distributeg_method2.cpp

@@ -51,14 +51,14 @@ void PW_Basis::distribution_method2()
         std::cout << "The first step done\n";
         std::cout << "tot_npw   " << tot_npw << '\n';
         std::cout << "this->nstot   " << this->nstot << '\n';
-        for (int ix = 0; ix < nx; ++ix)
-        {
-            for (int iy = 0; iy < ny; ++iy)
-            {
-                std::cout << st_length2D[ix * ny + iy] << std::setw(4);
-            }
-            std::cout << '\n';
-        }
+        // for (int ix = 0; ix < nx; ++ix)
+        // {
+        //     for (int iy = 0; iy < ny; ++iy)
+        //     {
+        //         std::cout << st_length2D[ix * ny + iy] << std::setw(4);
+        //     }
+        //     std::cout << '\n';
+        // }
         // ------------------------------------------------------------
 
         // (2) Devide the sticks to each core, sticks are in the order of ixy increasing.
@@ -67,7 +67,7 @@ void PW_Basis::distribution_method2()
         this->divide_sticks2();
         // for test ----------------------------------------------------------------------------
         std::cout << "nst_per  ";
-        for (int ip = 0; ip < this->poolnproc; ++ip) std::cout << nst_per[ip] << std::setw(4);
+        for (int ip = 0; ip < this->poolnproc; ++ip) std::cout << nst_per[ip] << std::setw(10);
         std::cout << "\n";
         //-------------------------------------------------------------------------------------- 
 
@@ -78,7 +78,7 @@ void PW_Basis::distribution_method2()
         this->create_maps(st_length2D, npw_per);
         // for test ----------------------------------------------------------------------------
         std::cout << "npw_per  ";
-        for (int ip = 0; ip < this->poolnproc; ++ip) std::cout << npw_per[ip] << std::setw(4);
+        for (int ip = 0; ip < this->poolnproc; ++ip) std::cout << npw_per[ip] << std::setw(10);
         std::cout << "\n";
         //-------------------------------------------------------------------------------------- 
 
@@ -137,7 +137,7 @@ void PW_Basis::distribution_method2()
     // for test ----------------------------------------------
     if (poolrank==0) std::cout << "The fifth step done\n";
     // -------------------------------------------------------
-    ModuleBase::timer::tick("PW_Basis", "distributeg_method1");
+    ModuleBase::timer::tick("PW_Basis", "distributeg_method2");
     return;
 }
 

source/module_pw/pw_transform.cpp

@@ -37,8 +37,8 @@ void PW_Basis:: real2recip(std::complex<double> * in, std::complex<double> * out
     {
         out[ig] = this->ft.aux1[this->ig2isz[ig]];
     }
-    return;
     ModuleBase::timer::tick("PW_Basis", "real2recip");
+    return;
 }
 
 //

source/module_pw/unittest/test_t1.cpp

@@ -52,7 +52,8 @@ int main(int argc,char **argv)
     //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,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,2);
     pwtest.setuptransform();
     pwtest.collect_local_pw();
 
@@ -71,8 +72,8 @@ int main(int argc,char **argv)
     complex<double> * rhog = new complex<double> [npw];
     for(int ig = 0 ; ig < npw ; ++ig)
     {
-        // rhog[ig] = 1.0/(pwtest.gg[ig]+1) + ModuleBase::IMAG_UNIT / (abs(pwtest.gdirect[ig].x+1) + 1);
-        rhog[ig] = 1.0/(pwtest.gg[ig]+1);
+        rhog[ig] = 1.0/(pwtest.gg[ig]+1) + ModuleBase::IMAG_UNIT / (abs(pwtest.gdirect[ig].x+1) + 1);
+        // rhog[ig] = 1.0/(pwtest.gg[ig]+1);
         //rhog[ig] = 1.0;
     }    
 
@@ -95,11 +96,12 @@ int main(int argc,char **argv)
     fftend = clock();
     double fftduration = (double)(fftend - fftstart)/CLOCKS_PER_SEC;
 
-    cout<<"\n";
-    cout<<"spend "<<fftduration<<"s\n";
-
-    if(rank_in_pool==0) ModuleBase::timer::finish(GlobalV::ofs_running, true);
-    
+    if(rank_in_pool==0) 
+    {
+        ModuleBase::timer::finish(GlobalV::ofs_running, true);
+        cout<<"\n";
+        cout<<"spend "<<fftduration<<"s\n";
+    }
     if(tmp!=NULL) delete []tmp; 
     // MPI_Barrier(MPI_COMM_WORLD);
     // ProfilerStop();

source/module_pw/unittest/test_t2.cpp

@@ -52,7 +52,8 @@ int main(int argc,char **argv)
     //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,1);
+    pwtest.initparameters(gamma_only,wfcecut,nproc_in_pool,rank_in_pool,2);
     pwtest.setuptransform();
     pwtest.collect_local_pw();
 
@@ -71,8 +72,8 @@ int main(int argc,char **argv)
     complex<double> * rhog = new complex<double> [npw];
     for(int ig = 0 ; ig < npw ; ++ig)
     {
-        // rhog[ig] = 1.0/(pwtest.gg[ig]+1) + ModuleBase::IMAG_UNIT / (abs(pwtest.gdirect[ig].x+1) + 1);
-        rhog[ig] = 1.0/(pwtest.gg[ig]+1);
+        rhog[ig] = 1.0/(pwtest.gg[ig]+1) + ModuleBase::IMAG_UNIT / (abs(pwtest.gdirect[ig].x+1) + 1);
+        // rhog[ig] = 1.0/(pwtest.gg[ig]+1);
         //rhog[ig] = 1.0;
     }    
 
@@ -95,10 +96,12 @@ int main(int argc,char **argv)
     fftend = clock();
     double fftduration = (double)(fftend - fftstart)/CLOCKS_PER_SEC;
 
-    cout<<"\n";
-    cout<<"spend "<<fftduration<<"s\n";
-   
-    if(rank_in_pool==0) ModuleBase::timer::finish(GlobalV::ofs_running, true);
+    if(rank_in_pool==0)
+    {
+        ModuleBase::timer::finish(GlobalV::ofs_running, true);
+        cout<<"\n";
+        cout<<"spend "<<fftduration<<"s\n";
+    }
 
     if(tmp!=NULL) delete []tmp; 
     // MPI_Barrier(MPI_COMM_WORLD);