Remove unnecessary config.h includes

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

diff --git a/src/gromacs/mdlib/perf_est.c b/src/gromacs/mdlib/perf_est.c
index d74148f047c7472aa51bce03a86b33143932d46a..29010b067ad9b6315ad3bced7cf112e26dd7892d 100644 (file)
--- a/src/gromacs/mdlib/perf_est.c
+++ b/src/gromacs/mdlib/perf_est.c
@@ -34,20 +34,19 @@
  * 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 <math.h>
 
-#include "perf_est.h"
 #include "gromacs/math/vec.h"
-#include "mtop_util.h"
-#include "types/commrec.h"
+#include "gromacs/topology/topology.h"
+#include "gromacs/utility/fatalerror.h"
+
+#include "gromacs/legacyheaders/perf_est.h"
+#include "gromacs/legacyheaders/types/commrec.h"
 #include "nbnxn_search.h"
 #include "nbnxn_consts.h"
 
-
 /* Computational cost of bonded, non-bonded and PME calculations.
  * This will be machine dependent.
  * The numbers here are accurate for Intel Core2 and AMD Athlon 64
@@ -100,6 +99,9 @@ int n_bonded_dx(gmx_mtop_t *mtop, gmx_bool bExcl)
      */
     ndx      = 0;
     ndx_excl = 0;
+#if __ICC == 1400 || __ICL == 1400
+#pragma novector /* Work-around for incorrect vectorization */
+#endif
     for (mb = 0; mb < mtop->nmolblock; mb++)
     {
         molt = &mtop->moltype[mtop->molblock[mb].type];