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
efe4025d
"csrc/vscode:/vscode.git/clone" did not exist on "e6d61fc674c8ae5ff050a11fd1573673c4b609fc"
Commit
efe4025d
authored
Oct 25, 2011
by
Mark Friedrichs
Browse files
Temp fix for tempBuffers used w/ cutoffs
parent
b9d12c46
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateCDLJObcGbsaSoftcoreForces1.h
...s/cuda/src/kernels/kCalculateCDLJObcGbsaSoftcoreForces1.h
+2
-1
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateGBVISoftcoreForces2.h
...latforms/cuda/src/kernels/kCalculateGBVISoftcoreForces2.h
+2
-1
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateObcGbsaSoftcoreForces2.h
...forms/cuda/src/kernels/kCalculateObcGbsaSoftcoreForces2.h
+2
-1
No files found.
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateCDLJObcGbsaSoftcoreForces1.h
View file @
efe4025d
...
@@ -65,7 +65,8 @@ void METHOD_NAME(kCalculateCDLJObcGbsaSoftcore, Forces1_kernel)(unsigned int* wo
...
@@ -65,7 +65,8 @@ void METHOD_NAME(kCalculateCDLJObcGbsaSoftcore, Forces1_kernel)(unsigned int* wo
float
CDLJObcGbsa_energy
;
float
CDLJObcGbsa_energy
;
float
energy
=
0
.
0
f
;
float
energy
=
0
.
0
f
;
#ifdef USE_CUTOFF
#ifdef USE_CUTOFF
float
*
tempBuffer
=
(
float
*
)
&
sA
[
cSim
.
nonbond_threads_per_block
];
//float* tempBuffer = (float*) &sA[cSim.nonbond_threads_per_block];
float
*
tempBuffer
=
(
float
*
)
&
sA
[
blockDim
.
x
];
#endif
#endif
unsigned
int
lasty
=
-
0xFFFFFFFF
;
unsigned
int
lasty
=
-
0xFFFFFFFF
;
...
...
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateGBVISoftcoreForces2.h
View file @
efe4025d
...
@@ -58,7 +58,8 @@ void METHOD_NAME(kCalculateGBVISoftcore, Forces2_kernel)(unsigned int* workUnit
...
@@ -58,7 +58,8 @@ void METHOD_NAME(kCalculateGBVISoftcore, Forces2_kernel)(unsigned int* workUnit
unsigned
int
pos
=
warp
*
numWorkUnits
/
totalWarps
;
unsigned
int
pos
=
warp
*
numWorkUnits
/
totalWarps
;
unsigned
int
end
=
(
warp
+
1
)
*
numWorkUnits
/
totalWarps
;
unsigned
int
end
=
(
warp
+
1
)
*
numWorkUnits
/
totalWarps
;
#ifdef USE_CUTOFF
#ifdef USE_CUTOFF
float3
*
tempBuffer
=
(
float3
*
)
&
sA
[
cSim
.
bornForce2_threads_per_block
];
//float3* tempBuffer = (float3*) &sA[cSim.bornForce2_threads_per_block];
float3
*
tempBuffer
=
(
float3
*
)
&
sA
[
blockDim
.
x
];
#endif
#endif
unsigned
int
lasty
=
-
0xFFFFFFFF
;
unsigned
int
lasty
=
-
0xFFFFFFFF
;
...
...
plugins/freeEnergy/platforms/cuda/src/kernels/kCalculateObcGbsaSoftcoreForces2.h
View file @
efe4025d
...
@@ -186,7 +186,8 @@ void METHOD_NAME(kCalculateObcGbsaSoftcore, Forces2_kernel)(unsigned int* workUn
...
@@ -186,7 +186,8 @@ void METHOD_NAME(kCalculateObcGbsaSoftcore, Forces2_kernel)(unsigned int* workUn
{
{
// No interactions in this block.
// No interactions in this block.
}
}
else
if
(
flags
==
0xFFFFFFFF
)
//else if (flags == 0xFFFFFFFF)
else
if
(
flags
)
#endif
#endif
{
{
// Compute all interactions within this block.
// Compute all interactions within this block.
...
...
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