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
5ed9dd65
Commit
5ed9dd65
authored
May 01, 2014
by
peastman
Browse files
Merge pull request #427 from peastman/master
DrudeForce was ignoring force groups (see bug 2012)
parents
509b9b8e
11ef1e01
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
plugins/drude/openmmapi/src/DrudeForceImpl.cpp
plugins/drude/openmmapi/src/DrudeForceImpl.cpp
+2
-1
No files found.
plugins/drude/openmmapi/src/DrudeForceImpl.cpp
View file @
5ed9dd65
...
@@ -141,6 +141,7 @@ void DrudeForceImpl::initialize(ContextImpl& context) {
...
@@ -141,6 +141,7 @@ void DrudeForceImpl::initialize(ContextImpl& context) {
}
}
double
DrudeForceImpl
::
calcForcesAndEnergy
(
ContextImpl
&
context
,
bool
includeForces
,
bool
includeEnergy
,
int
groups
)
{
double
DrudeForceImpl
::
calcForcesAndEnergy
(
ContextImpl
&
context
,
bool
includeForces
,
bool
includeEnergy
,
int
groups
)
{
if
((
groups
&
(
1
<<
owner
.
getForceGroup
()))
!=
0
)
return
kernel
.
getAs
<
CalcDrudeForceKernel
>
().
execute
(
context
,
includeForces
,
includeEnergy
);
return
kernel
.
getAs
<
CalcDrudeForceKernel
>
().
execute
(
context
,
includeForces
,
includeEnergy
);
}
}
...
...
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