Commit 4e280d49 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed compilation errors

parent 85eeb490
......@@ -4407,6 +4407,10 @@ RealOpenMM AmoebaReferenceGeneralizedKirkwoodMultipoleForce::calculateKirkwoodED
return energy;
}
const int AmoebaReferencePmeMultipoleForce::AMOEBA_PME_ORDER = 5;
const RealOpenMM AmoebaReferencePmeMultipoleForce::SQRT_PI = 1.77245385091;
AmoebaReferencePmeMultipoleForce::AmoebaReferencePmeMultipoleForce( void ) :
AmoebaReferenceMultipoleForce(PME),
_cutoffDistance(1.0), _cutoffDistanceSquared(1.0),
......
......@@ -1285,8 +1285,8 @@ public:
private:
static const int AMOEBA_PME_ORDER = 5;
static const RealOpenMM SQRT_PI = 1.77245385091;
static const int AMOEBA_PME_ORDER;
static const RealOpenMM SQRT_PI;
RealOpenMM _alphaEwald;
RealOpenMM _cutoffDistance;
......
......@@ -91,7 +91,7 @@ State RPMDIntegrator::getState(int copy, int types, bool enforcePeriodicBox, int
}
double RPMDIntegrator::computeKineticEnergy() {
kernel.getAs<IntegrateRPMDStepKernel>().computeKineticEnergy(*context, *this);
return kernel.getAs<IntegrateRPMDStepKernel>().computeKineticEnergy(*context, *this);
}
void RPMDIntegrator::step(int steps) {
......
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