From 1213155222e804b4a7687a37dd20050f4b2711fa Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 7 Dec 2009 15:46:59 +0100 Subject: [PATCH] Small fixup --- src/interpolate.hpp | 4 ++-- src/octTree.cpp | 1 + src/octTree.hpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/interpolate.hpp b/src/interpolate.hpp index 28a78ac..6768a3a 100644 --- a/src/interpolate.hpp +++ b/src/interpolate.hpp @@ -1,5 +1,5 @@ -#ifndef __MAK_INTERPOLATE_HPP -#define __MAK_INTERPOLATE_HPP +#ifndef __CTOOL_INTERPOLATE_HPP +#define __CTOOL_INTERPOLATE_HPP #include "config.hpp" #include diff --git a/src/octTree.cpp b/src/octTree.cpp index 5435b25..a56e281 100644 --- a/src/octTree.cpp +++ b/src/octTree.cpp @@ -157,3 +157,4 @@ void OctTree::insertParticle(octPtr node, particleId, maxAbsoluteDepth-1); cells[node].children[octPos] = newNode; } + diff --git a/src/octTree.hpp b/src/octTree.hpp index 14bf17d..f01319e 100644 --- a/src/octTree.hpp +++ b/src/octTree.hpp @@ -29,7 +29,6 @@ namespace CosmoTool class OctTree { public: - //Coordinates of particles must be in the [0:1] range OctTree(const FCoordinates *particles, octPtr numParticles, uint32_t maxTreeDepth, uint32_t maxAbsoluteDepth, uint32_t threshold = 1); @@ -68,6 +67,8 @@ namespace CosmoTool walkTreeElements(f, condition, 0, rootCenter, octCoordCenter); } + + protected: const FCoordinates *particles; octPtr numParticles;