Merge release-4-6 into master

[alexxy/gromacs.git] / src / programs / mdrun / runner.c

diff --git a/src/programs/mdrun/runner.c b/src/programs/mdrun/runner.c
index a11bd54a4e0a51649d279b0442248b833a37a7c6..ed32d5f0995fbda6da65a30184111fa539b1aa15 100644 (file)
--- a/src/programs/mdrun/runner.c
+++ b/src/programs/mdrun/runner.c
@@ -1312,7 +1312,10 @@ int mdrunner(gmx_hw_opt_t *hw_opt,
     }
 
 #ifdef GMX_FAHCORE
-    fcRegisterSteps(inputrec->nsteps, inputrec->init_step);
+    if (MASTER(cr))
+    {
+        fcRegisterSteps(inputrec->nsteps, inputrec->init_step);
+    }
 #endif
 
     /* NMR restraints must be initialized before load_checkpoint,