Unverified Commit ebef35a4 authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Reduced padding on cutoff (#3025)

parent 6d4abc54
...@@ -369,7 +369,7 @@ double CudaNonbondedUtilities::getMaxCutoffDistance() { ...@@ -369,7 +369,7 @@ double CudaNonbondedUtilities::getMaxCutoffDistance() {
} }
double CudaNonbondedUtilities::padCutoff(double cutoff) { double CudaNonbondedUtilities::padCutoff(double cutoff) {
double padding = (usePadding ? 0.1*cutoff : 0.0); double padding = (usePadding ? 0.08*cutoff : 0.0);
return cutoff+padding; return cutoff+padding;
} }
......
...@@ -304,10 +304,10 @@ extern "C" __global__ __launch_bounds__(GROUP_SIZE,3) void findBlocksWithInterac ...@@ -304,10 +304,10 @@ extern "C" __global__ __launch_bounds__(GROUP_SIZE,3) void findBlocksWithInterac
int atomFlags = BALLOT(forceInclude || atomDelta.x*atomDelta.x+atomDelta.y*atomDelta.y+atomDelta.z*atomDelta.z < (PADDED_CUTOFF+blockCenterY.w)*(PADDED_CUTOFF+blockCenterY.w)); int atomFlags = BALLOT(forceInclude || atomDelta.x*atomDelta.x+atomDelta.y*atomDelta.y+atomDelta.z*atomDelta.z < (PADDED_CUTOFF+blockCenterY.w)*(PADDED_CUTOFF+blockCenterY.w));
int interacts = 0; int interacts = 0;
if (atom2 < NUM_ATOMS && atomFlags != 0) { if (atom2 < NUM_ATOMS && atomFlags != 0) {
int first = __ffs(atomFlags)-1;
int last = 32-__clz(atomFlags);
#ifdef USE_PERIODIC #ifdef USE_PERIODIC
if (!singlePeriodicCopy) { if (!singlePeriodicCopy) {
int first = __ffs(atomFlags)-1;
int last = 32-__clz(atomFlags);
for (int j = first; j < last; j++) { for (int j = first; j < last; j++) {
real3 delta = trimTo3(pos2)-trimTo3(posBuffer[warpStart+j]); real3 delta = trimTo3(pos2)-trimTo3(posBuffer[warpStart+j]);
APPLY_PERIODIC_TO_DELTA(delta) APPLY_PERIODIC_TO_DELTA(delta)
......
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