From ad3c57cb63a8bed2d1d46463fb0a1dab927fbb36 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 14 Mar 2016 18:45:25 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14746
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 lib/cuda/pair_lj_charmm_coul_charmm_cuda_kernel_nc.cu | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/cuda/pair_lj_charmm_coul_charmm_cuda_kernel_nc.cu b/lib/cuda/pair_lj_charmm_coul_charmm_cuda_kernel_nc.cu
index d741e7ac9d..cc1963bfc8 100644
--- a/lib/cuda/pair_lj_charmm_coul_charmm_cuda_kernel_nc.cu
+++ b/lib/cuda/pair_lj_charmm_coul_charmm_cuda_kernel_nc.cu
@@ -59,9 +59,7 @@ __device__ inline F_CFLOAT CoulCharmmCuda_Eval(const F_CFLOAT &rsq, F_CFLOAT &fa
     const F_CFLOAT switch1 = (_cut_coulsq_global - rsq) * (_cut_coulsq_global - rsq) *
                             (_cut_coulsq_global + F_F(2.0) * rsq - F_F(3.0) * _cut_coul_innersq_global) * _denom_coul_inv;
     ecoul_tmp *= switch1;
-    const F_CFLOAT switch2 = F_F(12.0) * rsq * (_cut_coulsq_global - rsq) *
-                            (rsq - _cut_coul_innersq_global) * _denom_coul_inv;
-    forcecoul *= switch1 + switch2;
+    forcecoul *= switch1;
   }
 
   if(eflag) {