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

2d2f05ce · Andy Simmonett · 94823d84 · 4d32047c · 94823d84 · 94823d84
Commit 2d2f05ce authored Dec 08, 2015 by Andy Simmonett
20 changed files
--- a/platforms/reference/src/SimTKReference/GBVIParameters.cpp
+++ b/platforms/reference/src/SimTKReference/GBVIParameters.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceGBVI.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceGBVI.cpp
--- a/platforms/reference/tests/TestReferenceCompoundIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceCompoundIntegrator.cpp
--- a/plugins/amoeba/CMakeLists.txt
+++ b/plugins/amoeba/CMakeLists.txt
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaGk.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaGk.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaWcaForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaWcaForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/multipoleElectrostatics.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/multipoleElectrostatics.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/multipolePme.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/multipolePme.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/pmeMultipoleElectrostatics.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/pmeMultipoleElectrostatics.cu