zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: meshSearch : avoid unnecessary mag()

Browse Source
This commit is contained in:
mattijs
2011-01-21 10:58:28 +00:00
parent fe987dad11
commit b414e15b0b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/meshTools/meshSearch/meshSearch.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -101,9 +101,11 @@ Foam::label Foam::meshSearch::findNearestCellTree(const point& location) const
{ {
const indexedOctree<treeDataCell>& tree = cellTree(); const indexedOctree<treeDataCell>& tree = cellTree();
scalar span = tree.bb().mag(); pointIndexHit info = tree.findNearest
(
pointIndexHit info = tree.findNearest(location, Foam::sqr(span)); location,
magSqr(tree.bb().max()-tree.bb().min())
);
if (!info.hit()) if (!info.hit())
{ {
@ -178,10 +180,12 @@ Foam::label Foam::meshSearch::findNearestFaceTree(const point& location) const
// Search nearest cell centre. // Search nearest cell centre.
const indexedOctree<treeDataCell>& tree = cellTree(); const indexedOctree<treeDataCell>& tree = cellTree();
scalar span = tree.bb().mag();
// Search with decent span // Search with decent span
pointIndexHit info = tree.findNearest(location, Foam::sqr(span)); pointIndexHit info = tree.findNearest
(
location,
magSqr(tree.bb().max()-tree.bb().min())
);
if (!info.hit()) if (!info.hit())
{ {
@ -767,12 +771,10 @@ Foam::label Foam::meshSearch::findNearestBoundaryFace
{ {
const indexedOctree<treeDataFace>& tree = boundaryTree(); const indexedOctree<treeDataFace>& tree = boundaryTree();
scalar span = tree.bb().mag();
pointIndexHit info = boundaryTree().findNearest pointIndexHit info = boundaryTree().findNearest
( (
location, location,
Foam::sqr(span) magSqr(tree.bb().max()-tree.bb().min())
); );
if (!info.hit()) if (!info.hit())