From: Szilard Pall <pszilard@cbr.su.se>
Date: Mon, 22 Oct 2012 15:19:01 +0000 (+0200)
Subject: fix CUDA non-bonded kernel pointer assignment
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=f6b8fb558ed358d07ab3f092df3c53757a714d0f;p=alexxy%2Fgromacs.git

fix CUDA non-bonded kernel pointer assignment

The plain cut-off kernel pointer was incorrectly set which caused kernel
launch error.

Change-Id: Id4d71c4e04e8775134ee95e5ebb8c79cda7e8bf8
---

diff --git a/src/mdlib/nbnxn_cuda/nbnxn_cuda.cu b/src/mdlib/nbnxn_cuda/nbnxn_cuda.cu
index 86f81aa3e7..09e53c24b3 100644
--- a/src/mdlib/nbnxn_cuda/nbnxn_cuda.cu
+++ b/src/mdlib/nbnxn_cuda/nbnxn_cuda.cu
@@ -146,7 +146,7 @@ nb_default_kfunc_ptr[eelCuNR][nEnergyKernelTypes][nPruneKernelTypes] =
       { k_nbnxn_ewald_twin_ener,    k_nbnxn_ewald_twin_ener_prune } },
     { { k_nbnxn_rf,                 k_nbnxn_rf_prune },
       { k_nbnxn_rf_ener,            k_nbnxn_rf_ener_prune } },
-    { { k_nbnxn_ewald,              k_nbnxn_ewald_prune },
+    { { k_nbnxn_cutoff,             k_nbnxn_cutoff_prune },
       { k_nbnxn_cutoff_ener,        k_nbnxn_cutoff_ener_prune } },
 };
 
@@ -160,7 +160,7 @@ nb_legacy_kfunc_ptr[eelCuNR][nEnergyKernelTypes][nPruneKernelTypes] =
       { k_nbnxn_ewald_twin_ener_legacy, k_nbnxn_ewald_twin_ener_prune_legacy } },
     { { k_nbnxn_rf_legacy,              k_nbnxn_rf_prune_legacy },
       { k_nbnxn_rf_ener_legacy,         k_nbnxn_rf_ener_prune_legacy } },
-    { { k_nbnxn_ewald_legacy,           k_nbnxn_ewald_prune_legacy },
+    { { k_nbnxn_cutoff_legacy,          k_nbnxn_cutoff_prune_legacy },
       { k_nbnxn_cutoff_ener_legacy,     k_nbnxn_cutoff_ener_prune_legacy } },
 };