change nthreads variables to PARAM.globalv.nthread_per_proc

Author: QuantumMisaka

source/module_base/global_variable.cpp

@@ -17,7 +17,6 @@ namespace GlobalV
 //----------------------------------------------------------
 
 int NPROC = 1; ///< global number of process
-int NTHREAD_PER_PROC = 1; ///< global number of thread per process
 int KPAR = 1;  ///< global number of pools
 int KPAR_LCAO = 1; ///< global number of pools for LCAO diagonalization only
 int MY_RANK = 0; ///< global index of process

source/module_base/global_variable.h

@@ -17,7 +17,6 @@ namespace GlobalV
 // EXPLAIN : Parallel information
 // GLOBAL VARIABLES :
 // NAME : NPROC( global number of process )
-// NAME : NTHREAD_PER_PROC ( global number of threads per process )
 // NAME : KPAR( global number of pools )
 // NAME : MY_RANK( global index of process )
 // NAME : MY_POOL( global index of pool (count in pool))
@@ -32,7 +31,6 @@ namespace GlobalV
 // NAME : KPAR_LCAO ( global number of pools for LCAO diagonalization only)
 //========================================================================
 extern int NPROC;
-extern int NTHREAD_PER_PROC;
 extern int KPAR;
 extern int MY_RANK;
 extern int MY_POOL;

source/module_base/parallel_global.cpp

@@ -2,7 +2,7 @@
 // AUTHOR : fangwei, mohan
 // DATE : 2009-11-08
 //==========================================================
-#include "parallel_global.h"
+// #include "parallel_global.h"
 
 #ifdef __MPI
 #include <mpi.h>
@@ -14,6 +14,7 @@
 #include "module_base/global_function.h"
 #include "module_base/parallel_common.h"
 #include "module_base/parallel_reduce.h"
+#include "module_parameter/parameter.h"
 #include "version.h"
 
 #include <iostream>
@@ -139,7 +140,7 @@ void Parallel_Global::read_mpi_parameters(int argc, char** argv, int& NPROC, int
 #endif
     mpi_number = process_num;
     omp_number = current_thread_num;
-    GlobalV::NTHREAD_PER_PROC = current_thread_num;
+    PARAM.globalv.nthread_per_proc = current_thread_num;
     if (current_thread_num * process_num > max_thread_num && local_rank == 0)
     {
         std::stringstream mess;

source/module_io/print_info.cpp

@@ -91,7 +91,7 @@ void setup_parameters(UnitCell& ucell, K_Vectors& kv)
 		}
 
 		std::cout << std::setw(12) << GlobalV::NPROC
-		     << std::setw(12) << GlobalV::NTHREAD_PER_PROC * GlobalV::NPROC;
+		     << std::setw(12) << PARAM.globalv.nthread_per_proc * GlobalV::NPROC;
 		if (orbinfo) { std::cout << std::setw(12) << PARAM.globalv.nlocal; }
 
 		std::cout << std::endl;

source/module_parameter/system_parameter.h

@@ -10,6 +10,7 @@ struct System_para
     // ---------------------------------------------------------------
     int myrank = 0;
     int nproc = 1;
+    int nthread_per_proc = 1;
     int mypool = 0;
     int npool = 1;
     int nproc_in_pool = 1;