Commit 021236b2 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed some memory errors found by Valgrind

parent d099819a
...@@ -566,8 +566,8 @@ int CpuGBVI::computeBornForces( const RealOpenMM* bornRadii, RealOpenMM** atomCo ...@@ -566,8 +566,8 @@ int CpuGBVI::computeBornForces( const RealOpenMM* bornRadii, RealOpenMM** atomCo
const unsigned int arraySzInBytes = sizeof( RealOpenMM )*numberOfAtoms; const unsigned int arraySzInBytes = sizeof( RealOpenMM )*numberOfAtoms;
RealOpenMM** forces = (RealOpenMM**) malloc( sizeof( RealOpenMM* )*numberOfAtoms ); RealOpenMM** forces = new RealOpenMM*[numberOfAtoms];
RealOpenMM* block = (RealOpenMM*) malloc( sizeof( RealOpenMM )*numberOfAtoms*3 ); RealOpenMM* block = new RealOpenMM[numberOfAtoms*3];
memset( block, 0, sizeof( RealOpenMM )*numberOfAtoms*3 ); memset( block, 0, sizeof( RealOpenMM )*numberOfAtoms*3 );
RealOpenMM* blockPtr = block; RealOpenMM* blockPtr = block;
for( int ii = 0; ii < numberOfAtoms; ii++ ){ for( int ii = 0; ii < numberOfAtoms; ii++ ){
...@@ -783,6 +783,9 @@ if( 0 ){ ...@@ -783,6 +783,9 @@ if( 0 ){
inputForces[atomI][2] = conversion*forces[atomI][2]; inputForces[atomI][2] = conversion*forces[atomI][2];
} }
delete[] forces;
delete[] block;
return SimTKOpenMMCommon::DefaultReturn; return SimTKOpenMMCommon::DefaultReturn;
} }
......
...@@ -148,7 +148,7 @@ GBVIParameters::~GBVIParameters( ){ ...@@ -148,7 +148,7 @@ GBVIParameters::~GBVIParameters( ){
if( _ownScaledRadii ){ if( _ownScaledRadii ){
delete[] _scaledRadii; delete[] _scaledRadii;
} }
delete _gammaParameters; delete[] _gammaParameters;
/* /*
if( getFreeArrays() ){ if( getFreeArrays() ){
......
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