Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / tables / forcetable.cpp

diff --git a/src/gromacs/tables/forcetable.cpp b/src/gromacs/tables/forcetable.cpp
index 4742c58ea4a0e5c70164a3a507fc9b200f952864..cfd20340b9e391bdabf9fdc4e7d3d32a19a4a94c 100644 (file)
--- a/src/gromacs/tables/forcetable.cpp
+++ b/src/gromacs/tables/forcetable.cpp
@@ -1394,9 +1394,10 @@ t_forcetable *make_tables(FILE *out,
 
     for (int k = 0; (k < etiNR); k++)
     {
-        /* Now fill data for tables that should not be read (perhaps
-           overwriting data that was read but should not be used) */
-        if (!ETAB_USER(tabsel[k]))
+        /* Now fill data for tables that have not been read
+         * or add the Ewald long-range correction for Ewald user tables.
+         */
+        if (tabsel[k] != etabUSER)
         {
             real scale = table->scale;
             if (ic->useBuckingham &&