Merge branch 'master' into nucleic

fd473eea · Peter Eastman · 0a751b5b · 6a985cfd · fd473eea · fd473eea
Commit fd473eea authored Oct 29, 2015 by Peter Eastman
20 changed files
--- a/platforms/opencl/tests/CMakeLists.txt
+++ b/platforms/opencl/tests/CMakeLists.txt
--- a/platforms/opencl/tests/OpenCLTests.h
+++ b/platforms/opencl/tests/OpenCLTests.h
--- a/platforms/opencl/tests/TestOpenCLAndersenThermostat.cpp
+++ b/platforms/opencl/tests/TestOpenCLAndersenThermostat.cpp
--- a/platforms/opencl/tests/TestOpenCLBrownianIntegrator.cpp
+++ b/platforms/opencl/tests/TestOpenCLBrownianIntegrator.cpp
--- a/platforms/opencl/tests/TestOpenCLCMAPTorsionForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCMAPTorsionForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCMMotionRemover.cpp
+++ b/platforms/opencl/tests/TestOpenCLCMMotionRemover.cpp
--- a/platforms/opencl/tests/TestOpenCLCheckpoints.cpp
+++ b/platforms/opencl/tests/TestOpenCLCheckpoints.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomAngleForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomAngleForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomBondForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomBondForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomCentroidBondForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomCentroidBondForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomExternalForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomExternalForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomGBForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomGBForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomHbondForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomHbondForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomIntegrator.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomIntegrator.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomManyParticleForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomManyParticleForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomNonbondedForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomNonbondedForce.cpp
--- a/platforms/opencl/tests/TestOpenCLCustomTorsionForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomTorsionForce.cpp
--- a/platforms/opencl/tests/TestOpenCLEwald.cpp
+++ b/platforms/opencl/tests/TestOpenCLEwald.cpp
--- a/platforms/opencl/tests/TestOpenCLGBSAOBCForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLGBSAOBCForce.cpp