Merge https://github.com/SimTk/openmm

platforms/opencl/tests/TestOpenCLEwald.cpp

@@ -42,7 +42,7 @@
 #include "openmm/LangevinIntegrator.h"
 #include "openmm/VerletIntegrator.h"
 #include "openmm/internal/ContextImpl.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLFFT.cpp

@@ -34,11 +34,11 @@
  */
 
 #include "openmm/internal/AssertionUtilities.h"
-#include "../src/OpenCLArray.h"
-#include "../src/OpenCLContext.h"
-#include "../src/OpenCLFFT3D.h"
-#include "../src/OpenCLSort.h"
-#include "../src/SimTKReference/fftpack.h"
+#include "OpenCLArray.h"
+#include "OpenCLContext.h"
+#include "OpenCLFFT3D.h"
+#include "OpenCLSort.h"
+#include "fftpack.h"
 #include "sfmt/SFMT.h"
 #include "openmm/System.h"
 #include <iostream>

platforms/opencl/tests/TestOpenCLGBSAOBCForce.cpp

@@ -40,7 +40,7 @@
 #include "openmm/GBSAOBCForce.h"
 #include "openmm/System.h"
 #include "openmm/LangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include "openmm/NonbondedForce.h"
 #include <iostream>

platforms/opencl/tests/TestOpenCLGBSAOBCForce2.cpp

@@ -58,7 +58,7 @@
 #include "openmm/internal/AssertionUtilities.h"
 #include "openmm/Context.h"
 #include "openmm/System.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "OpenMM.h"
 
 #if TEST_PLATFORM == TEST_OPENCL_PLATFORM

platforms/opencl/tests/TestOpenCLHarmonicAngleForce.cpp

@@ -40,7 +40,7 @@
 #include "openmm/HarmonicAngleForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/opencl/tests/TestOpenCLLangevinIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/LangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLMonteCarloBarostat.cpp

@@ -42,7 +42,7 @@
 #include "openmm/LangevinIntegrator.h"
 #include "openmm/VerletIntegrator.h"
 #include "sfmt/SFMT.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/opencl/tests/TestOpenCLMultipleForces.cpp

@@ -44,7 +44,7 @@
 #include "openmm/RBTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLNonbondedForce.cpp

@@ -45,7 +45,7 @@
 #include "openmm/internal/ContextImpl.h"
 #include "OpenCLArray.h"
 #include "OpenCLNonbondedUtilities.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLPeriodicTorsionForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/PeriodicTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/opencl/tests/TestOpenCLRBTorsionForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/RBTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/opencl/tests/TestOpenCLRandom.cpp

@@ -34,14 +34,14 @@
  */
 
 #include "openmm/internal/AssertionUtilities.h"
-#include "../src/OpenCLArray.h"
-#include "../src/OpenCLContext.h"
-#include "../src/OpenCLIntegrationUtilities.h"
+#include "OpenCLArray.h"
+#include "OpenCLContext.h"
+#include "OpenCLIntegrationUtilities.h"
 #include "openmm/System.h"
 #include "openmm/Context.h"
 #include "OpenCLPlatform.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 
 using namespace OpenMM;

platforms/opencl/tests/TestOpenCLSort.cpp

@@ -34,9 +34,9 @@
  */
 
 #include "openmm/internal/AssertionUtilities.h"
-#include "../src/OpenCLArray.h"
-#include "../src/OpenCLContext.h"
-#include "../src/OpenCLSort.h"
+#include "OpenCLArray.h"
+#include "OpenCLContext.h"
+#include "OpenCLSort.h"
 #include "sfmt/SFMT.h"
 #include "openmm/System.h"
 #include <iostream>

platforms/opencl/tests/TestOpenCLVariableLangevinIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VariableLangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLVariableVerletIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VariableVerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/tests/TestOpenCLVerletIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/reference/src/gbsa/CpuGBVI.h → platforms/reference/include/CpuGBVI.h

@@ -27,7 +27,7 @@
 
 #include <vector>
 
-#include "../SimTKUtilities/RealVec.h"
+#include "RealVec.h"
 #include "GBVIParameters.h"
 
 // ---------------------------------------------------------------------------------------

platforms/reference/src/gbsa/GBVIParameters.h → platforms/reference/include/GBVIParameters.h

@@ -25,7 +25,7 @@
 #ifndef __GBVIParameters_H__
 #define __GBVIParameters_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 
 // ---------------------------------------------------------------------------------------
 

platforms/reference/src/gbsa/ObcParameters.h → platforms/reference/include/ObcParameters.h

@@ -25,7 +25,7 @@
 #ifndef __ObcParameters_H__
 #define __ObcParameters_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 
 // ---------------------------------------------------------------------------------------