diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index ba3c157b10..a2cd22bbd1 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -500,6 +500,8 @@ $(pointBoundaryMesh)/pointBoundaryMesh.C meshes/boundBox/boundBox.C +meshes/treeBoundBox/treeBoundBox.C + meshTools = meshes/meshTools $(meshTools)/matchPoints.C $(meshTools)/mergePoints.C @@ -577,6 +579,11 @@ $(interpolations)/patchToPatchInterpolation/PatchToPatchInterpolationName.C algorithms/MeshWave/MeshWaveName.C algorithms/MeshWave/FaceCellWaveName.C +algorithms/indexedOctree/indexedOctreeName.C +algorithms/indexedOctree/treeDataCell.C + + + graph/curve/curve.C graph/graph.C diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C similarity index 98% rename from src/meshTools/indexedOctree/indexedOctree.C rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C index df489a6f95..6020d24d19 100644 --- a/src/meshTools/indexedOctree/indexedOctree.C +++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C @@ -25,8 +25,8 @@ License #include "indexedOctree.H" #include "linePointRef.H" -#include "meshTools.H" #include "OFstream.H" +#include "ListOps.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -1730,26 +1730,6 @@ void Foam::indexedOctree::traverseNode point perturbedEnd(pushPoint(octantBb, end, false)); - - //if (debug) - { - // Dump octantBb to obj - writeOBJ(nodeI, octant); - // Dump ray to obj as well - { - OFstream str("ray.obj"); - meshTools::writeOBJ(str, start); - meshTools::writeOBJ(str, end); - str << "l 1 2" << nl; - } - WarningIn("indexedOctree::traverseNode(..)") - << "Did not intersect ray from endpoint:" << end - << " to startpoint:" << start - << " with bounding box:" << octantBb << nl - << "Re-intersecting with perturbed endpoint:" << perturbedEnd - << endl; - } - traverseNode ( findAny, @@ -2316,12 +2296,6 @@ void Foam::indexedOctree::writeOBJ pointField bbPoints(subBb.points()); label pointVertI = vertI; - forAll(bbPoints, i) - { - meshTools::writeOBJ(str, bbPoints[i]); - vertI++; - } - forAll(treeBoundBox::edges, i) { const edge& e = treeBoundBox::edges[i]; diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H similarity index 100% rename from src/meshTools/indexedOctree/indexedOctree.H rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H diff --git a/src/meshTools/indexedOctree/indexedOctreeName.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C similarity index 95% rename from src/meshTools/indexedOctree/indexedOctreeName.C rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C index 519d0d5992..4483d42068 100644 --- a/src/meshTools/indexedOctree/indexedOctreeName.C +++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/indexedOctree/labelBits.H b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H similarity index 98% rename from src/meshTools/indexedOctree/labelBits.H rename to src/OpenFOAM/algorithms/indexedOctree/labelBits.H index 221881f5bb..58893cbaeb 100644 --- a/src/meshTools/indexedOctree/labelBits.H +++ b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C similarity index 98% rename from src/meshTools/indexedOctree/treeDataCell.C rename to src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C index 81c2cb72d6..75c55be59c 100644 --- a/src/meshTools/indexedOctree/treeDataCell.C +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H similarity index 98% rename from src/meshTools/indexedOctree/treeDataCell.H rename to src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H index 06342311e8..7cebddafa9 100644 --- a/src/meshTools/indexedOctree/treeDataCell.H +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/octree/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C similarity index 100% rename from src/meshTools/octree/treeBoundBox.C rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C diff --git a/src/meshTools/octree/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H similarity index 100% rename from src/meshTools/octree/treeBoundBox.H rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H diff --git a/src/meshTools/octree/treeBoundBoxI.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H similarity index 99% rename from src/meshTools/octree/treeBoundBoxI.H rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H index 7426e04708..1f069feb48 100644 --- a/src/meshTools/octree/treeBoundBoxI.H +++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/octree/treeBoundBoxList.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H similarity index 96% rename from src/meshTools/octree/treeBoundBoxList.H rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H index 610df2c1b1..b82eede2f0 100644 --- a/src/meshTools/octree/treeBoundBoxList.H +++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/meshTools/octree/treeBoundBoxTemplates.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C similarity index 96% rename from src/meshTools/octree/treeBoundBoxTemplates.C rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C index c8cb5fab5d..09e0a9be7a 100644 --- a/src/meshTools/octree/treeBoundBoxTemplates.C +++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License