Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
520f7c8d
Unverified
Commit
520f7c8d
authored
Dec 19, 2019
by
Andy Simmonett
Browse files
Attempt to fix failing tests
parent
2c78200c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
openmmapi/src/NoseHooverIntegrator.cpp
openmmapi/src/NoseHooverIntegrator.cpp
+2
-0
tests/TestNoseHooverThermostat.h
tests/TestNoseHooverThermostat.h
+2
-6
No files found.
openmmapi/src/NoseHooverIntegrator.cpp
View file @
520f7c8d
...
@@ -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
);
}
}
...
...
tests/TestNoseHooverThermostat.h
View file @
520f7c8d
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment