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
dcf76e73
Commit
dcf76e73
authored
Jan 26, 2011
by
Mark Friedrichs
Browse files
Fix to chirla check kernel
parent
b089a3a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
plugins/amoeba/platforms/cuda/src/kernels/amoebaCudaGpu.cpp
plugins/amoeba/platforms/cuda/src/kernels/amoebaCudaGpu.cpp
+0
-5
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
...forms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
+2
-1
No files found.
plugins/amoeba/platforms/cuda/src/kernels/amoebaCudaGpu.cpp
View file @
dcf76e73
...
@@ -1665,11 +1665,6 @@ void gpuSetAmoebaMultipoleParameters(amoebaGpuContext amoebaGpu, const std::vect
...
@@ -1665,11 +1665,6 @@ void gpuSetAmoebaMultipoleParameters(amoebaGpuContext amoebaGpu, const std::vect
// for z-only need to add access to random numbers
// for z-only need to add access to random numbers
// and need test system
// and need test system
if
(
axisType
[
ii
]
==
4
){
//fprintf( stderr, "Axis type z-only (atom=%d) not fully implemented -- aborting.\n", ii );
fprintf
(
stderr
,
"Warning: Axis type z-only (atom=%d) not fully implemented.
\n
"
,
ii
);
// exit(0);
}
int
axisParticleIndex
=
multipoleParticleZ
[
ii
];
int
axisParticleIndex
=
multipoleParticleZ
[
ii
];
if
(
maxIndices
[
axisParticleIndex
]
<
ii
){
if
(
maxIndices
[
axisParticleIndex
]
<
ii
){
maxIndices
[
axisParticleIndex
]
=
ii
;
maxIndices
[
axisParticleIndex
]
=
ii
;
...
...
plugins/amoeba/platforms/cuda/src/kernels/kCalculateAmoebaCudaRotateFrame.cu
View file @
dcf76e73
...
@@ -85,6 +85,7 @@ void kCudaComputeCheckChiral_kernel( void )
...
@@ -85,6 +85,7 @@ void kCudaComputeCheckChiral_kernel( void )
// ---------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------
int
atomIndex
=
blockIdx
.
x
;
int
atomIndex
=
blockIdx
.
x
;
if
(
atomIndex
>=
cSim
.
atoms
)
return
;
int
axisType
=
multiPoleAtoms
[
atomIndex
].
w
;
int
axisType
=
multiPoleAtoms
[
atomIndex
].
w
;
...
@@ -108,7 +109,7 @@ void kCudaComputeCheckChiral_kernel( void )
...
@@ -108,7 +109,7 @@ void kCudaComputeCheckChiral_kernel( void )
// skip z-then-x
// skip z-then-x
if
(
axisType
==
0
)
return
;
if
(
axisType
==
0
||
multiPoleAtoms
[
atomIndex
].
y
<
0
)
return
;
// ---------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------
...
...
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