Merge branch release-5-0 into release-5-1

Change-Id: I4268a1ced2a874dc2844decf6c2853590230ad30

diff --git a/src/gromacs/mdlib/tgroup.c b/src/gromacs/mdlib/tgroup.c
index 1baec82abd2d0075fe51910e871d8fb50f309b88..d0bd4f4568d0d87a7f13854ab4ef48b164474be3 100644 (file)
--- a/src/gromacs/mdlib/tgroup.c
+++ b/src/gromacs/mdlib/tgroup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2016, 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.
@@ -105,7 +105,7 @@ void init_ekindata(FILE gmx_unused *log, gmx_mtop_t *mtop, t_grpopts *opts,
      * Turn this on when we have multiple acceleration groups
      * or one accelerated group.
      */
-    ekind->bNEMD = (opts->ngacc > 1 || norm(opts->acc[0]) > 0);
+    ekind->bNEMD = (opts->ngacc > 1 || norm2(opts->acc[0]) > 0);
 
     ekind->ngtc = opts->ngtc;
     snew(ekind->tcstat, opts->ngtc);