Merge branch release-5-1 into release-2016

[alexxy/gromacs.git] / src / gromacs / listed-forces / disre.cpp

diff --git a/src/gromacs/listed-forces/disre.cpp b/src/gromacs/listed-forces/disre.cpp
index 7ff3a31ecc67b16f976cb46daccab7e675f4f1e8..b591b1969a89e3a87686818ab52b2d9e252d4d47 100644 (file)
--- a/src/gromacs/listed-forces/disre.cpp
+++ b/src/gromacs/listed-forces/disre.cpp
@@ -152,7 +152,7 @@ void init_disres(FILE *fplog, const gmx_mtop_t *mtop,
             fprintf(fplog, "%s\n", notestr);
         }
 
-        if (dd->dr_tau != 0 || ir->eDisre == edrEnsemble || cr->ms != NULL ||
+        if (dd->dr_tau != 0 || ir->eDisre == edrEnsemble ||
             dd->nres != dd->npair)
         {
             gmx_fatal(FARGS, "Time or ensemble averaged or multiple pair distance restraints do not work (yet) with domain decomposition, use a single MPI rank%s", cr->ms ? " per simulation" : "");