Merge remote-tracking branch 'upstream/master'

eb232608 · John Chodera (MSKCC) · 62581e9c · 7f8c5089 · eb232608 · eb232608
Commit eb232608 authored Apr 22, 2015 by John Chodera (MSKCC)
20 changed files
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceWcaDispersionForce.h
--- 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
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaVdwForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaVdwForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceWcaDispersionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceWcaDispersionForce.cpp
--- a/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp