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

2d2f05ce · Andy Simmonett · 94823d84 · 4d32047c · 2d2f05ce · 2d2f05ce
Commit 2d2f05ce authored Dec 08, 2015 by Andy Simmonett
20 changed files
--- a/openmmapi/include/openmm/State.h
+++ b/openmmapi/include/openmm/State.h
--- a/openmmapi/include/openmm/System.h
+++ b/openmmapi/include/openmm/System.h
--- a/platforms/cpu/src/gmx_atomic.h
+++ b/platforms/cpu/src/gmx_atomic.h
--- a/openmmapi/include/openmm/internal/vectorize_neon.h
+++ b/openmmapi/include/openmm/internal/vectorize_neon.h
--- a/openmmapi/include/openmm/internal/vectorize_pnacl.h
+++ b/openmmapi/include/openmm/internal/vectorize_pnacl.h
--- a/openmmapi/include/openmm/internal/vectorize_sse.h
+++ b/openmmapi/include/openmm/internal/vectorize_sse.h
--- a/openmmapi/src/GBVIForce.cpp
+++ b/openmmapi/src/GBVIForce.cpp
--- a/openmmapi/src/Context.cpp
+++ b/openmmapi/src/Context.cpp
--- a/openmmapi/src/CustomNonbondedForce.cpp
+++ b/openmmapi/src/CustomNonbondedForce.cpp
--- a/openmmapi/src/CustomNonbondedForceImpl.cpp
+++ b/openmmapi/src/CustomNonbondedForceImpl.cpp
--- a/openmmapi/src/GBVIForceImpl.cpp
+++ b/openmmapi/src/GBVIForceImpl.cpp
--- a/openmmapi/src/Integrator.cpp
+++ b/openmmapi/src/Integrator.cpp
--- a/platforms/cpu/CMakeLists.txt
+++ b/platforms/cpu/CMakeLists.txt
--- a/platforms/cpu/include/CpuNeighborList.h
+++ b/platforms/cpu/include/CpuNeighborList.h
--- a/platforms/cpu/src/CpuCustomGBForce.cpp
+++ b/platforms/cpu/src/CpuCustomGBForce.cpp
@@ -28,7 +28,7 @@
 #include "SimTKOpenMMUtilities.h"
 #include "ReferenceForce.h"
 #include "CpuCustomGBForce.h"
-#include "gmx_atomic.h"
+#include "openmm/internal/gmx_atomic.h"

 using namespace OpenMM;
 using namespace std;

--- a/platforms/cpu/src/CpuCustomManyParticleForce.cpp
+++ b/platforms/cpu/src/CpuCustomManyParticleForce.cpp
--- a/platforms/cpu/src/CpuCustomNonbondedForce.cpp
+++ b/platforms/cpu/src/CpuCustomNonbondedForce.cpp
--- a/platforms/cpu/src/CpuGBSAOBCForce.cpp
+++ b/platforms/cpu/src/CpuGBSAOBCForce.cpp
--- a/platforms/cpu/src/CpuKernels.cpp
+++ b/platforms/cpu/src/CpuKernels.cpp
--- a/platforms/cpu/src/CpuNeighborList.cpp
+++ b/platforms/cpu/src/CpuNeighborList.cpp