Merge branch release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / forcerec.c

diff --git a/src/gromacs/mdlib/forcerec.c b/src/gromacs/mdlib/forcerec.c
index 6d0c97c46679eb03b7f45dcbe252249474e08448..2a1ff5bcd15c74bce7548a83fd362642aa0990e0 100644 (file)
--- a/src/gromacs/mdlib/forcerec.c
+++ b/src/gromacs/mdlib/forcerec.c
@@ -2049,9 +2049,7 @@ void init_forcerec(FILE              *fp,
          * In mdrun, hwinfo has already been set before calling init_forcerec.
          * Here we ignore GPUs, as tools will not use them anyhow.
          */
-        snew(fr->hwinfo, 1);
-        gmx_detect_hardware(fp, fr->hwinfo, cr,
-                            FALSE, FALSE, NULL);
+        fr->hwinfo = gmx_detect_hardware(fp, cr, FALSE, FALSE, NULL);
     }
 
     /* By default we turn acceleration on, but it might be turned off further down... */
@@ -2216,7 +2214,7 @@ void init_forcerec(FILE              *fp,
      * group kernels are OK. See Redmine #1249. */
     if (fr->bAllvsAll)
     {
-        fr->bAllvsAll = FALSE;
+        fr->bAllvsAll            = FALSE;
         fr->use_cpu_acceleration = FALSE;
         if (fp != NULL)
         {