Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxlib/ewald_util.c b/src/gromacs/gmxlib/ewald_util.c
index b1e0223b0b1955f5105a7f666296fe663fec432f..e1480f46b5168899670cb848104bf4afcfa33b51 100644 (file)
--- a/src/gromacs/gmxlib/ewald_util.c
+++ b/src/gromacs/gmxlib/ewald_util.c
@@ -226,7 +226,7 @@ void ewald_LRcorrection(int start, int end,
     {
         clear_mat(dxdf_lj);
     }
-    if ((calc_excl_corr || dipole_coeff != 0 || EVDW_PME(fr->vdwtype)) && !bFreeEnergy)
+    if ((calc_excl_corr || dipole_coeff != 0) && !bFreeEnergy)
     {
         for (i = start; (i < end); i++)
         {
@@ -387,7 +387,7 @@ void ewald_LRcorrection(int start, int end,
             }
         }
     }
-    else if (calc_excl_corr || dipole_coeff != 0 || EVDW_PME(fr->vdwtype))
+    else if (calc_excl_corr || dipole_coeff != 0)
     {
         for (i = start; (i < end); i++)
         {