Merge github.com:leeping/openmm

platforms/reference/src/SimTKReference/ReferenceRbDihedralBond.cpp

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMLog.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceRbDihedralBond.h"
 #include "ReferenceForce.h"
 

platforms/reference/src/SimTKReference/ReferenceShakeAlgorithm.cpp

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMLog.h"
 #include "ReferenceShakeAlgorithm.h"
 #include "ReferenceDynamics.h"
 #include "openmm/OpenMMException.h"

platforms/reference/src/SimTKReference/ReferenceStochasticDynamics.cpp

@@ -25,9 +25,9 @@
 #include <cstring>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMLog.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceStochasticDynamics.h"
 #include "ReferenceVirtualSites.h"
 

platforms/reference/src/SimTKReference/ReferenceVariableStochasticDynamics.cpp

@@ -25,9 +25,9 @@
 #include <cstring>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMLog.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceVariableStochasticDynamics.h"
 #include "ReferenceVirtualSites.h"
 

platforms/reference/src/SimTKReference/ReferenceVariableVerletDynamics.cpp

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMLog.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceVariableVerletDynamics.h"
 #include "ReferenceVirtualSites.h"
 

platforms/reference/src/SimTKReference/ReferenceVerletDynamics.cpp

@@ -25,9 +25,9 @@
 #include <cstring>
 #include <sstream>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKUtilities/SimTKOpenMMLog.h"
-#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
+#include "SimTKOpenMMCommon.h"
+#include "SimTKOpenMMLog.h"
+#include "SimTKOpenMMUtilities.h"
 #include "ReferenceVerletDynamics.h"
 #include "ReferenceVirtualSites.h"
 

platforms/reference/src/gbsa/CpuGBVI.cpp

@@ -26,8 +26,8 @@
 #include <sstream>
 #include <stdio.h>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKReference/ReferenceForce.h"
+#include "SimTKOpenMMCommon.h"
+#include "ReferenceForce.h"
 #include "CpuGBVI.h"
 
 using namespace std;

platforms/reference/src/gbsa/CpuObc.cpp

@@ -28,8 +28,8 @@
 #include <cmath>
 #include <cstdio>
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
-#include "../SimTKReference/ReferenceForce.h"
+#include "SimTKOpenMMCommon.h"
+#include "ReferenceForce.h"
 #include "CpuObc.h"
 
 using namespace OpenMM;

platforms/reference/src/gbsa/GBVIParameters.cpp

@@ -28,7 +28,7 @@
 
 #include "openmm/OpenMMException.h"
 #include "GBVIParameters.h"
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 
 using std::vector;
 using OpenMM::RealVec;

platforms/reference/src/gbsa/ObcParameters.cpp

@@ -28,7 +28,7 @@
 
 #include "openmm/OpenMMException.h"
 #include "ObcParameters.h"
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 
 using std::vector;
 

platforms/reference/tests/TestReferenceAndersenThermostat.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/tests/TestReferenceBrownianIntegrator.cpp

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

platforms/reference/tests/TestReferenceCMAPTorsionForce.cpp

@@ -40,7 +40,7 @@
 #include "openmm/PeriodicTorsionForce.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/tests/TestReferenceCMMotionRemover.cpp

@@ -41,7 +41,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/tests/TestReferenceCustomBondForce.cpp

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

platforms/reference/tests/TestReferenceCustomExternalForce.cpp

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

platforms/reference/tests/TestReferenceCustomIntegrator.cpp

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

platforms/reference/tests/TestReferenceEwald.cpp

@@ -39,7 +39,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 "openmm/HarmonicBondForce.h"
 #include <iostream>

platforms/reference/tests/TestReferenceGBSAOBCForce.cpp

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

platforms/reference/tests/TestReferenceGBVIForce.cpp

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