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: collapseEdges: parallel operation

Browse Source
This commit is contained in:
mattijs
2012-05-16 10:16:18 +01:00
parent 017f979ac9
commit 41308b9696
2 changed files with 693 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1363
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

File diff suppressed because it is too large Load Diff

37
applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
View File

@ -43,7 +43,7 @@ inline bool Foam::pointEdgeCollapse::update
<< "problem." << abort(FatalError); << "problem." << abort(FatalError);
} }
if (w2.collapseIndex_ == -1) if (w2.collapseIndex_ == -1 || collapseIndex_ == -1)
{ {
// Not marked for collapse; only happens on edges. // Not marked for collapse; only happens on edges.
return false; return false;
@ -56,11 +56,11 @@ inline bool Foam::pointEdgeCollapse::update
} }
else else
{ {
// Same coordinate. Same string? // Take over w2 if it is 'better'
if (w2.collapseIndex_ < collapseIndex_) if (w2.collapseIndex_ < collapseIndex_)
{ {
// Take over string index from w2 (and also coordinate but this // Take over string index and coordinate from w2
// was same)
operator=(w2); operator=(w2);
return true; return true;
} }
@ -85,35 +85,6 @@ inline bool Foam::pointEdgeCollapse::update
{ {
return false; return false;
} }
// if (samePoint(w2.collapsePoint_))
// {
// // Same coordinate. Same string?
// if (w2.collapseIndex_ < collapseIndex_)
// {
// // Take over string index from w2 (and also coordinate but
// // this was same)
// operator=(w2);
// return true;
// }
// else
// {
// return false;
// }
// }
// else
// {
// // Find nearest coordinate
// if (magSqr(w2.collapsePoint_) < magSqr(collapsePoint_))
// {
// operator=(w2);
// return true;
// }
// else
// {
// return false;
// }
// }
} }
} }