Merge pull request #517 from hyschive/pr-omp-threads

Switch to PBS_NP for determining OMP threads

Author: hyschive

src/Init/Init_ResetParameter.cpp

@@ -30,27 +30,25 @@ void Init_ResetParameter()
 #  ifdef OPENMP
    if ( OMP_NTHREAD <= 0 )
    {
-      int  NCPU_Node, NNode_PBS, NNode_SLURM;
+      int  NCPU_PBS, NNode_SLURM;
       FILE *fp;
 
 //    determine if the PBS/SLURM software is used
-      fp = popen( "echo ${PBS_NUM_NODES:-0}", "r" );
-      fscanf( fp, "%d", &NNode_PBS );
+      fp = popen( "echo ${PBS_NP:-0}", "r" );
+      fscanf( fp, "%d", &NCPU_PBS );
 
       fp = popen( "echo ${SLURM_JOB_NUM_NODES:-0}", "r" );
       fscanf( fp, "%d", &NNode_SLURM );
 
 //    set up the number of OpenMP threads
-      if ( NNode_PBS ) // PBS system
+      if ( NCPU_PBS ) // PBS system
       {
-         fp = popen( "echo $PBS_NUM_PPN", "r" );
-         fscanf( fp, "%d", &NCPU_Node );
-
-         OMP_NTHREAD = NCPU_Node * NNode_PBS / MPI_NRank;
+         OMP_NTHREAD = NCPU_PBS / MPI_NRank;
       }
 
       else if ( NNode_SLURM ) // SLURM system
       {
+         int NCPU_Node;
          fp = popen( "echo $SLURM_CPUS_ON_NODE", "r" );
          fscanf( fp, "%d", &NCPU_Node );