Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
1f78252a
Commit
1f78252a
authored
Oct 18, 2016
by
peastman
Committed by
GitHub
Oct 18, 2016
Browse files
Merge pull request #1642 from peastman/radius
Fixed bug computing neighbor list
parents
5ea8680f
2c47f7b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
platforms/cuda/src/kernels/findInteractingBlocks.cu
platforms/cuda/src/kernels/findInteractingBlocks.cu
+1
-0
platforms/opencl/src/kernels/findInteractingBlocks.cl
platforms/opencl/src/kernels/findInteractingBlocks.cl
+1
-0
No files found.
platforms/cuda/src/kernels/findInteractingBlocks.cu
View file @
1f78252a
...
@@ -37,6 +37,7 @@ extern "C" __global__ void findBlockBounds(int numAtoms, real4 periodicBoxSize,
...
@@ -37,6 +37,7 @@ extern "C" __global__ void findBlockBounds(int numAtoms, real4 periodicBoxSize,
#endif
#endif
center
.
w
=
max
(
center
.
w
,
delta
.
x
*
delta
.
x
+
delta
.
y
*
delta
.
y
+
delta
.
z
*
delta
.
z
);
center
.
w
=
max
(
center
.
w
,
delta
.
x
*
delta
.
x
+
delta
.
y
*
delta
.
y
+
delta
.
z
*
delta
.
z
);
}
}
center
.
w
=
sqrt
(
center
.
w
);
blockBoundingBox
[
index
]
=
blockSize
;
blockBoundingBox
[
index
]
=
blockSize
;
blockCenter
[
index
]
=
center
;
blockCenter
[
index
]
=
center
;
sortedBlocks
[
index
]
=
make_real2
(
blockSize
.
x
+
blockSize
.
y
+
blockSize
.
z
,
index
);
sortedBlocks
[
index
]
=
make_real2
(
blockSize
.
x
+
blockSize
.
y
+
blockSize
.
z
,
index
);
...
...
platforms/opencl/src/kernels/findInteractingBlocks.cl
View file @
1f78252a
...
@@ -37,6 +37,7 @@ __kernel void findBlockBounds(int numAtoms, real4 periodicBoxSize, real4 invPeri
...
@@ -37,6 +37,7 @@ __kernel void findBlockBounds(int numAtoms, real4 periodicBoxSize, real4 invPeri
#
endif
#
endif
center.w
=
max
(
center.w,
delta.x*delta.x+delta.y*delta.y+delta.z*delta.z
)
;
center.w
=
max
(
center.w,
delta.x*delta.x+delta.y*delta.y+delta.z*delta.z
)
;
}
}
center.w
=
sqrt
(
center.w
)
;
blockBoundingBox[index]
=
blockSize
;
blockBoundingBox[index]
=
blockSize
;
blockCenter[index]
=
center
;
blockCenter[index]
=
center
;
sortedBlocks[index]
=
(
real2
)
(
blockSize.x+blockSize.y+blockSize.z,
index
)
;
sortedBlocks[index]
=
(
real2
)
(
blockSize.x+blockSize.y+blockSize.z,
index
)
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment