Merge branch 'master' of github.com:pandegroup/openmm into genpt

6bde69d9 · Andy Simmonett · e6dbc863 · ec799972 · 6bde69d9 · 6bde69d9
Commit 6bde69d9 authored Sep 25, 2015 by Andy Simmonett
20 changed files
--- a/platforms/cuda/tests/TestCudaVariableLangevinIntegrator.cpp
+++ b/platforms/cuda/tests/TestCudaVariableLangevinIntegrator.cpp
--- a/platforms/cuda/tests/TestCudaVariableVerletIntegrator.cpp
+++ b/platforms/cuda/tests/TestCudaVariableVerletIntegrator.cpp
--- a/platforms/cuda/tests/TestCudaVerletIntegrator.cpp
+++ b/platforms/cuda/tests/TestCudaVerletIntegrator.cpp
--- a/platforms/cuda/tests/TestCudaVirtualSites.cpp
+++ b/platforms/cuda/tests/TestCudaVirtualSites.cpp
--- a/platforms/cuda/tests/nacl_amorph.dat
+++ b/platforms/cuda/tests/nacl_amorph.dat
--- a/platforms/opencl/include/OpenCLExpressionUtilities.h
+++ b/platforms/opencl/include/OpenCLExpressionUtilities.h
--- a/platforms/opencl/include/OpenCLNonbondedUtilities.h
+++ b/platforms/opencl/include/OpenCLNonbondedUtilities.h
--- a/platforms/opencl/src/OpenCLBondedUtilities.cpp
+++ b/platforms/opencl/src/OpenCLBondedUtilities.cpp
--- a/platforms/opencl/src/OpenCLExpressionUtilities.cpp
+++ b/platforms/opencl/src/OpenCLExpressionUtilities.cpp
--- a/platforms/opencl/src/OpenCLKernels.cpp
+++ b/platforms/opencl/src/OpenCLKernels.cpp
--- a/platforms/opencl/src/OpenCLNonbondedUtilities.cpp
+++ b/platforms/opencl/src/OpenCLNonbondedUtilities.cpp
--- a/platforms/opencl/src/kernels/nonbonded.cl
+++ b/platforms/opencl/src/kernels/nonbonded.cl
--- 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