Skip to content

GitLab

Unverified Commit e813e19f authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #2418 from peastman/triclinic 

Fixed error in #2416
parents f4080faa f144dee2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
platforms/cuda/src/kernels/findInteractingBlocks.cu
View file @ e813e19f
......@@ -273,9 +273,11 @@ extern "C" __global__ void findBlocksWithInteractions(real4 periodicBoxSize, rea
// Loop over any blocks we identified as potentially containing neighbors.
int includeBlockFlags = BALLOT(includeBlock2);
int forceIncludeFlags = BALLOT(forceInclude);
while (includeBlockFlags != 0) {
int i = __ffs(includeBlockFlags)-1;
includeBlockFlags &= includeBlockFlags-1;
forceInclude = (forceIncludeFlags>>i) & 1;
unsigned short y = (unsigned short) sortedBlocks[block2Base+i].y;
// Check each atom in block Y for interactions.
......
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