Merge remote-tracking branch 'upstream/master'

047934e2 · Rafal P. Wiewiora · ce3a5dc0 · d12c9bd1 · 047934e2 · 047934e2
Commit 047934e2 authored Mar 01, 2017 by Rafal P. Wiewiora
20 changed files
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaMultipoleForce.cpp
--- a/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
+++ b/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
--- a/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernels.cpp
+++ b/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernels.cpp
--- a/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernels.h
+++ b/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernels.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceAngleForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceAngleForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceBondForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceBondForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceBondForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceBondForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceGeneralizedKirkwoodForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceGeneralizedKirkwoodForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceInPlaneAngleForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceInPlaneAngleForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceMultipoleForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h