Merge branch release-2021

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

diff --git a/src/gromacs/nbnxm/gpu_data_mgmt.h b/src/gromacs/nbnxm/gpu_data_mgmt.h
index 763482badd75de8702c62632fde035a5c74964ef..1bcc676879c2f66ca2b16e2bbb35e21a256ba2ac 100644 (file)
--- a/src/gromacs/nbnxm/gpu_data_mgmt.h
+++ b/src/gromacs/nbnxm/gpu_data_mgmt.h
@@ -2,6 +2,7 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 2014,2015,2017,2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2021, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -128,7 +129,8 @@ bool gpu_is_kernel_ewald_analytical(const NbnxmGpu gmx_unused* nb) GPU_FUNC_TERM
 
 /** Return the enum value of electrostatics kernel type for given interaction parameters \p ic. */
 GPU_FUNC_QUALIFIER
-enum ElecType nbnxmGpuPickElectrostaticsKernelType(const interaction_const_t gmx_unused* ic)
+enum ElecType nbnxmGpuPickElectrostaticsKernelType(const interaction_const_t gmx_unused* ic,
+                                                   const DeviceInformation gmx_unused& deviceInfo)
         GPU_FUNC_TERM_WITH_RETURN(ElecType::Count);
 
 /** Return the enum value of VdW kernel type for given \p ic and \p combRule. */