Merge branch 'master' into gayberne

2e9c418a · peastman · 8f532e31 · a4d327f5 · 2e9c418a · 2e9c418a
Commit 2e9c418a authored May 05, 2016 by peastman
20 changed files
--- a/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaStretchBendForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp
+++ b/plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaInPlaneForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaInPlaneForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaOutOfPlaneBendForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaOutOfPlaneBendForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaPiTorsionForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaPiTorsionForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaStretchBendForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaStretchBendForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaTorsionTorsionForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaTorsionTorsionForce.cu
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaAngleForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaAngleForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaBondForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaBondForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaMultipoleForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaWcaDispersionForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaWcaDispersionForce.cpp