Commit 15899649 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed compilation errors under Windows

parent 8a1641ff
...@@ -143,7 +143,7 @@ void testExclusions() { ...@@ -143,7 +143,7 @@ void testExclusions() {
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL);
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL);
ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL); ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL);
ASSERT_EQUAL_TOL((1+4)*3, state.getPotentialEnergy(), TOL); ASSERT_EQUAL_TOL((1+4)*3.0, state.getPotentialEnergy(), TOL);
} }
void testCutoff() { void testCutoff() {
......
...@@ -182,7 +182,7 @@ void testExclusions() { ...@@ -182,7 +182,7 @@ void testExclusions() {
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL);
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL);
ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL); ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL);
ASSERT_EQUAL_TOL((1+4)*3, state.getPotentialEnergy(), TOL); ASSERT_EQUAL_TOL((1+4)*3.0, state.getPotentialEnergy(), TOL);
} }
void testCutoff() { void testCutoff() {
......
...@@ -143,7 +143,7 @@ void testExclusions() { ...@@ -143,7 +143,7 @@ void testExclusions() {
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], TOL);
ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL); ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[2], TOL);
ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL); ASSERT_EQUAL_VEC(Vec3(-(1+4), 0, 0), forces[3], TOL);
ASSERT_EQUAL_TOL((1+4)*3, state.getPotentialEnergy(), TOL); ASSERT_EQUAL_TOL((1+4)*3.0, state.getPotentialEnergy(), TOL);
} }
void testCutoff() { void testCutoff() {
......
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