From 5f7333fc04b33a1749b32b96d4977009b64bac10 Mon Sep 17 00:00:00 2001 From: "armindamon.riess" <armindamon.riess@uzh.ch> Date: Wed, 7 Dec 2022 11:48:07 +0100 Subject: [PATCH] nodes can now access root --- lib/node.cpp | 2 +- lib/node.hpp | 2 +- lib/tree.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/node.cpp b/lib/node.cpp index 6d80492..23f2b9b 100644 --- a/lib/node.cpp +++ b/lib/node.cpp @@ -17,7 +17,7 @@ Node::Node() { } */ -Node::Node(Node* parent, double* masses, double* particles, unsigned nParticles, unsigned depth, double size, double center[3], unsigned* localParticles, unsigned nLocalParticles) { +Node::Node(Node* root, Node* parent, double* masses, double* particles, unsigned nParticles, unsigned depth, double size, double center[3], unsigned* localParticles, unsigned nLocalParticles) { parent_ = parent; particles_ = particles; nParticles_ = nParticles; diff --git a/lib/node.hpp b/lib/node.hpp index 9150a8e..0905c74 100644 --- a/lib/node.hpp +++ b/lib/node.hpp @@ -7,7 +7,7 @@ public: Node() = default; // whoever creates the node is responsible for deciding which particles are in which octant and for allocating the localParticles array // node will write to localParticles array - Node(Node* parent, double* masses, double* particles, unsigned nParticles, unsigned depth, double size, double center[3], unsigned* localParticles, unsigned nLocalParticles); + Node(Node* root, Node* parent, double* masses, double* particles, unsigned nParticles, unsigned depth, double size, double center[3], unsigned* localParticles, unsigned nLocalParticles); // destuctor ~Node(); // copy constructor diff --git a/lib/tree.cpp b/lib/tree.cpp index 22f0d38..61ccfa1 100644 --- a/lib/tree.cpp +++ b/lib/tree.cpp @@ -13,7 +13,7 @@ Tree::Tree(double* masses, double* particles, double* forces, unsigned nParticle for (unsigned i=0; i < nParticles_; ++i) localParticles_[i] = i; root_ = new Node(); - *root_ = Node(root_, masses_, particles_, nParticles_, 0, size_, center_, localParticles_, nParticles_); + *root_ = Node(root_, root_, masses_, particles_, nParticles_, 0, size_, center_, localParticles_, nParticles_); } Tree::~Tree() { -- GitLab