mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
remove fvCFD.H usage from remaining library source
- exception calcType.H since it'll most likely be used for building applications anyhow - use quailified names in more of the lagrangian code - killed some tab indents in various places.
This commit is contained in:
@ -254,7 +254,7 @@ public:
|
||||
// second the octant with boundary nearest to the point etc.
|
||||
inline void searchOrder
|
||||
(
|
||||
const point& pt,
|
||||
const point& pt,
|
||||
FixedList<direction, 8>& octantOrder
|
||||
) const;
|
||||
|
||||
|
||||
@ -242,7 +242,7 @@ inline void Foam::treeBoundBox::searchOrder
|
||||
if (dist.z() < 0)
|
||||
{
|
||||
octant |= treeBoundBox::FRONTHALF;
|
||||
dist.z() *= -1;
|
||||
dist.z() *= -1;
|
||||
}
|
||||
|
||||
direction min = 0;
|
||||
@ -252,44 +252,44 @@ inline void Foam::treeBoundBox::searchOrder
|
||||
if (dist.x() < dist.y())
|
||||
{
|
||||
if (dist.y() < dist.z())
|
||||
{
|
||||
min = treeBoundBox::RIGHTHALF;
|
||||
mid = treeBoundBox::TOPHALF;
|
||||
max = treeBoundBox::FRONTHALF;
|
||||
}
|
||||
else if (dist.z() < dist.x())
|
||||
{
|
||||
min = treeBoundBox::FRONTHALF;
|
||||
{
|
||||
min = treeBoundBox::RIGHTHALF;
|
||||
mid = treeBoundBox::TOPHALF;
|
||||
max = treeBoundBox::FRONTHALF;
|
||||
}
|
||||
else if (dist.z() < dist.x())
|
||||
{
|
||||
min = treeBoundBox::FRONTHALF;
|
||||
mid = treeBoundBox::RIGHTHALF;
|
||||
max = treeBoundBox::TOPHALF;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = treeBoundBox::RIGHTHALF;
|
||||
mid = treeBoundBox::FRONTHALF;
|
||||
max = treeBoundBox::TOPHALF;
|
||||
}
|
||||
max = treeBoundBox::TOPHALF;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = treeBoundBox::RIGHTHALF;
|
||||
mid = treeBoundBox::FRONTHALF;
|
||||
max = treeBoundBox::TOPHALF;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dist.z() < dist.y())
|
||||
{
|
||||
min = treeBoundBox::FRONTHALF;
|
||||
mid = treeBoundBox::TOPHALF;
|
||||
max = treeBoundBox::RIGHTHALF;
|
||||
}
|
||||
else if (dist.x() < dist.z())
|
||||
{
|
||||
min = treeBoundBox::TOPHALF;
|
||||
mid = treeBoundBox::RIGHTHALF;
|
||||
max = treeBoundBox::FRONTHALF;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = treeBoundBox::TOPHALF;
|
||||
mid = treeBoundBox::FRONTHALF;
|
||||
max = treeBoundBox::RIGHTHALF;
|
||||
}
|
||||
{
|
||||
min = treeBoundBox::FRONTHALF;
|
||||
mid = treeBoundBox::TOPHALF;
|
||||
max = treeBoundBox::RIGHTHALF;
|
||||
}
|
||||
else if (dist.x() < dist.z())
|
||||
{
|
||||
min = treeBoundBox::TOPHALF;
|
||||
mid = treeBoundBox::RIGHTHALF;
|
||||
max = treeBoundBox::FRONTHALF;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = treeBoundBox::TOPHALF;
|
||||
mid = treeBoundBox::FRONTHALF;
|
||||
max = treeBoundBox::RIGHTHALF;
|
||||
}
|
||||
}
|
||||
|
||||
// Primary subOctant
|
||||
|
||||
Reference in New Issue
Block a user