Commit 47d2fa76 authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

Missing addition sign for 14LJ energy (nonbondedMethod == NO_CUTOFF)

parent a3464898
...@@ -468,7 +468,7 @@ __global__ void kCalculateLocalForces_kernel() ...@@ -468,7 +468,7 @@ __global__ void kCalculateLocalForces_kernel()
float sig6 = sig2 * sig2 * sig2; float sig6 = sig2 * sig2 * sig2;
float dEdR = LJ14.x * (12.0f * sig6 - 6.0f) * sig6; float dEdR = LJ14.x * (12.0f * sig6 - 6.0f) * sig6;
/* E */ /* E */
energy = LJ14.x * (sig6 - 1.0f) * sig6; energy += LJ14.x * (sig6 - 1.0f) * sig6;
energy += LJ14.z * inverseR; energy += LJ14.z * inverseR;
dEdR += LJ14.z * inverseR; dEdR += LJ14.z * inverseR;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment