Continuing to implement ReferencePlatform

platforms/reference/src/SimTKReference/ReferenceBondIxn.cpp

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

platforms/reference/src/SimTKReference/ReferenceConstraint.cpp

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

platforms/reference/src/SimTKReference/ReferenceDynamics.cpp

@@ -25,11 +25,15 @@
 #include <string.h>
 #include <sstream>
 
-#include "SimTKOpenMMCommon.h"
-#include "SimTKOpenMMLog.h"
-#include "SimTKOpenMMUtilities.h"
+#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "../SimTKUtilities/SimTKOpenMMLog.h"
+#include "../SimTKUtilities/SimTKOpenMMUtilities.h"
 #include "ReferenceDynamics.h"
 
+const int ReferenceDynamics::DefaultReturn      = 0;
+const int ReferenceDynamics::ErrorReturn        = -1;
+
+
 /**---------------------------------------------------------------------------------------
 
    ReferenceDynamics constructor

platforms/reference/src/SimTKReference/ReferenceDynamics.h

@@ -49,8 +49,8 @@ class ReferenceDynamics {
       
          --------------------------------------------------------------------------------------- */
 
-       static const int DefaultReturn      = 0;
-       static const int ErrorReturn        = -1;
+       static const int DefaultReturn;
+       static const int ErrorReturn;
 
    private:
 

platforms/reference/src/SimTKReference/ReferenceForce.cpp

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

platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp

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

platforms/reference/src/SimTKReference/ReferenceLJ14.cpp

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

platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp

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

platforms/reference/src/SimTKReference/ReferencePairIxn.cpp

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

platforms/reference/src/SimTKReference/ReferenceProperDihedralBond.cpp

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

platforms/reference/src/SimTKReference/ReferenceRbDihedralBond.cpp

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

platforms/reference/src/SimTKReference/ReferenceShakeAlgorithm.cpp

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

platforms/reference/src/SimTKReference/ReferenceStochasticDynamics.cpp

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

platforms/reference/src/SimTKUtilities/SimTKOpenMMGpuUtilities.cpp

@@ -31,12 +31,12 @@
 
 #include <math.h>
 
-#define UseGromacsMalloc 1
-#ifdef UseGromacsMalloc
-extern "C" {
-#include "smalloc.h" 
-}
-#endif
+//#define UseGromacsMalloc 1
+//#ifdef UseGromacsMalloc
+//extern "C" {
+//#include "smalloc.h" 
+//}
+//#endif
 
 /* ---------------------------------------------------------------------------------------