*
* Copyright (c) 1991-2000, University of Groningen, The Netherlands.
* Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014, by the GROMACS development team, led by
* Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
* and including many others, as listed in the AUTHORS file in the
* top-level source directory and at http://www.gromacs.org.
* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
#include <signal.h>
#include <stdlib.h>
-#include "typedefs.h"
+
+#include "gromacs/legacyheaders/typedefs.h"
static int div_nsteps(int nsteps, int nst)
{
nchars += 5; /* alchemical state */
}
- if (ir->fepvals->bPrintEnergy)
+ if (ir->fepvals->edHdLPrintEnergy != edHdLPrintEnergyNO)
{
nchars += 12; /* energy for dhdl */
}
{
ndh_tot += 1;
}
- if (ir->fepvals->bPrintEnergy)
+ if (ir->fepvals->edHdLPrintEnergy != edHdLPrintEnergyNO)
{
ndh_tot += 1;
}