Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / mvdata.c

diff --git a/src/gromacs/gmxlib/mvdata.c b/src/gromacs/gmxlib/mvdata.c
index 80e3b2bd1b97ae1b90024312a308b150e1d5adfa..dcbcc03491060029c4b5e1c152d72276b88c9ae8 100644 (file)
--- a/src/gromacs/gmxlib/mvdata.c
+++ b/src/gromacs/gmxlib/mvdata.c
@@ -562,12 +562,15 @@ static void bc_fepvals(const t_commrec *cr, t_lambda *fep)
     block_bc(cr, fep->delta_lambda);
     block_bc(cr, fep->bPrintEnergy);
     block_bc(cr, fep->n_lambda);
-    snew_bc(cr, fep->all_lambda, efptNR);
-    nblock_bc(cr, efptNR, fep->all_lambda);
-    for (i = 0; i < efptNR; i++)
+    if (fep->n_lambda > 0)
     {
-        snew_bc(cr, fep->all_lambda[i], fep->n_lambda);
-        nblock_bc(cr, fep->n_lambda, fep->all_lambda[i]);
+        snew_bc(cr, fep->all_lambda, efptNR);
+        nblock_bc(cr, efptNR, fep->all_lambda);
+        for (i = 0; i < efptNR; i++)
+        {
+            snew_bc(cr, fep->all_lambda[i], fep->n_lambda);
+            nblock_bc(cr, fep->n_lambda, fep->all_lambda[i]);
+        }
     }
     block_bc(cr, fep->sc_alpha);
     block_bc(cr, fep->sc_power);