Cleaned up high-level boolean variable naming

[alexxy/gromacs.git] / src / gromacs / mdlib / calc_verletbuf.cpp

diff --git a/src/gromacs/mdlib/calc_verletbuf.cpp b/src/gromacs/mdlib/calc_verletbuf.cpp
index fcc6b690e5631efe78bc0b8a55de2dd7a61c392e..2b5c938127646fe6a09c8461f0ceece59623e025 100644 (file)
--- a/src/gromacs/mdlib/calc_verletbuf.cpp
+++ b/src/gromacs/mdlib/calc_verletbuf.cpp
@@ -107,8 +107,8 @@ typedef struct
     real  md3; // -V''' at the cutoff
 } pot_derivatives_t;
 
-void verletbuf_get_list_setup(gmx_bool gmx_unused     bSIMD,
-                              gmx_bool                bGPU,
+void verletbuf_get_list_setup(bool                    makeSimdPairList,
+                              bool                    makeGpuPairList,
                               verletbuf_list_setup_t *list_setup)
 {
     /* When calling this function we often don't know which kernel type we
@@ -119,9 +119,9 @@ void verletbuf_get_list_setup(gmx_bool gmx_unused     bSIMD,
      * of size 1, 2 or 4, so for 4x8 or 8x8 we use the estimate for 4x4.
      */
 
-    if (bGPU)
+    if (makeGpuPairList)
     {
-        /* The CUDA kernels split the j-clusters in two halves */
+        /* The GPU kernels split the j-clusters in two halves */
         list_setup->cluster_size_i = nbnxn_kernel_to_cluster_i_size(nbnxnk8x8x8_GPU);
         list_setup->cluster_size_j = nbnxn_kernel_to_cluster_j_size(nbnxnk8x8x8_GPU)/2;
     }
@@ -131,8 +131,7 @@ void verletbuf_get_list_setup(gmx_bool gmx_unused     bSIMD,
 
         kernel_type = nbnxnk4x4_PlainC;
 
-#if GMX_SIMD
-        if (bSIMD)
+        if (GMX_SIMD && makeSimdPairList)
         {
 #ifdef GMX_NBNXN_SIMD_2XNN
             /* We use the smallest cluster size to be on the safe side */
@@ -141,7 +140,6 @@ void verletbuf_get_list_setup(gmx_bool gmx_unused     bSIMD,
             kernel_type = nbnxnk4xN_SIMD_4xN;
 #endif
         }
-#endif
 
         list_setup->cluster_size_i = nbnxn_kernel_to_cluster_i_size(kernel_type);
         list_setup->cluster_size_j = nbnxn_kernel_to_cluster_j_size(kernel_type);