Merge github.com:leeping/openmm

e3b25204 · leeping · 41e9a095 · 74415dd9 · e3b25204 · e3b25204
Commit e3b25204 authored Jul 15, 2013 by leeping
20 changed files
--- a/plugins/drude/platforms/opencl/CMakeLists.txt
+++ b/plugins/drude/platforms/opencl/CMakeLists.txt
--- a/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.cpp
+++ b/plugins/drude/platforms/opencl/src/OpenCLDrudeKernels.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
--- 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/TestReferenceDrudeForce.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeForce.cpp
--- a/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/reference/tests/TestReferenceDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/reference/tests/TestReferenceDrudeSCFIntegrator.cpp
--- a/plugins/rpmd/platforms/cuda/CMakeLists.txt
+++ b/plugins/rpmd/platforms/cuda/CMakeLists.txt
--- a/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/cuda/src/CudaRpmdKernels.cpp
--- a/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+++ b/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
--- a/plugins/rpmd/platforms/opencl/CMakeLists.txt
+++ b/plugins/rpmd/platforms/opencl/CMakeLists.txt
--- a/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernels.cpp
--- a/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+++ b/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
--- a/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
+++ b/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.cpp
--- a/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.h
+++ b/plugins/rpmd/platforms/reference/src/ReferenceRpmdKernels.h
--- a/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
+++ b/plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp
--- a/tests/TestParser.cpp
+++ b/tests/TestParser.cpp