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' into cvm

Browse Source 
Conflicts:
	src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
	src/edgeMesh/Make/options
This commit is contained in:
graham
2010-02-10 15:00:34 +00:00
parent 70116c0049 0bae7febff
commit c91ffbdbe8
488 changed files with 21796 additions and 8444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -82,11 +82,7 @@ void deleteBox
{
const point eMid = surf.edges()[edgeI].centre(surf.localPoints());
if
(
(removeInside && bb.contains(eMid))
|| (!removeInside && !bb.contains(eMid))
)
if (removeInside ? bb.contains(eMid) : !bb.contains(eMid))
{
edgeStat[edgeI] = surfaceFeatures::NONE;
}
@ -138,7 +134,6 @@ int main(int argc, char *argv[])
// Either construct features from surface&featureangle or read set.
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~