Remove unnecessary config.h includes

[alexxy/gromacs.git] / src / gromacs / gmxlib / inputrec.c

diff --git a/src/gromacs/gmxlib/inputrec.c b/src/gromacs/gmxlib/inputrec.c
index 74e186cc4011e0a0c96ada8bd581d6e67ba3425e..d55f8e4ed57b6d045db20f9052a9dfd18f9e4bb0 100644 (file)
--- a/src/gromacs/gmxlib/inputrec.c
+++ b/src/gromacs/gmxlib/inputrec.c
@@ -34,15 +34,12 @@
  * 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 "typedefs.h"
-#include "macros.h"
-#include "inputrec.h"
-#include "gmx_fatal.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/inputrec.h"
+#include "gromacs/utility/fatalerror.h"
 
 
 /* The minimum number of integration steps required for reasonably accurate
@@ -203,12 +200,14 @@ gmx_bool ir_coulomb_switched(const t_inputrec *ir)
             ir->coulombtype == eelENCADSHIFT ||
             ir->coulombtype == eelPMESWITCH ||
             ir->coulombtype == eelPMEUSERSWITCH ||
-            ir->coulomb_modifier == eintmodPOTSWITCH);
+            ir->coulomb_modifier == eintmodPOTSWITCH ||
+            ir->coulomb_modifier == eintmodFORCESWITCH);
 }
 
 gmx_bool ir_coulomb_is_zero_at_cutoff(const t_inputrec *ir)
 {
-    return (ir_coulomb_switched(ir) || ir->coulomb_modifier != eintmodNONE ||
+    return (ir->cutoff_scheme == ecutsVERLET ||
+            ir_coulomb_switched(ir) || ir->coulomb_modifier != eintmodNONE ||
             ir->coulombtype == eelRF_ZERO);
 }
 
@@ -222,12 +221,14 @@ gmx_bool ir_vdw_switched(const t_inputrec *ir)
     return (ir->vdwtype == evdwSWITCH ||
             ir->vdwtype == evdwSHIFT ||
             ir->vdwtype == evdwENCADSHIFT ||
-            ir->vdw_modifier == eintmodPOTSWITCH);
+            ir->vdw_modifier == eintmodPOTSWITCH ||
+            ir->vdw_modifier == eintmodFORCESWITCH);
 }
 
 gmx_bool ir_vdw_is_zero_at_cutoff(const t_inputrec *ir)
 {
-    return (ir_vdw_switched(ir) || ir->vdw_modifier != eintmodNONE);
+    return (ir->cutoff_scheme == ecutsVERLET ||
+            ir_vdw_switched(ir) || ir->vdw_modifier != eintmodNONE);
 }
 
 gmx_bool ir_vdw_might_be_zero_at_cutoff(const t_inputrec *ir)