Merge pull request #2182 from andysim/posqfix

Fix uninitialized variable when Coulomb terms are missing

Merge pull request #2182 from andysim/posqfix
Fix uninitialized variable when Coulomb terms are missing
76780eef · peastman · GitHub · 6fb038b9 · 63ea7033 · 76780eef
Unverified Commit 76780eef authored Oct 06, 2018 by peastman Committed by GitHub Oct 06, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

platforms/cuda/src/CudaKernels.cpp platforms/cuda/src/CudaKernels.cpp +2 -2

platforms/opencl/src/OpenCLKernels.cpp platforms/opencl/src/OpenCLKernels.cpp +1 -2

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -1628,8 +1628,8 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
    bool useCutoff = (nonbondedMethod != NoCutoff);
    bool usePeriodic = (nonbondedMethod != NoCutoff && nonbondedMethod != CutoffNonPeriodic);
    doLJPME = (nonbondedMethod == LJPME && hasLJ);
-    if (hasCoulomb)
-        usePosqCharges = cu.requestPosqCharges();
+    usePosqCharges = hasCoulomb ? cu.requestPosqCharges() : false;
+
    map<string, string> defines;
    defines["HAS_COULOMB"] = (hasCoulomb ? "1" : "0");
    defines["HAS_LENNARD_JONES"] = (hasLJ ? "1" : "0");

--- a/platforms/opencl/src/OpenCLKernels.cpp
+++ b/platforms/opencl/src/OpenCLKernels.cpp
@@ -1620,8 +1620,7 @@ void OpenCLCalcNonbondedForceKernel::initialize(const System& system, const Nonb
    bool useCutoff = (nonbondedMethod != NoCutoff);
    bool usePeriodic = (nonbondedMethod != NoCutoff && nonbondedMethod != CutoffNonPeriodic);
    doLJPME = (nonbondedMethod == LJPME && hasLJ);
-    if (hasCoulomb)
-        usePosqCharges = cl.requestPosqCharges();
+    usePosqCharges = hasCoulomb ? cl.requestPosqCharges() : false;
    map<string, string> defines;
    defines["HAS_COULOMB"] = (hasCoulomb ? "1" : "0");
    defines["HAS_LENNARD_JONES"] = (hasLJ ? "1" : "0");