reordered initializers to avoid warning messages

RigidBody.h

@@ -40,7 +40,7 @@ class RigidBody { // host side representation of rigid bodies
 
 	// HOST DEVICE void integrate(Vector3& old_trans, Matrix3& old_rot, int startFinishAll);
 	// HOST DEVICE void integrate(Vector3& old_trans, Matrix3& old_rot, int startFinishAll);
-	HOST DEVICE void integrate(int startFinishAll);
+	void integrate(int startFinishAll);
 	
 	// HOST DEVICE inline String getKey() const { return key; }
 	// HOST DEVICE inline String getKey() const { return t->name; }

RigidBodyController.h

@@ -6,7 +6,7 @@
 #include <cuda_runtime.h>
 
 // #define NUMTHREADS 128					/* try with 64, every 32+ */
-#define NUMTHREADS 64
+#define NUMTHREADS 96
 #define NUMSTREAMS 8
 
 class Configuration;
@@ -46,8 +46,6 @@ private:
 	
 	static const int numThreads = NUMTHREADS;
 	
-	bool isPmf;
-	
 	RigidBodyType* type1;
 	RigidBodyType* type2;
 	RigidBody* rb1;
@@ -56,6 +54,8 @@ private:
 	std::vector<int> gridKeyId1;
 	std::vector<int> gridKeyId2;
 	std::vector<int> numBlocks;
+
+	bool isPmf;
 	
 	std::vector<Vector3*> forces;
 	std::vector<Vector3*> forces_d;

RigidBodyType.h

@@ -35,8 +35,8 @@ public:
 RigidBodyType(const String& name = "") :
 	name(name), num(0),
 	reservoir(NULL), mass(1.0f), inertia(), transDamping(),
-	rotDamping(), numPotGrids(0), numDenGrids(0), numPmfs(0),
-	initPos(), initRot(Matrix3(1.0f))  { }
+	rotDamping(), initPos(), initRot(Matrix3(1.0f)),
+	numPotGrids(0), numDenGrids(0), numPmfs(0) { }
 	
 	/* RigidBodyType(const RigidBodyType& src) { copy(src); } */
 	~RigidBodyType() { clear(); }