Merge branch 'master' of github.com:SimTk/openmm

4233befd · leeping · eb9f735a · 31d02cdc · 4233befd · 4233befd
Commit 4233befd authored Mar 12, 2014 by leeping
18 changed files
--- a/openmmapi/src/ThreadPool.cpp
+++ b/openmmapi/src/ThreadPool.cpp
--- a/platforms/cpu/include/CpuPlatform.h
+++ b/platforms/cpu/include/CpuPlatform.h
--- a/platforms/cpu/src/CpuPlatform.cpp
+++ b/platforms/cpu/src/CpuPlatform.cpp
--- a/platforms/cpu/src/CpuSETTLE.cpp
+++ b/platforms/cpu/src/CpuSETTLE.cpp
--- a/platforms/cuda/tests/CMakeLists.txt
+++ b/platforms/cuda/tests/CMakeLists.txt
--- a/platforms/cuda/tests/TestCudaCustomCompoundBondForce.cpp
+++ b/platforms/cuda/tests/TestCudaCustomCompoundBondForce.cpp
--- a/platforms/cuda/tests/TestCudaEwald.cpp
+++ b/platforms/cuda/tests/TestCudaEwald.cpp
--- a/platforms/opencl/src/OpenCLFFT3D.cpp
+++ b/platforms/opencl/src/OpenCLFFT3D.cpp
--- a/platforms/opencl/tests/CMakeLists.txt
+++ b/platforms/opencl/tests/CMakeLists.txt
--- a/platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp
+++ b/platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp
--- a/platforms/opencl/tests/TestOpenCLEwald.cpp
+++ b/platforms/opencl/tests/TestOpenCLEwald.cpp
--- a/platforms/opencl/tests/TestOpenCLGBSAOBCForce2.cpp
+++ b/platforms/opencl/tests/TestOpenCLGBSAOBCForce2.cpp
--- a/platforms/reference/src/ReferenceTabulatedFunction.cpp
+++ b/platforms/reference/src/ReferenceTabulatedFunction.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.cpp
--- a/platforms/reference/tests/TestReferenceCustomCompoundBondForce.cpp
+++ b/platforms/reference/tests/TestReferenceCustomCompoundBondForce.cpp
--- a/platforms/reference/tests/TestReferenceCustomNonbondedForce.cpp
+++ b/platforms/reference/tests/TestReferenceCustomNonbondedForce.cpp
--- a/platforms/reference/tests/TestReferenceEwald.cpp
+++ b/platforms/reference/tests/TestReferenceEwald.cpp
--- a/wrappers/python/simtk/openmm/app/desmonddmsfile.py
+++ b/wrappers/python/simtk/openmm/app/desmonddmsfile.py