Move locality.h from nbnxm to mdtypes

[alexxy/gromacs.git] / src / gromacs / nbnxm / pairlistset.h

diff --git a/src/gromacs/nbnxm/pairlistset.h b/src/gromacs/nbnxm/pairlistset.h
index 2fad5d6f1771832c131ddc898e8c1f174d1e9579..8197f131d52e7370fec9ed876457a5fb1f66d0f0 100644 (file)
--- a/src/gromacs/nbnxm/pairlistset.h
+++ b/src/gromacs/nbnxm/pairlistset.h
@@ -52,10 +52,10 @@
 #include <memory>
 
 #include "gromacs/math/vectypes.h"
+#include "gromacs/mdtypes/locality.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"
 
-#include "locality.h"
 #include "pairlist.h"
 
 struct nbnxn_atomdata_t;
@@ -77,7 +77,7 @@ class PairlistSet
 {
     public:
         //! Constructor: initializes the pairlist set as empty
-        PairlistSet(Nbnxm::InteractionLocality  locality,
+        PairlistSet(gmx::InteractionLocality    locality,
                     const PairlistParams       &listParams);
 
         ~PairlistSet();
@@ -96,7 +96,7 @@ class PairlistSet
                                  const rvec             *shift_vec);
 
         //! Returns the locality
-        Nbnxm::InteractionLocality locality() const
+        gmx::InteractionLocality locality() const
         {
             return locality_;
         }
@@ -128,7 +128,7 @@ class PairlistSet
 
     private:
         //! The locality of the pairlist set
-        Nbnxm::InteractionLocality     locality_;
+        gmx::InteractionLocality       locality_;
         //! List of pairlists in CPU layout
         std::vector<NbnxnPairlistCpu>  cpuLists_;
         //! List of working list for rebalancing CPU lists