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

2d2f05ce · Andy Simmonett · 94823d84 · 4d32047c · 2d2f05ce · 2d2f05ce
Commit 2d2f05ce authored Dec 08, 2015 by Andy Simmonett
20 changed files
--- a/plugins/amoeba/platforms/reference/CMakeLists.txt
+++ b/plugins/amoeba/platforms/reference/CMakeLists.txt
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.cpp
--- a/plugins/cpupme/src/CpuPmeKernels.cpp
+++ b/plugins/cpupme/src/CpuPmeKernels.cpp
--- a/plugins/cpupme/src/CpuPmeKernels.h
+++ b/plugins/cpupme/src/CpuPmeKernels.h
--- a/plugins/drude/CMakeLists.txt
+++ b/plugins/drude/CMakeLists.txt
--- a/plugins/drude/openmmapi/include/openmm/DrudeForce.h
+++ b/plugins/drude/openmmapi/include/openmm/DrudeForce.h
--- a/plugins/drude/openmmapi/include/openmm/DrudeLangevinIntegrator.h
+++ b/plugins/drude/openmmapi/include/openmm/DrudeLangevinIntegrator.h
--- a/plugins/drude/openmmapi/src/DrudeLangevinIntegrator.cpp
+++ b/plugins/drude/openmmapi/src/DrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/cuda/src/CudaDrudeKernels.cpp
+++ b/plugins/drude/platforms/cuda/src/CudaDrudeKernels.cpp
--- a/plugins/drude/platforms/cuda/src/CudaDrudeKernels.h
+++ b/plugins/drude/platforms/cuda/src/CudaDrudeKernels.h
--- a/plugins/drude/platforms/cuda/src/kernels/drudeLangevin.cu
+++ b/plugins/drude/platforms/cuda/src/kernels/drudeLangevin.cu
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.cpp
+++ b/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.cpp
--- a/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.h
+++ b/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.h
--- a/plugins/drude/platforms/opencl/src/kernels/drudeLangevin.cl
+++ b/plugins/drude/platforms/opencl/src/kernels/drudeLangevin.cl
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/reference/CMakeLists.txt
+++ b/plugins/drude/platforms/reference/CMakeLists.txt
--- a/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.cpp
+++ b/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.cpp
--- a/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.h
+++ b/plugins/drude/platforms/reference/src/ReferenceDrudeKernels.h
--- a/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp