Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / gmx_omp_nthreads.c

diff --git a/src/gromacs/gmxlib/gmx_omp_nthreads.c b/src/gromacs/gmxlib/gmx_omp_nthreads.c
index 8be120d79df9068f3a1114eb6f2115cc472c1729..67a6e207c731536e4e83d22d8e4e195f8be965dc 100644 (file)
--- a/src/gromacs/gmxlib/gmx_omp_nthreads.c
+++ b/src/gromacs/gmxlib/gmx_omp_nthreads.c
@@ -233,8 +233,8 @@ void gmx_omp_nthreads_init(FILE *fplog, t_commrec *cr,
     bOMP = FALSE;
 #endif /* GMX_OPENMP */
 
-    /* number of processes per node */
-    nppn = cr->nnodes_intra;
+    /* number of MPI processes/threads per physical node */
+    nppn = cr->nrank_intranode;
 
     bSepPME = ( (cr->duty & DUTY_PP) && !(cr->duty & DUTY_PME)) ||
               (!(cr->duty & DUTY_PP) &&  (cr->duty & DUTY_PME));
@@ -404,7 +404,7 @@ void gmx_omp_nthreads_init(FILE *fplog, t_commrec *cr,
 
     /* detect and warn about oversubscription
      * TODO: enable this for separate PME nodes as well! */
-    if (!bSepPME && cr->nodeid_intra == 0)
+    if (!bSepPME && cr->rank_pp_intranode == 0)
     {
         char sbuf[STRLEN], sbuf1[STRLEN], sbuf2[STRLEN];