* added example data and body weight

efe9ae0c · Paul Heinzlreiter · b23a6c37 · efe9ae0c · efe9ae0c · efe9ae0c
Commit efe9ae0c authored 8 years ago by Paul Heinzlreiter
--- a/bh_tree_mpi/data/dubinski.tab
+++ b/bh_tree_mpi/data/dubinski.tab
--- a/bh_tree_mpi/datastructures/BarnesHutTree.cpp
+++ b/bh_tree_mpi/datastructures/BarnesHutTree.cpp
@@ -37,7 +37,20 @@ namespace nbody {
 		this->nodes.front()->extendBBtoCube();
 		it = this->nodes.begin();
 		while (it != this->nodes.end()) {
-
+			(*it)->afterSubtree = it;
+			(*it)->afterSubtree++;
+			if ((*it)->isSplitable()) {
+				vector<Box> subboxes = this->splitBB(*it);
+				for (vector<Box>::iterator bit = subboxes.begin(); bit != subboxes.end(); bit++) {
+					TreeNode* current = new TreeNode();
+
+					current->bb = *bit;
+					current->bodies = bit->containedBodies((*it)->getBodies());
+					this->nodes.insert((*it)->afterSubtree, current);
+				}
+				(*it)->bodies.clear();
+			}
+			it++;
 		}
 	}


--- a/bh_tree_mpi/datastructures/Body.cpp
+++ b/bh_tree_mpi/datastructures/Body.cpp
@@ -24,6 +24,7 @@ namespace nbody {
 			this->velocity[i] = 0.0;
 			this->acceleration[i] = 0.0;
 		}
+		this->weight = 1.0;
 	}

 	Body::Body(double positionX, double positionY, double positionZ) {
@@ -34,6 +35,7 @@ namespace nbody {
 		this->position[0] = positionX;
 		this->position[1] = positionY;
 		this->position[2] = positionZ;
+		this->weight = 1.0;
 	}

 	Body::Body(double positionX, double positionY, double positionZ, double velocityX, double velocityY, double velocityZ) {
@@ -46,6 +48,31 @@ namespace nbody {
 		this->velocity[0] = velocityX;
 		this->velocity[1] = velocityY;
 		this->velocity[2] = velocityZ;
+		this->weight = 1.0;
+	}
+
+	Body::Body(double positionX, double positionY, double positionZ, double weight) {
+		for (int i = 0; i < 3; i++) {
+			this->velocity[i] = 0.0;
+			this->acceleration[i] = 0.0;
+		}
+		this->position[0] = positionX;
+		this->position[1] = positionY;
+		this->position[2] = positionZ;
+		this->weight = weight;
+	}
+
+	Body::Body(double positionX, double positionY, double positionZ, double velocityX, double velocityY, double velocityZ, double weight) {
+		for (int i = 0; i < 3; i++) {
+			this->acceleration[i] = 0.0;
+		}
+		this->position[0] = positionX;
+		this->position[1] = positionY;
+		this->position[2] = positionZ;
+		this->velocity[0] = velocityX;
+		this->velocity[1] = velocityY;
+		this->velocity[2] = velocityZ;
+		this->weight = weight;
 	}

 	Body::~Body() {

--- a/bh_tree_mpi/datastructures/Body.hpp
+++ b/bh_tree_mpi/datastructures/Body.hpp
@@ -10,12 +10,15 @@ namespace nbody {
 		double position[3];
 		double velocity[3];
 		double acceleration[3];
+		double weight;

 		Derivative evaluate(double dt, Derivative d);
 	public:
 		Body();
 		Body(double positionX, double positionY, double positionZ);
 		Body(double positionX, double positionY, double positionZ, double velocityX, double velocityY, double velocityZ);
+		Body(double positionX, double positionY, double positionZ, double weight);
+		Body(double positionX, double positionY, double positionZ, double velocityX, double velocityY, double velocityZ, double weight);
 		virtual ~Body();
 		virtual double getPosition(int index);
 		virtual void integrate();

--- a/bh_tree_mpi/datastructures/TreeNode.cpp
+++ b/bh_tree_mpi/datastructures/TreeNode.cpp
@@ -21,6 +21,9 @@ namespace nbody {
 	}

 	bool TreeNode::isSplitable() {
+		if (this->bodies.size() < 2) {
+			return false;
+		}
 		for (int i = 0; i < 3; i++) {
 			if (this->bb.max[i] - this->bb.min[i] < FLT_MIN) {
 				return false;
@@ -50,4 +53,8 @@ namespace nbody {
 	void TreeNode::extendBBtoCube() {
 		this->bb.extendToCube();
 	}
+
+	vector<Body> TreeNode::getBodies() {
+		return this->bodies;
+	}
 }
--- a/bh_tree_mpi/datastructures/TreeNode.hpp
+++ b/bh_tree_mpi/datastructures/TreeNode.hpp
@@ -10,10 +10,12 @@ namespace nbody {
 	using namespace std;

 	class TreeNode {
+		friend class Tree;
+		friend class BarnesHutTree;
 	protected:
 		Box bb;
 		vector<Body> bodies;
-		TreeNode* afterMySubtree;
+		vector<TreeNode*>::iterator afterSubtree;
 	public:
 		TreeNode();
 		virtual ~TreeNode();
@@ -21,6 +23,7 @@ namespace nbody {
 		virtual void extendBBforBodies();
 		virtual void extendBBtoCube();
 		virtual Box getBB();
+		virtual vector<Body> getBodies();
 	};
 }


--- a/bh_tree_mpi/main.cpp
+++ b/bh_tree_mpi/main.cpp
+#include "datastructures/BarnesHutTree.hpp"
+
+using namespace nbody;
+
 int main(int argc, char* argv[]) {
+	BarnesHutTree tree;

+	//tree.build()
 	return 0;
 }