Merge release-4-6 into master

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

diff --git a/src/gromacs/gmxlib/tpxio.c b/src/gromacs/gmxlib/tpxio.c
index d97a0680de098fbaa598bef40e1bfd45998b5d0b..a4ad9f0cbde4b8741ad25dc9855432d22f840427 100644 (file)
--- a/src/gromacs/gmxlib/tpxio.c
+++ b/src/gromacs/gmxlib/tpxio.c
@@ -376,6 +376,16 @@ static void do_fepvals(t_fileio *fio,t_lambda *fepvals,gmx_bool bRead, int file_
       {
           fepvals->separate_dvdl[efptFEP] = TRUE;
       }
+      /* still allocate the all_lambda array's contents. */
+      for (g=0;g<efptNR;g++)
+      {
+          if (fepvals->n_lambda > 0) {
+              if (bRead)
+              {
+                  snew(fepvals->all_lambda[g],fepvals->n_lambda);
+              }
+          }
+      }
   }
   else
   {