guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed conflicted comments

Browse Source
This commit is contained in:
Guilhem Lavaux 2010-05-04 07:43:15 -05:00
parent d0363d131e
commit 91439c8cb5
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/octTree.hpp
View File

@ -78,7 +78,6 @@ namespace CosmoTool
float xMin[3]; float xMin[3];
<<<<<<< HEAD
static bool unconditioned() static bool unconditioned()
{ {
return true; return true;
@ -87,10 +86,6 @@ namespace CosmoTool
template<typename FunT, typename CondT> template<typename FunT, typename CondT>
void walkTreeElements(FunT f, CondT condition, void walkTreeElements(FunT f, CondT condition,
octPtr node, octPtr node,
=======
template<typename FunT,typename CondT>
void walkTreeElements(FunT f, CondT condition, octPtr node,
>>>>>>> 37b41b5ac9b32213b865cbeddd63102f3fa0935a
const OctCoords& icoord, const OctCoords& icoord,
octCoordType halfNodeLength) octCoordType halfNodeLength)
{ {
@ -106,21 +101,12 @@ namespace CosmoTool
f(realCenter, cells[node].numberLeaves, lenNorm*halfNodeLength/(float)octCoordCenter, f(realCenter, cells[node].numberLeaves, lenNorm*halfNodeLength/(float)octCoordCenter,
cells[node].children[0] == invalidOctCell, // True if this is a meta-node cells[node].children[0] == invalidOctCell, // True if this is a meta-node
false); false);
<<<<<<< HEAD
if (!condition(realCenter, cells[node].numberLeaves,
lenNorm*halfNodeLength/(float)octCoordCenter,
cells[node].children[0] == invalidOctCell))
return;
=======
if (!condition(realCenter, cells[node].numberLeaves, if (!condition(realCenter, cells[node].numberLeaves,
lenNorm*halfNodeLength/(float)octCoordCenter, lenNorm*halfNodeLength/(float)octCoordCenter,
cells[node].children[0] == invalidOctCell)) cells[node].children[0] == invalidOctCell))
return; return;
>>>>>>> 37b41b5ac9b32213b865cbeddd63102f3fa0935a
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
octPtr newNode = cells[node].children[i]; octPtr newNode = cells[node].children[i];
@ -145,12 +131,8 @@ namespace CosmoTool
false, true); false, true);
continue; continue;
} }
<<<<<<< HEAD
walkTreeElements(f, condition,
cells[node].children[i], newCoord, halfNodeLength/2);
=======
walkTreeElements(f, condition, cells[node].children[i], newCoord, halfNodeLength/2); walkTreeElements(f, condition, cells[node].children[i], newCoord, halfNodeLength/2);
>>>>>>> 37b41b5ac9b32213b865cbeddd63102f3fa0935a
} }
} }