Merge pull request #272 from peastman/master

Fixed some bugs identified by Valgrind

Merge pull request #272 from peastman/master
Fixed some bugs identified by Valgrind
5e2170ff · peastman · 192fe4ca · fc1d0b5c · 5e2170ff · 5e2170ff
Commit 5e2170ff authored Jan 06, 2014 by peastman
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

platforms/cpu/src/CpuKernels.cpp platforms/cpu/src/CpuKernels.cpp +2 -2

platforms/cpu/src/CpuNonbondedForce.cpp platforms/cpu/src/CpuNonbondedForce.cpp +1 -1

No files found.
--- a/platforms/cpu/src/CpuKernels.cpp
+++ b/platforms/cpu/src/CpuKernels.cpp
@@ -225,8 +225,8 @@ CpuCalcNonbondedForceKernel::~CpuCalcNonbondedForceKernel() {
            delete[] bonded14IndexArray[i];
            delete[] bonded14ParamArray[i];
        }
-        delete bonded14IndexArray;
+        delete[] bonded14IndexArray;
-        delete bonded14ParamArray;
+        delete[] bonded14ParamArray;
    }
    if (nonbonded != NULL)
        delete nonbonded;

--- a/platforms/cpu/src/CpuNonbondedForce.cpp
+++ b/platforms/cpu/src/CpuNonbondedForce.cpp
@@ -57,7 +57,7 @@ public:
   --------------------------------------------------------------------------------------- */
-CpuNonbondedForce::CpuNonbondedForce() : cutoff(false), useSwitch(false), periodic(false), ewald(false), pme(false), tableIsValid(false) {
+CpuNonbondedForce::CpuNonbondedForce() : cutoff(false), useSwitch(false), periodic(false), ewald(false), pme(false), tableIsValid(false), cutoffDistance(0.0f), alphaEwald(0.0f) {
 }
 CpuNonbondedForce::~CpuNonbondedForce() {