Unverified Commit 520f7c8d authored by Andy Simmonett's avatar Andy Simmonett
Browse files

Attempt to fix failing tests

parent 2c78200c
...@@ -53,6 +53,7 @@ NoseHooverIntegrator::NoseHooverIntegrator(double stepSize): ...@@ -53,6 +53,7 @@ NoseHooverIntegrator::NoseHooverIntegrator(double stepSize):
{ {
setStepSize(stepSize); setStepSize(stepSize);
setConstraintTolerance(1e-5); setConstraintTolerance(1e-5);
setMaximumPairDistance(0.0);
} }
NoseHooverIntegrator::NoseHooverIntegrator(double temperature, double collisionFrequency, double stepSize, NoseHooverIntegrator::NoseHooverIntegrator(double temperature, double collisionFrequency, double stepSize,
int chainLength, int numMTS, int numYoshidaSuzuki) : int chainLength, int numMTS, int numYoshidaSuzuki) :
...@@ -61,6 +62,7 @@ NoseHooverIntegrator::NoseHooverIntegrator(double temperature, double collisionF ...@@ -61,6 +62,7 @@ NoseHooverIntegrator::NoseHooverIntegrator(double temperature, double collisionF
setStepSize(stepSize); setStepSize(stepSize);
setConstraintTolerance(1e-5); setConstraintTolerance(1e-5);
setMaximumPairDistance(0.0);
addThermostat(temperature, collisionFrequency, chainLength, numMTS, numYoshidaSuzuki); addThermostat(temperature, collisionFrequency, chainLength, numMTS, numYoshidaSuzuki);
} }
......
...@@ -236,15 +236,11 @@ void testCheckpoints() { ...@@ -236,15 +236,11 @@ void testCheckpoints() {
context.createCheckpoint(checkpoint); context.createCheckpoint(checkpoint);
// Now continue the simulation // Now continue the simulation
for (size_t i=0; i<25; i++){ integrator.step(5);
integrator.step(1);
}
// And try the same, starting from the checkpoint // And try the same, starting from the checkpoint
newContext.loadCheckpoint(checkpoint); newContext.loadCheckpoint(checkpoint);
for (size_t i=0; i<25; i++){ newIntegrator.step(5);
newIntegrator.step(1);
}
State state1 = context.getState(State::Positions | State::Velocities); State state1 = context.getState(State::Positions | State::Velocities);
State state2 = newContext.getState(State::Positions | State::Velocities); State state2 = newContext.getState(State::Positions | State::Velocities);
......
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