Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_cuda / nbnxn_cuda.cu

diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
index 1788eee771ab5c50af3e8dd2333b63b1174a31fc..4acca9c3b1de7199554bef079d7e87a90e66b4f3 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
@@ -502,8 +502,9 @@ static inline bool atomic_cas(volatile unsigned int *ptr,
 void nbnxn_cuda_wait_gpu(nbnxn_cuda_ptr_t cu_nb,
                          const nbnxn_atomdata_t *nbatom,
                          int flags, int aloc,
-                         float *e_lj, float *e_el, rvec *fshift)
+                         real *e_lj, real *e_el, rvec *fshift)
 {
+    /* NOTE:  only implemented for single-precision at this time */
     cudaError_t stat;
     int i, adat_end, iloc = -1;
     volatile unsigned int *poll_word;