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

Change-Id: I4268a1ced2a874dc2844decf6c2853590230ad30

diff --combined src/gromacs/mdlib/tgroup.c
index 1baec82abd2d0075fe51910e871d8fb50f309b88,1c8da44681c34ab9949b52232d327c11ff34ee24..d0bd4f4568d0d87a7f13854ab4ef48b164474be3
--- 1/src/gromacs/mdlib/tgroup.c
--- 2/src/gromacs/mdlib/tgroup.c
+++ b/src/gromacs/mdlib/tgroup.c
@@@ -3,7 -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.
@@@ -35,21 -35,23 +35,21 @@@
   * the research papers on the package. Check out http://www.gromacs.org.
   */
  /* This file is completely threadsafe - keep it that way! */
 -#ifdef HAVE_CONFIG_H
 -#include <config.h>
 -#endif
 +#include "gmxpre.h"
  
 +#include "gromacs/legacyheaders/tgroup.h"
  
  #include <math.h>
 -#include "macros.h"
 -#include "main.h"
 +
 +#include "gromacs/legacyheaders/gmx_omp_nthreads.h"
 +#include "gromacs/legacyheaders/macros.h"
 +#include "gromacs/legacyheaders/network.h"
 +#include "gromacs/legacyheaders/rbin.h"
 +#include "gromacs/legacyheaders/update.h"
 +#include "gromacs/math/vec.h"
 +#include "gromacs/topology/mtop_util.h"
 +#include "gromacs/utility/futil.h"
  #include "gromacs/utility/smalloc.h"
 -#include "gromacs/fileio/futil.h"
 -#include "tgroup.h"
 -#include "vec.h"
 -#include "network.h"
 -#include "update.h"
 -#include "rbin.h"
 -#include "mtop_util.h"
 -#include "gmx_omp_nthreads.h"
  
  static void init_grptcstat(int ngtc, t_grp_tcstat tcstat[])
  {
@@@ -105,7 -107,7 +105,7 @@@ void init_ekindata(FILE gmx_unused *log
       * 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);