* removed wrong error message

34b632a1 · Paul Heinzlreiter · b8fc6669 · 34b632a1 · 34b632a1 · 34b632a1
Commit 34b632a1 authored 8 years ago by Paul Heinzlreiter
--- a/bh_tree_mpi/datastructures/Box.cpp
+++ b/bh_tree_mpi/datastructures/Box.cpp
@@ -255,8 +255,9 @@ namespace nbody {
 	}

 	void Box::print() {
+		cout << "------" << endl;
 		for (int i = 0; i < 3; i++) {
-			cout << i << " min " << this->min[i] << " max " << this->max[i] << endl;
+			cout << " min " << this->min[i] << " max " << this->max[i] << endl;
 		}
 	}


--- a/bh_tree_mpi/datastructures/Tree.cpp
+++ b/bh_tree_mpi/datastructures/Tree.cpp
@@ -92,16 +92,6 @@ namespace nbody {
 		return result;
 	}

-	void Tree::moveBodies() {
-		for (Node* n = this->nodes->next; n != this->nodes; n = n->next) {
-			if (n->leaf) {
-				for (vector<Body>::iterator it = n->bodies.begin(); it != n->bodies.end(); it++) {
-					it->integrate();
-				}
-			}
-		}
-	}
-
 	vector<Body> Tree::extractLocalBodies() {
 		vector<Body> result;


--- a/bh_tree_mpi/datastructures/Tree.hpp
+++ b/bh_tree_mpi/datastructures/Tree.hpp
@@ -28,7 +28,6 @@ namespace nbody {
 		virtual unsigned long numberOfNodes();
 		virtual void accumulateForceOnto(Body& body);
 		virtual void computeForces();
-		virtual void moveBodies();
 		virtual vector<Body> extractLocalBodies();
 		virtual vector<Body> copyRefinements(Box domain);
 		virtual void rebuild(Box domain);

--- a/bh_tree_mpi/parallelization/MpiBodyComm.cpp
+++ b/bh_tree_mpi/parallelization/MpiBodyComm.cpp
@@ -50,7 +50,7 @@ namespace nbody {
 	bool MpiBodyComm::sendUnblocking(int target, vector<Body> bodies) {
 		if (this->request != MPI::REQUEST_NULL && !this->request.Test()) {
 			//unblocking send still not finished
-			cout << "Test failed" << endl;
+			//cout << "Test failed" << endl;
 			return false;
 		}
 		/*

--- a/bh_tree_mpi/parallelization/MpiSimulation.cpp
+++ b/bh_tree_mpi/parallelization/MpiSimulation.cpp
@@ -182,17 +182,23 @@ namespace nbody {
 	void MpiSimulation::runStep() {
 		Box overallDomain;

-		this->distributeDomains();
-		//this->domains[this->mpiRank].print();
-		for (unsigned int i = 0; i < this->mpiSize; i++) {
-			overallDomain.extend(this->domains[i]);
+		for (int k = 0; k < 3; k++) {
+			this->distributeDomains();
+			//this->domains[this->mpiRank].print();
+			for (unsigned int i = 0; i < this->mpiSize; i++) {
+				overallDomain.extend(this->domains[i]);
+			}
+			/*
+			if (this->mpiRank == 0) {
+				overallDomain.print();
+			}
+			*/
+			this->tree.rebuild(overallDomain);
+			this->distributeLETs();
+			this->tree.computeForces();
+			this->tree.advance();
+			this->domains[this->mpiRank] = this->tree.getLocalBB();
 		}
-		//overallDomain.print();
-		this->tree.rebuild(overallDomain);
-		this->distributeLETs();
-		this->tree.computeForces();
-		this->tree.advance();
-		this->domains[this->mpiRank] = this->tree.getLocalBB();
 	}

 }