Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / legacyheaders / types / nb_verlet.h

diff --git a/src/gromacs/legacyheaders/types/nb_verlet.h b/src/gromacs/legacyheaders/types/nb_verlet.h
index d36896975478b3311529ee531edce924ad5a51aa..4bf927b9088659637e83d94cb9f44c6478db641d 100644 (file)
--- a/src/gromacs/legacyheaders/types/nb_verlet.h
+++ b/src/gromacs/legacyheaders/types/nb_verlet.h
@@ -51,6 +51,8 @@ enum { nbkNotSet = 0,
        nbk8x8x8_CUDA,
        nbk8x8x8_PlainC };
 
+enum { ewaldexclTable, ewaldexclAnalytical };
+
 /* Atom locality indicator: local, non-local, all, used for calls to:
    gridding, pair-search, force calculation, x/f buffer operations */
 enum { eatLocal = 0, eatNonlocal = 1, eatAll  };
@@ -74,6 +76,7 @@ typedef struct {
     nbnxn_pairlist_set_t nbl_lists;   /* pair list(s)                       */
     nbnxn_atomdata_t     *nbat;       /* atom data                          */
     int                  kernel_type; /* non-bonded kernel - see enum above */
+    int                  ewald_excl;  /* Ewald exclusion - see enum above   */
 } nonbonded_verlet_group_t;
 
 /* non-bonded data structure with Verlet-type cut-off */