Skip to content

GitLab

Commit c0850062 authored by Andy Simmonett's avatar Andy Simmonett
Browse files

More test changes, to appease appveyor.

parent 551c5b03
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
tests/TestDispersionPME.h
View file @ c0850062
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "sfmt/SFMT.h" #include "sfmt/SFMT.h"
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <algorithm>
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
...@@ -68,7 +69,7 @@ void testConvergence() { ...@@ -68,7 +69,7 @@ void testConvergence() {
double minDist = boxWidth; double minDist = boxWidth;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
Vec3 delta = pos-positions[j]; Vec3 delta = pos-positions[j];
minDist = min(minDist, sqrt(delta.dot(delta))); minDist = std::min(minDist, sqrt(delta.dot(delta)));
} }
if (minDist > 0.15) { if (minDist > 0.15) {
positions[i] = pos; positions[i] = pos;
...@@ -120,7 +121,7 @@ void testErrorTolerance() { ...@@ -120,7 +121,7 @@ void testErrorTolerance() {
double minDist = boxWidth; double minDist = boxWidth;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
Vec3 delta = pos-positions[j]; Vec3 delta = pos-positions[j];
minDist = min(minDist, sqrt(delta.dot(delta))); minDist = std::min(minDist, sqrt(delta.dot(delta)));
} }
if (minDist > 0.1) { if (minDist > 0.1) {
positions[i] = pos; positions[i] = pos;
...@@ -251,7 +252,7 @@ void testCoulombAndLJ() { ...@@ -251,7 +252,7 @@ void testCoulombAndLJ() {
double minDist = boxWidth; double minDist = boxWidth;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
Vec3 delta = pos-positions[j]; Vec3 delta = pos-positions[j];
minDist = min(minDist, sqrt(delta.dot(delta))); minDist = std::min(minDist, sqrt(delta.dot(delta)));
} }
if (minDist > 0.1) { if (minDist > 0.1) {
positions[i] = pos; positions[i] = pos;
......
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