Commit 68446fd0 authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

Zero force contribution if index i or j > no. particles

parent 7943a339
...@@ -120,7 +120,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit) ...@@ -120,7 +120,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit)
#elif defined USE_CUTOFF #elif defined USE_CUTOFF
if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr) if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr)
#else #else
if (a.x >= rScaledRadiusJ) if (a.x >= rScaledRadiusJ || i >= cSim.atoms || x+j >= cSim.atoms )
#endif #endif
{ {
dE = 0.0f; dE = 0.0f;
...@@ -222,7 +222,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit) ...@@ -222,7 +222,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit)
#elif defined USE_CUTOFF #elif defined USE_CUTOFF
if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr) if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr)
#else #else
if (a.x >= rScaledRadiusJ) if (a.x >= rScaledRadiusJ || i >= cSim.atoms || y+tj >= cSim.atoms )
#endif #endif
{ {
dE = 0.0f; dE = 0.0f;
...@@ -250,7 +250,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit) ...@@ -250,7 +250,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit)
#elif defined USE_CUTOFF #elif defined USE_CUTOFF
if (rj >= rScaledRadiusI || r2 > cSim.nonbondedCutoffSqr) if (rj >= rScaledRadiusI || r2 > cSim.nonbondedCutoffSqr)
#else #else
if (rj >= rScaledRadiusI) if (rj >= rScaledRadiusI || i >= cSim.atoms || y+tj >= cSim.atoms )
#endif #endif
{ {
dE = 0.0f; dE = 0.0f;
...@@ -320,7 +320,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit) ...@@ -320,7 +320,7 @@ void METHOD_NAME(kCalculateObcGbsa, Forces2_kernel)(unsigned int* workUnit)
#elif defined USE_CUTOFF #elif defined USE_CUTOFF
if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr) if (a.x >= rScaledRadiusJ || r2 > cSim.nonbondedCutoffSqr)
#else #else
if (a.x >= rScaledRadiusJ) if (a.x >= rScaledRadiusJ || i >= cSim.atoms || y+j >= cSim.atoms )
#endif #endif
{ {
dE = 0.0f; dE = 0.0f;
......
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