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
101f206d
Commit
101f206d
authored
Apr 07, 2011
by
Mark Friedrichs
Browse files
Added loop over particles for torque mapping
parent
41abd9fb
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
244 additions
and
247 deletions
+244
-247
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaMapTorques.cu
...tforms/cuda/src/kernels/kCalculateAmoebaCudaMapTorques.cu
+241
-243
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaPmeDirectElectrostatic.cu
...src/kernels/kCalculateAmoebaCudaPmeDirectElectrostatic.cu
+2
-2
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
...forms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
+1
-2
No files found.
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaMapTorques.cu
View file @
101f206d
This diff is collapsed.
Click to expand it.
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaPmeDirectElectrostatic.cu
View file @
101f206d
...
@@ -1089,8 +1089,8 @@ static void kReduceTorque(amoebaGpuContext amoebaGpu )
...
@@ -1089,8 +1089,8 @@ static void kReduceTorque(amoebaGpuContext amoebaGpu )
{
{
gpuContext
gpu
=
amoebaGpu
->
gpuContext
;
gpuContext
gpu
=
amoebaGpu
->
gpuContext
;
kReduceFields_kernel
<<<
gpu
->
sim
.
nonbond_blocks
,
gpu
->
sim
.
bsf_reduce_threads_per_block
>>>
(
kReduceFields_kernel
<<<
gpu
->
sim
.
nonbond_blocks
,
gpu
->
sim
.
bsf_reduce_threads_per_block
>>>
(
gpu
->
sim
.
paddedNumberOfAtoms
*
3
,
gpu
->
sim
.
outputBuffers
,
gpu
->
sim
.
paddedNumberOfAtoms
*
3
,
gpu
->
sim
.
outputBuffers
,
amoebaGpu
->
psWorkArray_3_1
->
_pDevData
,
amoebaGpu
->
psTorque
->
_pDevData
);
amoebaGpu
->
psWorkArray_3_1
->
_pDevData
,
amoebaGpu
->
psTorque
->
_pDevData
);
LAUNCHERROR
(
"kReducePmeDirectElectrostaticTorque"
);
LAUNCHERROR
(
"kReducePmeDirectElectrostaticTorque"
);
}
}
...
...
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
View file @
101f206d
...
@@ -147,7 +147,6 @@ void kCudaComputeLabFrameMoments_kernel( void )
...
@@ -147,7 +147,6 @@ void kCudaComputeLabFrameMoments_kernel( void )
float
vectorZ
[
3
];
float
vectorZ
[
3
];
int
particleIndex
=
__mul24
(
blockIdx
.
x
,
blockDim
.
x
)
+
threadIdx
.
x
;
int
particleIndex
=
__mul24
(
blockIdx
.
x
,
blockDim
.
x
)
+
threadIdx
.
x
;
int
numberOfParticles
=
cSim
.
atoms
;
float4
*
particleCoord
=
cSim
.
pPosq
;
float4
*
particleCoord
=
cSim
.
pPosq
;
int4
*
multiPoleParticles
=
cAmoebaSim
.
pMultipoleParticlesIdsAndAxisType
;
int4
*
multiPoleParticles
=
cAmoebaSim
.
pMultipoleParticlesIdsAndAxisType
;
...
@@ -162,7 +161,7 @@ void kCudaComputeLabFrameMoments_kernel( void )
...
@@ -162,7 +161,7 @@ void kCudaComputeLabFrameMoments_kernel( void )
// code common to ZThenX and Bisector
// code common to ZThenX and Bisector
while
(
particleIndex
<
numberOfParticle
s
)
while
(
particleIndex
<
cSim
.
atom
s
)
{
{
if
(
multiPoleParticles
[
particleIndex
].
x
>=
0
&&
multiPoleParticles
[
particleIndex
].
z
>=
0
)
if
(
multiPoleParticles
[
particleIndex
].
x
>=
0
&&
multiPoleParticles
[
particleIndex
].
z
>=
0
)
...
...
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