Merge remote-tracking branch 'gerrit/release-4-6'

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

diff --git a/src/gromacs/mdlib/tpi.c b/src/gromacs/mdlib/tpi.c
index 96d56632d36a924edc9b997a3c1e04c9204b5534..9e0fe967c6ab7f1d7662c939925ce4b5f9ff1a8b 100644 (file)
--- a/src/gromacs/mdlib/tpi.c
+++ b/src/gromacs/mdlib/tpi.c
@@ -79,12 +79,8 @@
 #include "pme.h"
 #include "gbutil.h"
 
-#if ( defined(GMX_IA32_SSE) || defined(GMX_X86_64_SSE) || defined(GMX_X86_64_SSE2) )
-#if defined(GMX_DOUBLE)
-#include "gmx_sse2_double.h"
-#else
-#include "gmx_sse2_single.h"
-#endif
+#ifdef GMX_X86_SSE2
+#include "gmx_x86_sse2.h"
 #endif
 
 
@@ -397,7 +393,7 @@ double do_tpi(FILE *fplog,t_commrec *cr,
 
   refvolshift = log(det(rerun_fr.box));
 
-#if ( defined(GMX_IA32_SSE) || defined(GMX_X86_64_SSE) || defined(GMX_X86_64_SSE2) )
+#ifdef GMX_X86_SSE2
     /* Make sure we don't detect SSE overflow generated before this point */
     gmx_mm_check_and_reset_overflow();
 #endif
@@ -589,7 +585,7 @@ double do_tpi(FILE *fplog,t_commrec *cr,
 
                 epot = enerd->term[F_EPOT];
                 bEnergyOutOfBounds = FALSE;
-#if ( defined(GMX_IA32_SSE) || defined(GMX_X86_64_SSE) || defined(GMX_X86_64_SSE2) )
+#ifdef GMX_X86_SSE2
                 /* With SSE the energy can overflow, check for this */
                 if (gmx_mm_check_and_reset_overflow())
                 {