Merge branch 'master' of github.com:SimTk/openmm

99ef4344 · Lee-Ping Wang · 471bea82 · 79fd69c3 · 99ef4344 · 99ef4344
Commit 99ef4344 authored Oct 24, 2013 by Lee-Ping Wang
20 changed files
--- a/platforms/reference/src/SimTKReference/PME.cpp
+++ b/platforms/reference/src/SimTKReference/PME.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceSETTLEAlgorithm.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceSETTLEAlgorithm.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceShakeAlgorithm.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceShakeAlgorithm.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceStochasticDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceStochasticDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceVariableStochasticDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceVariableStochasticDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceVariableVerletDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceVariableVerletDynamics.cpp
--- a/platforms/reference/src/SimTKReference/ReferenceVerletDynamics.cpp
+++ b/platforms/reference/src/SimTKReference/ReferenceVerletDynamics.cpp
--- a/platforms/reference/tests/TestReferenceBrownianIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceBrownianIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceCustomIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceCustomIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceLangevinIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceLangevinIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceNeighborList.cpp
+++ b/platforms/reference/tests/TestReferenceNeighborList.cpp
--- a/platforms/reference/tests/TestReferenceSettle.cpp
+++ b/platforms/reference/tests/TestReferenceSettle.cpp
--- a/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableLangevinIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVariableVerletIntegrator.cpp
--- a/platforms/reference/tests/TestReferenceVerletIntegrator.cpp
+++ b/platforms/reference/tests/TestReferenceVerletIntegrator.cpp
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/amoebaKernels.h
+++ b/plugins/amoeba/openmmapi/include/openmm/amoebaKernels.h
--- a/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaMultipoleForceImpl.h
+++ b/plugins/amoeba/openmmapi/include/openmm/internal/AmoebaMultipoleForceImpl.h
--- a/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaMultipoleForceImpl.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaMultipoleForceImpl.cpp