Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / domdec.c

diff --git a/src/gromacs/mdlib/domdec.c b/src/gromacs/mdlib/domdec.c
index e6095ebf549d90cdc485eb92f2870dc9926e43ed..e834fec52d3ab4136d37729a7eb85b5f8f240a52 100644 (file)
--- a/src/gromacs/mdlib/domdec.c
+++ b/src/gromacs/mdlib/domdec.c
@@ -5328,7 +5328,7 @@ static void print_dd_load_av(FILE *fplog,gmx_domdec_t *dd)
         if (lossf >= DD_PERF_LOSS)
         {
             sprintf(buf,
-                    "NOTE: %.1f %% performance was lost due to load imbalance\n"
+                    "NOTE: %.1f %% of the available CPU time was lost due to load imbalance\n"
                     "      in the domain decomposition.\n",lossf*100);
             if (!comm->bDynLoadBal)
             {
@@ -9334,7 +9334,7 @@ void dd_partition_system(FILE            *fplog,
                               comm->zones.dens_zone0,
                               fr->cginfo,
                               state_local->x,
-                              ncg_moved,comm->moved,
+                              ncg_moved,bRedist ? comm->moved : NULL,
                               fr->nbv->grp[eintLocal].kernel_type,
                               fr->nbv->grp[eintLocal].nbat);