Merge branch 'master' into hardwall

cecc774a · Peter Eastman · 1dfa0e59 · a20944f6 · cecc774a · cecc774a
Commit cecc774a authored Oct 05, 2015 by Peter Eastman
20 changed files
--- a/platforms/cuda/tests/TestCudaCustomTorsionForce.cpp
+++ b/platforms/cuda/tests/TestCudaCustomTorsionForce.cpp
--- a/platforms/cuda/tests/TestCudaEwald.cpp
+++ b/platforms/cuda/tests/TestCudaEwald.cpp
--- a/platforms/cuda/tests/TestCudaGBSAOBCForce.cpp
+++ b/platforms/cuda/tests/TestCudaGBSAOBCForce.cpp
--- a/platforms/cuda/tests/TestCudaHarmonicAngleForce.cpp
+++ b/platforms/cuda/tests/TestCudaHarmonicAngleForce.cpp
--- a/platforms/cuda/tests/TestCudaHarmonicBondForce.cpp
+++ b/platforms/cuda/tests/TestCudaHarmonicBondForce.cpp
--- a/platforms/cuda/tests/TestCudaLangevinIntegrator.cpp
+++ b/platforms/cuda/tests/TestCudaLangevinIntegrator.cpp
--- a/platforms/cuda/tests/TestCudaLocalEnergyMinimizer.cpp
+++ b/platforms/cuda/tests/TestCudaLocalEnergyMinimizer.cpp
--- a/platforms/cuda/tests/TestCudaMonteCarloAnisotropicBarostat.cpp
+++ b/platforms/cuda/tests/TestCudaMonteCarloAnisotropicBarostat.cpp
--- a/platforms/cuda/tests/TestCudaMonteCarloBarostat.cpp
+++ b/platforms/cuda/tests/TestCudaMonteCarloBarostat.cpp
--- a/platforms/cuda/tests/TestCudaNonbondedForce.cpp
+++ b/platforms/cuda/tests/TestCudaNonbondedForce.cpp
--- a/platforms/cuda/tests/TestCudaPeriodicTorsionForce.cpp
+++ b/platforms/cuda/tests/TestCudaPeriodicTorsionForce.cpp
--- a/platforms/cuda/tests/TestCudaRBTorsionForce.cpp
+++ b/platforms/cuda/tests/TestCudaRBTorsionForce.cpp
--- a/platforms/cuda/tests/TestCudaSettle.cpp
+++ b/platforms/cuda/tests/TestCudaSettle.cpp
--- 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/CMakeLists.txt
+++ b/platforms/opencl/CMakeLists.txt
@@ -13,9 +13,9 @@
 #----------------------------------------------------

 set(OPENMM_BUILD_OPENCL_TESTS TRUE CACHE BOOL "Whether to build OpenCL test cases")
-if(OPENMM_BUILD_OPENCL_TESTS)
+if(BUILD_TESTING AND OPENMM_BUILD_OPENCL_TESTS)
    SUBDIRS (tests)
-endif(OPENMM_BUILD_OPENCL_TESTS)
+endif(BUILD_TESTING AND OPENMM_BUILD_OPENCL_TESTS)

 # The source is organized into subdirectories, but we handle them all from
 # this CMakeLists file rather than letting CMake visit them as SUBDIRS.

--- a/platforms/opencl/include/OpenCLExpressionUtilities.h
+++ b/platforms/opencl/include/OpenCLExpressionUtilities.h