Skip to content

GitLab

Unverified Commit 14e878a9 authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Fixed compilation error with multiple CustomNonbondedForces (#3729)

parent a2f4ab8b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
platforms/common/src/CommonKernels.cpp
View file @ 14e878a9
...@@ -1910,7 +1910,8 @@ void CommonCalcCustomNonbondedForceKernel::initialize(const System& system, cons ...@@ -1910,7 +1910,8 @@ void CommonCalcCustomNonbondedForceKernel::initialize(const System& system, cons
vector<float> f = cc.getExpressionUtilities().computeFunctionCoefficients(force.getTabulatedFunction(i), width); vector<float> f = cc.getExpressionUtilities().computeFunctionCoefficients(force.getTabulatedFunction(i), width);
tabulatedFunctionArrays[i].initialize<float>(cc, f.size(), "TabulatedFunction"); tabulatedFunctionArrays[i].initialize<float>(cc, f.size(), "TabulatedFunction");
tabulatedFunctionArrays[i].upload(f); tabulatedFunctionArrays[i].upload(f);
cc.getNonbondedUtilities().addArgument(ComputeParameterInfo(tabulatedFunctionArrays[i], arrayName, "float", width)); if (force.getNumInteractionGroups() == 0)
cc.getNonbondedUtilities().addArgument(ComputeParameterInfo(tabulatedFunctionArrays[i], arrayName, "float", width));
if (width == 1) if (width == 1)
tableTypes.push_back("float"); tableTypes.push_back("float");
else else
......
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