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

144
applications/utilities/mesh/manipulation/splitMesh/regionSide.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 |
-------------------------------------------------------------------------------
License
@ -43,16 +43,16 @@ defineTypeNameAndDebug(regionSide, 0);
Foam::label Foam::regionSide::otherFace
(
const primitiveMesh& mesh,
const label cellI,
const label faceI,
const label celli,
const label facei,
const label edgeI
)
{
label f0I, f1I;
meshTools::getEdgeFaces(mesh, cellI, edgeI, f0I, f1I);
meshTools::getEdgeFaces(mesh, celli, edgeI, f0I, f1I);
if (f0I == faceI)
if (f0I == facei)
{
return f1I;
}
@ -67,17 +67,17 @@ Foam::label Foam::regionSide::otherFace
Foam::label Foam::regionSide::otherEdge
(
const primitiveMesh& mesh,
const label faceI,
const label facei,
const label edgeI,
const label pointI
const label pointi
)
{
const edge& e = mesh.edges()[edgeI];
// Get other point on edge.
label freePointI = e.otherVertex(pointI);
label freePointi = e.otherVertex(pointi);
const labelList& fEdges = mesh.faceEdges()[faceI];
const labelList& fEdges = mesh.faceEdges()[facei];
forAll(fEdges, fEdgeI)
{
@ -87,12 +87,12 @@ Foam::label Foam::regionSide::otherEdge
if
(
(
otherE.start() == pointI
&& otherE.end() != freePointI
otherE.start() == pointi
&& otherE.end() != freePointi
)
|| (
otherE.end() == pointI
&& otherE.start() != freePointI
otherE.end() == pointi
&& otherE.start() != freePointi
)
)
{
@ -102,52 +102,52 @@ Foam::label Foam::regionSide::otherEdge
}
FatalErrorInFunction
<< "Cannot find other edge on face " << faceI << " that uses point "
<< pointI << " but not point " << freePointI << endl
<< "Cannot find other edge on face " << facei << " that uses point "
<< pointi << " but not point " << freePointi << endl
<< "Edges on face:" << fEdges
<< " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
<< " Vertices on face:"
<< mesh.faces()[faceI]
<< mesh.faces()[facei]
<< " Vertices on original edge:" << e << abort(FatalError);
return -1;
}
// Step from faceI (on side cellI) to connected face & cell without crossing
// Step from facei (on side celli) to connected face & cell without crossing
// fenceEdges.
void Foam::regionSide::visitConnectedFaces
(
const primitiveMesh& mesh,
const labelHashSet& region,
const labelHashSet& fenceEdges,
const label cellI,
const label faceI,
const label celli,
const label facei,
labelHashSet& visitedFace
)
{
if (!visitedFace.found(faceI))
if (!visitedFace.found(facei))
{
if (debug)
{
Info<< "visitConnectedFaces : cellI:" << cellI << " faceI:"
<< faceI << " isOwner:" << (cellI == mesh.faceOwner()[faceI])
Info<< "visitConnectedFaces : celli:" << celli << " facei:"
<< facei << " isOwner:" << (celli == mesh.faceOwner()[facei])
<< endl;
}
// Mark as visited
visitedFace.insert(faceI);
visitedFace.insert(facei);
// Mark which side of face was visited.
if (cellI == mesh.faceOwner()[faceI])
if (celli == mesh.faceOwner()[facei])
{
sideOwner_.insert(faceI);
sideOwner_.insert(facei);
}
// Visit all neighbouring faces on faceSet. Stay on this 'side' of
// face by doing edge-face-cell walk.
const labelList& fEdges = mesh.faceEdges()[faceI];
const labelList& fEdges = mesh.faceEdges()[facei];
forAll(fEdges, fEdgeI)
{
@ -159,41 +159,41 @@ void Foam::regionSide::visitConnectedFaces
// we hit face on faceSet.
// Find face reachable from edge
label otherFaceI = otherFace(mesh, cellI, faceI, edgeI);
label otherFacei = otherFace(mesh, celli, facei, edgeI);
if (mesh.isInternalFace(otherFaceI))
if (mesh.isInternalFace(otherFacei))
{
label otherCellI = cellI;
label otherCelli = celli;
// Keep on crossing faces/cells until back on face on
// surface
while (!region.found(otherFaceI))
while (!region.found(otherFacei))
{
visitedFace.insert(otherFaceI);
visitedFace.insert(otherFacei);
if (debug)
{
Info<< "visitConnectedFaces : cellI:" << cellI
<< " found insideEdgeFace:" << otherFaceI
Info<< "visitConnectedFaces : celli:" << celli
<< " found insideEdgeFace:" << otherFacei
<< endl;
}
// Cross otherFaceI into neighbouring cell
otherCellI =
// Cross otherFacei into neighbouring cell
otherCelli =
meshTools::otherCell
(
mesh,
otherCellI,
otherFaceI
otherCelli,
otherFacei
);
otherFaceI =
otherFacei =
otherFace
(
mesh,
otherCellI,
otherFaceI,
otherCelli,
otherFacei,
edgeI
);
}
@ -203,8 +203,8 @@ void Foam::regionSide::visitConnectedFaces
mesh,
region,
fenceEdges,
otherCellI,
otherFaceI,
otherCelli,
otherFacei,
visitedFace
);
}
@ -214,7 +214,7 @@ void Foam::regionSide::visitConnectedFaces
}
// From edge on face connected to point on region (regionPointI) cross
// From edge on face connected to point on region (regionPointi) cross
// to all other edges using this point by walking across faces
// Does not cross regionEdges so stays on one side
// of region
@ -222,26 +222,26 @@ void Foam::regionSide::walkPointConnectedFaces
(
const primitiveMesh& mesh,
const labelHashSet& regionEdges,
const label regionPointI,
const label startFaceI,
const label regionPointi,
const label startFacei,
const label startEdgeI,
labelHashSet& visitedEdges
)
{
// Mark as visited
insidePointFaces_.insert(startFaceI);
insidePointFaces_.insert(startFacei);
if (debug)
{
Info<< "walkPointConnectedFaces : regionPointI:" << regionPointI
<< " faceI:" << startFaceI
Info<< "walkPointConnectedFaces : regionPointi:" << regionPointi
<< " facei:" << startFacei
<< " edgeI:" << startEdgeI << " verts:"
<< mesh.edges()[startEdgeI]
<< endl;
}
// Cross faceI i.e. get edge not startEdgeI which uses regionPointI
label edgeI = otherEdge(mesh, startFaceI, startEdgeI, regionPointI);
// Cross facei i.e. get edge not startEdgeI which uses regionPointi
label edgeI = otherEdge(mesh, startFacei, startEdgeI, regionPointi);
if (!regionEdges.found(edgeI))
{
@ -263,16 +263,16 @@ void Foam::regionSide::walkPointConnectedFaces
const labelList& eFaces = mesh.edgeFaces()[edgeI];
forAll(eFaces, eFaceI)
forAll(eFaces, eFacei)
{
label faceI = eFaces[eFaceI];
label facei = eFaces[eFacei];
walkPointConnectedFaces
(
mesh,
regionEdges,
regionPointI,
faceI,
regionPointi,
facei,
edgeI,
visitedEdges
);
@ -298,8 +298,8 @@ void Foam::regionSide::walkAllPointConnectedFaces
forAllConstIter(labelHashSet, regionFaces, iter)
{
const label faceI = iter.key();
const labelList& fEdges = mesh.faceEdges()[faceI];
const label facei = iter.key();
const labelList& fEdges = mesh.faceEdges()[facei];
forAll(fEdges, fEdgeI)
{
@ -331,29 +331,29 @@ void Foam::regionSide::walkAllPointConnectedFaces
forAllConstIter(labelHashSet, regionFaces, iter)
{
const label faceI = iter.key();
const label facei = iter.key();
// Get side of face.
label cellI;
label celli;
if (sideOwner_.found(faceI))
if (sideOwner_.found(facei))
{
cellI = mesh.faceOwner()[faceI];
celli = mesh.faceOwner()[facei];
}
else
{
cellI = mesh.faceNeighbour()[faceI];
celli = mesh.faceNeighbour()[facei];
}
// Find starting point and edge on face.
const labelList& fEdges = mesh.faceEdges()[faceI];
const labelList& fEdges = mesh.faceEdges()[facei];
forAll(fEdges, fEdgeI)
{
label edgeI = fEdges[fEdgeI];
// Get the face 'perpendicular' to faceI on region.
label otherFaceI = otherFace(mesh, cellI, faceI, edgeI);
// Get the face 'perpendicular' to facei on region.
label otherFacei = otherFace(mesh, celli, facei, edgeI);
// Edge
const edge& e = mesh.edges()[edgeI];
@ -365,14 +365,14 @@ void Foam::regionSide::walkAllPointConnectedFaces
visitedPoint.insert(e.start());
//edgeI = otherEdge(mesh, otherFaceI, edgeI, e.start());
//edgeI = otherEdge(mesh, otherFacei, edgeI, e.start());
walkPointConnectedFaces
(
mesh,
regionEdges,
e.start(),
otherFaceI,
otherFacei,
edgeI,
visitedEdges
);
@ -384,14 +384,14 @@ void Foam::regionSide::walkAllPointConnectedFaces
visitedPoint.insert(e.end());
//edgeI = otherEdge(mesh, otherFaceI, edgeI, e.end());
//edgeI = otherEdge(mesh, otherFacei, edgeI, e.end());
walkPointConnectedFaces
(
mesh,
regionEdges,
e.end(),
otherFaceI,
otherFacei,
edgeI,
visitedEdges
);
@ -409,8 +409,8 @@ Foam::regionSide::regionSide
const primitiveMesh& mesh,
const labelHashSet& region, // faces of region
const labelHashSet& fenceEdges, // outside edges
const label startCellI,
const label startFaceI
const label startCelli,
const label startFacei
)
:
sideOwner_(region.size()),
@ -427,8 +427,8 @@ Foam::regionSide::regionSide
mesh,
region,
fenceEdges,
startCellI,
startFaceI,
startCelli,
startFacei,
visitedFace
);

22
applications/utilities/mesh/manipulation/splitMesh/regionSide.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) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,32 +77,32 @@ class regionSide
static label otherEdge
(
const primitiveMesh& mesh,
const label faceI,
const label facei,
const label edgeI,
const label pointI
const label pointi
);
//- From faceI, side cellI, cross to other faces/cells by
//- From facei, side celli, cross to other faces/cells by
// face-cell walking and store visited faces and update sideOwner_.
void visitConnectedFaces
(
const primitiveMesh& mesh,
const labelHashSet& region,
const labelHashSet& fenceEdges,
const label cellI,
const label faceI,
const label celli,
const label facei,
labelHashSet& visitedFace
);
//- From edge on face connected to point on region (regionPointI) cross
//- From edge on face connected to point on region (regionPointi) cross
// to all other edges using this point by walking across faces
// Does not cross regionEdges so stays on one side of region
void walkPointConnectedFaces
(
const primitiveMesh& mesh,
const labelHashSet& regionEdges,
const label regionPointI,
const label startFaceI,
const label regionPointi,
const label startFacei,
const label startEdgeI,
labelHashSet& visitedEdges
);
@ -127,8 +127,8 @@ public:
static label otherFace
(
const primitiveMesh& mesh,
const label cellI,
const label excludeFaceI,
const label celli,
const label excludeFacei,
const label edgeI
);

12
applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
View File

@ -89,9 +89,9 @@ label findEdge(const primitiveMesh& mesh, const label v0, const label v1)
// Checks whether patch present
void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
{
const label patchI = bMesh.findPatchID(name);
const label patchi = bMesh.findPatchID(name);
if (patchI == -1)
if (patchi == -1)
{
FatalErrorInFunction
<< "Cannot find patch " << name << nl
@ -100,7 +100,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
<< exit(FatalError);
}
if (bMesh[patchI].size())
if (bMesh[patchi].size())
{
FatalErrorInFunction
<< "Patch " << name << " is present but non-zero size"
@ -203,15 +203,15 @@ int main(int argc, char *argv[])
}
// Find sides reachable from 0th face of faceSet
label startFaceI = faces[0];
label startFacei = faces[0];
regionSide regionInfo
(
mesh,
facesSet,
fenceEdges,
mesh.faceOwner()[startFaceI],
startFaceI
mesh.faceOwner()[startFacei],
startFacei
);
// Determine flip state for all faces in faceSet