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

GIT: Initial state after latest Foundation merge

Browse Source
This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
parent 4ea1613653 360ab50ed6
commit 9fbd612672
4571 changed files with 115696 additions and 74609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
applications/utilities/surface/surfaceSubset/surfaceSubset.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -127,16 +127,16 @@ int main(int argc, char *argv[])
// pick up cells sharing the point
forAll(markedPoints, pointI)
forAll(markedPoints, pointi)
{
if
(
markedPoints[pointI] < 0
|| markedPoints[pointI] >= surf1.nPoints()
markedPoints[pointi] < 0
|| markedPoints[pointi] >= surf1.nPoints()
)
{
FatalErrorInFunction
<< "localPoint label " << markedPoints[pointI]
<< "localPoint label " << markedPoints[pointi]
<< "out of range."
<< " The mesh has got "
<< surf1.nPoints() << " localPoints."
@ -144,7 +144,7 @@ int main(int argc, char *argv[])
}
const labelList& curFaces =
surf1.pointFaces()[markedPoints[pointI]];
surf1.pointFaces()[markedPoints[pointi]];
forAll(curFaces, i)
{
@ -202,9 +202,9 @@ int main(int argc, char *argv[])
Info<< "Using zone min:" << min << " max:" << max << endl;
forAll(surf1, faceI)
forAll(surf1, facei)
{
const point centre = surf1[faceI].centre(surf1.points());
const point centre = surf1[facei].centre(surf1.points());
if
(
@ -216,7 +216,7 @@ int main(int argc, char *argv[])
&& (centre.z() <= max.z())
)
{
facesToSubset[faceI] = true;
facesToSubset[facei] = true;
}
}
}
@ -259,11 +259,11 @@ int main(int argc, char *argv[])
searchSelectSurf.tree();
// Check if face (centre) is in outside or inside.
forAll(facesToSubset, faceI)
forAll(facesToSubset, facei)
{
if (!facesToSubset[faceI])
if (!facesToSubset[facei])
{
const point fc(surf1[faceI].centre(surf1.points()));
const point fc(surf1[facei].centre(surf1.points()));
volumeType t = selectTree.getVolumeType(fc);
@ -274,7 +274,7 @@ int main(int argc, char *argv[])
: (t == volumeType::INSIDE)
)
{
facesToSubset[faceI] = true;
facesToSubset[facei] = true;
}
}
}
@ -292,14 +292,14 @@ int main(int argc, char *argv[])
// Select all triangles that are close to the plane and
// whose normal aligns with the plane as well.
forAll(surf1.faceCentres(), faceI)
forAll(surf1.faceCentres(), facei)
{
const point& fc = surf1.faceCentres()[faceI];
const point& nf = surf1.faceNormals()[faceI];
const point& fc = surf1.faceCentres()[facei];
const point& nf = surf1.faceNormals()[facei];
if (pl.distance(fc) < distance && mag(pl.normal() & nf) > cosAngle)
{
facesToSubset[faceI] = true;
facesToSubset[facei] = true;
}
}
}
@ -318,37 +318,37 @@ int main(int argc, char *argv[])
Info<< "Found " << markedFaces.size() << " marked face(s)." << endl;
// Check and mark faces to pick up
forAll(markedFaces, faceI)
forAll(markedFaces, facei)
{
if
(
markedFaces[faceI] < 0
|| markedFaces[faceI] >= surf1.size()
markedFaces[facei] < 0
|| markedFaces[facei] >= surf1.size()
)
{
FatalErrorInFunction
<< "Face label " << markedFaces[faceI] << "out of range."
<< "Face label " << markedFaces[facei] << "out of range."
<< " The mesh has got "
<< surf1.size() << " faces."
<< exit(FatalError);
}
// Mark the face
facesToSubset[markedFaces[faceI]] = true;
facesToSubset[markedFaces[facei]] = true;
// mark its neighbours if requested
if (addFaceNeighbours)
{
const labelList& curFaces =
surf1.faceFaces()[markedFaces[faceI]];
surf1.faceFaces()[markedFaces[facei]];
forAll(curFaces, i)
{
label faceI = curFaces[i];
label facei = curFaces[i];
if (!facesToSubset[faceI])
if (!facesToSubset[facei])
{
facesToSubset[faceI] = true;
facesToSubset[facei] = true;
nFaceNeighbours++;
}
}