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
3c16ceff
Commit
3c16ceff
authored
Jan 13, 2011
by
Peter Eastman
Browse files
Fixed bug in evaluating tabulated functions
parent
a6370f58
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
platforms/cuda/src/kernels/kEvaluateExpression.h
platforms/cuda/src/kernels/kEvaluateExpression.h
+1
-1
platforms/opencl/src/OpenCLExpressionUtilities.cpp
platforms/opencl/src/OpenCLExpressionUtilities.cpp
+1
-1
No files found.
platforms/cuda/src/kernels/kEvaluateExpression.h
View file @
3c16ceff
...
@@ -114,7 +114,7 @@ __device__ float kEvaluateExpression_kernel(Expression<SIZE>* expression, float*
...
@@ -114,7 +114,7 @@ __device__ float kEvaluateExpression_kernel(Expression<SIZE>* expression, float*
if
(
op
==
CUSTOM
)
if
(
op
==
CUSTOM
)
STACK
(
stackPointer
)
=
a
*
coeff
.
x
+
b
*
coeff
.
y
+
((
a
*
a
*
a
-
a
)
*
coeff
.
z
+
(
b
*
b
*
b
-
b
)
*
coeff
.
w
)
/
(
params
.
z
*
params
.
z
);
STACK
(
stackPointer
)
=
a
*
coeff
.
x
+
b
*
coeff
.
y
+
((
a
*
a
*
a
-
a
)
*
coeff
.
z
+
(
b
*
b
*
b
-
b
)
*
coeff
.
w
)
/
(
params
.
z
*
params
.
z
);
else
else
STACK
(
stackPointer
)
=
(
coeff
.
y
-
coeff
.
x
)
*
params
.
z
-
((
3.0
f
*
a
*
a
-
1.0
f
)
*
coeff
.
z
+
(
4
.0
f
*
b
*
b
-
1.0
f
)
*
coeff
.
w
)
/
params
.
z
;
STACK
(
stackPointer
)
=
(
coeff
.
y
-
coeff
.
x
)
*
params
.
z
+
((
1.0
f
-
3.0
f
*
a
*
a
)
*
coeff
.
z
+
(
3
.0
f
*
b
*
b
-
1.0
f
)
*
coeff
.
w
)
/
params
.
z
;
}
}
}
}
}
}
...
...
platforms/opencl/src/OpenCLExpressionUtilities.cpp
View file @
3c16ceff
...
@@ -130,7 +130,7 @@ void OpenCLExpressionUtilities::processExpression(stringstream& out, const Expre
...
@@ -130,7 +130,7 @@ void OpenCLExpressionUtilities::processExpression(stringstream& out, const Expre
if
(
valueNode
!=
NULL
)
if
(
valueNode
!=
NULL
)
out
<<
valueName
<<
" = a*coeff.x+b*coeff.y+((a*a*a-a)*coeff.z+(b*b*b-b)*coeff.w)/(params.z*params.z);
\n
"
;
out
<<
valueName
<<
" = a*coeff.x+b*coeff.y+((a*a*a-a)*coeff.z+(b*b*b-b)*coeff.w)/(params.z*params.z);
\n
"
;
if
(
derivNode
!=
NULL
)
if
(
derivNode
!=
NULL
)
out
<<
derivName
<<
" = (coeff.y-coeff.x)*params.z
-
((3.0f*a*a
-1.0f
)*coeff.z+(
4
.0f*b*b-1.0f)*coeff.w)/params.z;
\n
"
;
out
<<
derivName
<<
" = (coeff.y-coeff.x)*params.z
+
((
1.0f-
3.0f*a*a)*coeff.z+(
3
.0f*b*b-1.0f)*coeff.w)/params.z;
\n
"
;
out
<<
"}
\n
"
;
out
<<
"}
\n
"
;
out
<<
"}"
;
out
<<
"}"
;
break
;
break
;
...
...
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