Commit 729bcde9 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed some compilation warnings

parent 117436ed
...@@ -85,7 +85,7 @@ struct OpenCLIntegrationUtilities::ConstraintOrderer : public binary_function<in ...@@ -85,7 +85,7 @@ struct OpenCLIntegrationUtilities::ConstraintOrderer : public binary_function<in
OpenCLIntegrationUtilities::OpenCLIntegrationUtilities(OpenCLContext& context, const System& system) : context(context), OpenCLIntegrationUtilities::OpenCLIntegrationUtilities(OpenCLContext& context, const System& system) : context(context),
posDelta(NULL), settleAtoms(NULL), settleParams(NULL), shakeAtoms(NULL), shakeParams(NULL), posDelta(NULL), settleAtoms(NULL), settleParams(NULL), shakeAtoms(NULL), shakeParams(NULL),
random(NULL), randomSeed(NULL), randomPos(NULL), stepSize(NULL), ccmaAtoms(NULL), ccmaDistance(NULL), random(NULL), randomSeed(NULL), randomPos(0), stepSize(NULL), ccmaAtoms(NULL), ccmaDistance(NULL),
ccmaReducedMass(NULL), ccmaAtomConstraints(NULL), ccmaNumAtomConstraints(NULL), ccmaConstraintMatrixColumn(NULL), ccmaReducedMass(NULL), ccmaAtomConstraints(NULL), ccmaNumAtomConstraints(NULL), ccmaConstraintMatrixColumn(NULL),
ccmaConstraintMatrixValue(NULL), ccmaDelta1(NULL), ccmaDelta2(NULL), ccmaConverged(NULL), ccmaConstraintMatrixValue(NULL), ccmaDelta1(NULL), ccmaDelta2(NULL), ccmaConverged(NULL),
hasInitializedConstraintKernels(false) { hasInitializedConstraintKernels(false) {
......
...@@ -99,6 +99,7 @@ ReferencePlatform::PlatformData::~PlatformData() { ...@@ -99,6 +99,7 @@ ReferencePlatform::PlatformData::~PlatformData() {
RealOpenMM** positions = (RealOpenMM**) this->positions; RealOpenMM** positions = (RealOpenMM**) this->positions;
RealOpenMM** velocities = (RealOpenMM**) this->velocities; RealOpenMM** velocities = (RealOpenMM**) this->velocities;
RealOpenMM** forces = (RealOpenMM**) this->forces; RealOpenMM** forces = (RealOpenMM**) this->forces;
RealOpenMM* periodicBoxSize = (RealOpenMM*) this->periodicBoxSize;
for (int i = 0; i < numParticles; ++i) { for (int i = 0; i < numParticles; ++i) {
delete[] positions[i]; delete[] positions[i];
delete[] velocities[i]; delete[] velocities[i];
......
...@@ -88,9 +88,9 @@ void ReferenceMonteCarloBarostat::applyBarostat(RealOpenMM** atomPositions, Real ...@@ -88,9 +88,9 @@ void ReferenceMonteCarloBarostat::applyBarostat(RealOpenMM** atomPositions, Real
int xcell = (int) floor(pos[0]/boxSize[0]); int xcell = (int) floor(pos[0]/boxSize[0]);
int ycell = (int) floor(pos[1]/boxSize[1]); int ycell = (int) floor(pos[1]/boxSize[1]);
int zcell = (int) floor(pos[2]/boxSize[2]); int zcell = (int) floor(pos[2]/boxSize[2]);
float dx = xcell*boxSize[0]; RealOpenMM dx = xcell*boxSize[0];
float dy = ycell*boxSize[1]; RealOpenMM dy = ycell*boxSize[1];
float dz = zcell*boxSize[2]; RealOpenMM dz = zcell*boxSize[2];
pos[0] -= dx; pos[0] -= dx;
pos[1] -= dy; pos[1] -= dy;
pos[2] -= dz; pos[2] -= dz;
......
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