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 67a6e207c731536e4e83d22d8e4e195f8be965dc..673025b7697dad412210da03097c2329f1b1cb78 100644 (file)
--- a/src/gromacs/gmxlib/gmx_omp_nthreads.c
+++ b/src/gromacs/gmxlib/gmx_omp_nthreads.c
@@ -379,7 +379,7 @@ void gmx_omp_nthreads_init(FILE *fplog, t_commrec *cr,
 #endif
 
     /* inform the user about the settings */
-    if (SIMMASTER(cr) && bOMP)
+    if (bOMP)
     {
 #ifdef GMX_THREAD_MPI
         const char *mpi_str="per tMPI thread";
@@ -390,15 +390,15 @@ void gmx_omp_nthreads_init(FILE *fplog, t_commrec *cr,
         /* for group scheme we print PME threads info only */
         if (bFullOmpSupport)
         {
-            fprintf(stderr, "Using %d OpenMP thread%s %s\n",
-                    modth.gnth,modth.gnth > 1 ? "s" : "",
-                    cr->nnodes > 1 ? mpi_str : "");
+            md_print_info(cr, fplog, "Using %d OpenMP thread%s %s\n",
+                          modth.gnth,modth.gnth > 1 ? "s" : "",
+                          cr->nnodes > 1 ? mpi_str : "");
         }
         if (bSepPME && modth.gnth_pme != modth.gnth)
         {
-            fprintf(stderr, "Using %d OpenMP thread%s %s for PME\n",
-                    modth.gnth_pme,modth.gnth_pme > 1 ? "s" : "",
-                    cr->nnodes > 1 ? mpi_str : "");
+            md_print_info(cr, fplog, "Using %d OpenMP thread%s %s for PME\n",
+                          modth.gnth_pme,modth.gnth_pme > 1 ? "s" : "",
+                          cr->nnodes > 1 ? mpi_str : "");
         }
     }