Merge github.com:leeping/openmm

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;
@@ -54,7 +54,7 @@ void testGaussian() {
     System system;
     for (int i = 0; i < numAtoms; i++)
         system.addParticle(1.0);
-    OpenCLPlatform::PlatformData platformData(system, "", "", platform.getPropertyDefaultValue("OpenCLPrecision"));
+    OpenCLPlatform::PlatformData platformData(system, "", "", platform.getPropertyDefaultValue("OpenCLPrecision"), "false");
     OpenCLContext& context = *platformData.contexts[0];
     context.initialize();
     context.getIntegrationUtilities().initRandomNumberGenerator(0);

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>
@@ -64,7 +64,7 @@ void verifySorting(vector<float> array) {
 
     System system;
     system.addParticle(0.0);
-    OpenCLPlatform::PlatformData platformData(system, "", "", platform.getPropertyDefaultValue("OpenCLPrecision"));
+    OpenCLPlatform::PlatformData platformData(system, "", "", platform.getPropertyDefaultValue("OpenCLPrecision"), "false");
     OpenCLContext& context = *platformData.contexts[0];
     context.initialize();
     OpenCLArray data(context, array.size(), sizeof(float), "sortData");

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"
 
 // ---------------------------------------------------------------------------------------
 

platforms/reference/src/SimTKReference/ReferenceAndersenThermostat.h → platforms/reference/include/ReferenceAndersenThermostat.h

@@ -25,7 +25,7 @@
 #ifndef __ReferenceAndersenThermostat_H__
 #define __ReferenceAndersenThermostat_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 #include <vector>
 
 // ---------------------------------------------------------------------------------------

platforms/reference/src/SimTKReference/ReferenceCMAPTorsionIxn.h → platforms/reference/include/ReferenceCMAPTorsionIxn.h

@@ -25,8 +25,8 @@
 #ifndef __ReferenceCMAPTorsionIxn_H__
 #define __ReferenceCMAPTorsionIxn_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceBondIxn.h"
 #include <vector>
 

platforms/reference/src/SimTKReference/ReferenceConstraintAlgorithm.h → platforms/reference/include/ReferenceConstraintAlgorithm.h

@@ -25,7 +25,7 @@
 #ifndef __ReferenceConstraintAlgorithm_H__
 #define __ReferenceConstraintAlgorithm_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 #include "openmm/internal/windowsExport.h"
 
 /**