Clean up nbnxm enums

[alexxy/gromacs.git] / src / gromacs / nbnxm / pairlist_tuning.cpp

diff --git a/src/gromacs/nbnxm/pairlist_tuning.cpp b/src/gromacs/nbnxm/pairlist_tuning.cpp
index a8924efefc1656d7845d27c03a2cd48c55c73015..d3ee3bc2b31f4c37384d24b2cbfa30c0c389cd72 100644 (file)
--- a/src/gromacs/nbnxm/pairlist_tuning.cpp
+++ b/src/gromacs/nbnxm/pairlist_tuning.cpp
@@ -483,7 +483,6 @@ void setupDynamicPairlistPruning(const gmx::MDLogger       &mdlog,
                                  const t_inputrec          *ir,
                                  const gmx_mtop_t          *mtop,
                                  matrix                     box,
-                                 int                        nbnxnKernelType,
                                  const interaction_const_t *ic,
                                  NbnxnListParameters       *listParams)
 {
@@ -492,10 +491,14 @@ void setupDynamicPairlistPruning(const gmx::MDLogger       &mdlog,
     /* Initialize the parameters to no dynamic list pruning */
     listParams->useDynamicPruning = false;
 
-    const VerletbufListSetup ls   = verletbufGetListSetup(nbnxnKernelType);
+    const VerletbufListSetup ls   =
+    {
+        IClusterSizePerListType[listParams->pairlistType],
+        JClusterSizePerListType[listParams->pairlistType]
+    };
 
     /* Currently emulation mode does not support dual pair-lists */
-    const bool useGpu             = (nbnxnKernelType == nbnxnk8x8x8_GPU);
+    const bool useGpu             = (listParams->pairlistType == PairlistType::Hierarchical8x8);
 
     if (supportsDynamicPairlistGenerationInterval(*ir) &&
         getenv("GMX_DISABLE_DYNAMICPRUNING") == nullptr)