Commit 5ed9dd65 authored by peastman's avatar peastman
Browse files

Merge pull request #427 from peastman/master

DrudeForce was ignoring force groups (see bug 2012)
parents 509b9b8e 11ef1e01
...@@ -141,7 +141,8 @@ void DrudeForceImpl::initialize(ContextImpl& context) { ...@@ -141,7 +141,8 @@ 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) {
return kernel.getAs<CalcDrudeForceKernel>().execute(context, includeForces, includeEnergy); if ((groups&(1<<owner.getForceGroup())) != 0)
return kernel.getAs<CalcDrudeForceKernel>().execute(context, includeForces, includeEnergy);
} }
std::vector<std::string> DrudeForceImpl::getKernelNames() { std::vector<std::string> DrudeForceImpl::getKernelNames() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment