Move locality.h from nbnxm to mdtypes

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

diff --git a/src/gromacs/nbnxm/atomdata.h b/src/gromacs/nbnxm/atomdata.h
index bb3984d4d3535a73a27d08957e63fd431db70bc6..d44d8ed9efbe27cae93edee0eac9abae65ccf7af 100644 (file)
--- a/src/gromacs/nbnxm/atomdata.h
+++ b/src/gromacs/nbnxm/atomdata.h
@@ -41,12 +41,12 @@
 #include "gromacs/gpu_utils/devicebuffer_datatype.h"
 #include "gromacs/gpu_utils/hostallocator.h"
 #include "gromacs/math/vectypes.h"
+#include "gromacs/mdtypes/locality.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/bitmask.h"
 #include "gromacs/utility/real.h"
 
 #include "gpu_types.h"
-#include "locality.h"
 
 namespace gmx
 {
@@ -319,7 +319,7 @@ void nbnxn_atomdata_copy_shiftvec(gmx_bool          dynamic_box,
  * \param[in,out] nbat     Data in NBNXM format, used for mapping formats and to locate the output buffer.
  */
 void nbnxn_atomdata_copy_x_to_nbat_x(const Nbnxm::GridSet       &gridSet,
-                                     Nbnxm::AtomLocality         locality,
+                                     gmx::AtomLocality           locality,
                                      bool                        fillLocal,
                                      const rvec                 *coordinates,
                                      nbnxn_atomdata_t           *nbat);
@@ -337,7 +337,7 @@ void nbnxn_atomdata_copy_x_to_nbat_x(const Nbnxm::GridSet       &gridSet,
  * \param[in]     xReadyOnDevice   Event synchronizer indicating that the coordinates are ready in the device memory.
  */
 void nbnxn_atomdata_x_to_nbat_x_gpu(const Nbnxm::GridSet      &gridSet,
-                                    Nbnxm::AtomLocality        locality,
+                                    gmx::AtomLocality          locality,
                                     bool                       fillLocal,
                                     gmx_nbnxn_gpu_t           *gpu_nbv,
                                     DeviceBuffer<float>        d_x,
@@ -351,7 +351,7 @@ void nbnxn_atomdata_x_to_nbat_x_gpu(const Nbnxm::GridSet      &gridSet,
  * \param[out] totalForce  Buffer to accumulate resulting force
  */
 void reduceForces(nbnxn_atomdata_t                   *nbat,
-                  Nbnxm::AtomLocality                 locality,
+                  gmx::AtomLocality                   locality,
                   const Nbnxm::GridSet               &gridSet,
                   rvec                               *totalForce);
 
@@ -366,7 +366,7 @@ void reduceForces(nbnxn_atomdata_t                   *nbat,
  * \param[in]  useGpuFPmeReduction  Whether PME forces should be added.
  * \param[in]  accumulateForce      Whether there are usefull data already in the total force buffer.
  */
-void reduceForcesGpu(Nbnxm::AtomLocality                         locality,
+void reduceForcesGpu(gmx::AtomLocality                           locality,
                      DeviceBuffer<float>                         totalForcesDevice,
                      const Nbnxm::GridSet                       &gridSet,
                      void                                       *pmeForcesDevice,
@@ -380,7 +380,7 @@ void nbnxn_atomdata_add_nbat_fshift_to_fshift(const nbnxn_atomdata_t   &nbat,
                                               gmx::ArrayRef<gmx::RVec>  fshift);
 
 /* Get the atom start index and number of atoms for a given locality */
-void nbnxn_get_atom_range(Nbnxm::AtomLocality              atomLocality,
+void nbnxn_get_atom_range(gmx::AtomLocality                atomLocality,
                           const Nbnxm::GridSet            &gridSet,
                           int                             *atomStart,
                           int                             *nAtoms);