songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tetDecomposer: Rename enumeration elements for consistency with polyMesh

Browse Source
This commit is contained in:
Henry 2015-06-11 16:08:41 +01:00
parent 7366e04ac4
commit a5b1708e63
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
View File

@ -202,7 +202,7 @@ void Foam::tetDecomposer::setRefinement
// Add face centre points // Add face centre points
if (decomposeType == FACECENTRETETS) if (decomposeType == FACE_CENTRE_TRIS)
{ {
faceToPoint_.setSize(mesh_.nFaces()); faceToPoint_.setSize(mesh_.nFaces());
forAll(mesh_.faceCentres(), faceI) forAll(mesh_.faceCentres(), faceI)
@ -225,7 +225,7 @@ void Foam::tetDecomposer::setRefinement
faceOwnerCells_.setSize(mesh_.nFaces()); faceOwnerCells_.setSize(mesh_.nFaces());
faceNeighbourCells_.setSize(mesh_.nFaces()); faceNeighbourCells_.setSize(mesh_.nFaces());
if (decomposeType == FACECENTRETETS) if (decomposeType == FACE_CENTRE_TRIS)
{ {
forAll(faceOwnerCells_, faceI) forAll(faceOwnerCells_, faceI)
{ {
@ -267,7 +267,7 @@ void Foam::tetDecomposer::setRefinement
: faceNeighbourCells_[faceI] : faceNeighbourCells_[faceI]
); );
if (decomposeType == FACECENTRETETS) if (decomposeType == FACE_CENTRE_TRIS)
{ {
forAll(f, fp) forAll(f, fp)
{ {
@ -341,7 +341,7 @@ void Foam::tetDecomposer::setRefinement
} }
if (decomposeType == FACECENTRETETS) if (decomposeType == FACE_CENTRE_TRIS)
{ {
forAll(f, fp) forAll(f, fp)
{ {
@ -628,7 +628,7 @@ void Foam::tetDecomposer::setRefinement
// Determine tets on either side // Determine tets on either side
label thisTet, otherTet; label thisTet, otherTet;
if (decomposeType == FACECENTRETETS) if (decomposeType == FACE_CENTRE_TRIS)
{ {
if (mesh_.faceOwner()[faceI] == cellI) if (mesh_.faceOwner()[faceI] == cellI)
{ {

9
src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
View File

@ -63,11 +63,14 @@ public:
enum decompositionType enum decompositionType
{ {
FACECENTRETETS, // tet decomposition using facectr and cellctr FACE_CENTRE_TRIS, //- Faces decomposed into triangles
FACEDIAGTETS // tet decomposition using face diag and cellctr // using face-centre
FACE_DIAG_TRIS //- Faces decomposed into triangles diagonally
}; };
static const NamedEnum<decompositionType, 2> decompositionTypeNames; static const NamedEnum<decompositionType, 2> decompositionTypeNames;
private: private:
// Private data // Private data
@ -89,6 +92,7 @@ private:
// the added tet on the neighbour side // the added tet on the neighbour side
labelListList faceNeighbourCells_; labelListList faceNeighbourCells_;
// Private Member Functions // Private Member Functions
//- Modify a face //- Modify a face
@ -187,6 +191,7 @@ public:
void updateMesh(const mapPolyMesh&); void updateMesh(const mapPolyMesh&);
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam