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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
laurence
2012-02-03 14:36:04 +00:00
parent 7ddba46e36 2f4e81919e
commit 7a8a39c86c
49 changed files with 1123 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
View File

@ -2525,7 +2525,10 @@ Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
template <class Type>
Foam::label Foam::dynamicIndexedOctree<Type>::findInside(const point& sample) const
Foam::label Foam::dynamicIndexedOctree<Type>::findInside
(
const point& sample
) const
{
labelBits index = findNode(0, sample);
@ -2873,7 +2876,8 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
if (newContent.size() == 0)
{
// Set to empty.
nodes_[nodIndex].subNodes_[octant] = emptyPlusOctant(octant);
nodes_[nodIndex].subNodes_[octant]
= emptyPlusOctant(octant);
}
contentList.transfer(newContent);
@ -3002,7 +3006,8 @@ bool Foam::dynamicIndexedOctree<Type>::write(Ostream& os) const
template <class Type>
Foam::Ostream& Foam::operator<<(Ostream& os, const dynamicIndexedOctree<Type>& t)
Foam::Ostream&
Foam::operator<<(Ostream& os, const dynamicIndexedOctree<Type>& t)
{
os << t.bb() << token::SPACE << t.nodes() << endl;

6
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -150,8 +150,8 @@ public:
{
notImplemented
(
"dynamicTreeDataPoint::intersects(const label, const point&,"
"const point&, point&)"
"dynamicTreeDataPoint::intersects
"(const label, const point&, const point&, point&)"
);
return false;
}