Merge branch 'master' of git.gromacs.org:gromacs

diff --git a/src/tools/gmx_pme_error.c b/src/tools/gmx_pme_error.c
index d2baf690a6317ded07125f293864c7a86a0a7544..c0396989d6c7eda030075d16e0acaaa66fe15ff8 100644 (file)
--- a/src/tools/gmx_pme_error.c
+++ b/src/tools/gmx_pme_error.c
@@ -1080,7 +1080,8 @@ int gmx_pme_error(int argc,char *argv[])
     cr = init_par(&argc,&argv);
     
 #ifdef GMX_MPI
-    MPI_Barrier(MPI_COMM_WORLD);
+    if (PAR(cr))
+        MPI_Barrier(MPI_COMM_WORLD);
 #endif
 
     if (MASTER(cr))