Merge github.com:SimTk/openmm

19d2885a · Lee-Ping · 99ef4344 · 57a6768e · 19d2885a · 19d2885a
Commit 19d2885a authored Jan 23, 2014 by Lee-Ping
20 changed files
--- 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/CMakeLists.txt
+++ b/plugins/amoeba/platforms/cuda/CMakeLists.txt
--- a/plugins/amoeba/platforms/cuda/tests/CMakeLists.txt
+++ b/plugins/amoeba/platforms/cuda/tests/CMakeLists.txt
--- a/plugins/amoeba/platforms/reference/CMakeLists.txt
+++ b/plugins/amoeba/platforms/reference/CMakeLists.txt
--- a/plugins/amoeba/platforms/reference/sharedTarget/CMakeLists.txt
+++ b/plugins/amoeba/platforms/reference/sharedTarget/CMakeLists.txt
--- a/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
+++ b/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
--- a/plugins/amoeba/platforms/reference/tests/CMakeLists.txt
+++ b/plugins/amoeba/platforms/reference/tests/CMakeLists.txt
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaBondForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaBondForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaMultipoleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp