zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/OpenFOAM: Rationalised use of enumerations by using the C++11 scoped form

Browse Source 
for Time, treeBoundBox, indexedOctree, dynamicIndexedOctree, CirculatorBase
This commit is contained in:
Henry Weller
2018-08-31 16:11:16 +01:00
parent de456c4f94
commit e750f2555c
51 changed files with 467 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -155,7 +155,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
List<volumeType> volumeStatus
(
mesh_.nCells(),
volumeType::UNKNOWN
volumeType::unknown
);
// Surface refinement
@ -165,7 +165,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
// Determine/update the status of each cell
forAll(volumeStatus, celli)
{
if (volumeStatus[celli] == volumeType::UNKNOWN)
if (volumeStatus[celli] == volumeType::unknown)
{
treeBoundBox cellBb
(
@ -178,15 +178,15 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (geometry.overlaps(cellBb))
{
volumeStatus[celli] = volumeType::MIXED;
volumeStatus[celli] = volumeType::mixed;
}
else if (geometry.inside(cellBb.midpoint()))
{
volumeStatus[celli] = volumeType::INSIDE;
volumeStatus[celli] = volumeType::inside;
}
else
{
volumeStatus[celli] = volumeType::OUTSIDE;
volumeStatus[celli] = volumeType::outside;
}
}
}
@ -212,9 +212,9 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
{
label celli = newCellsToRefine[nCTRI];
if (volumeStatus[celli] == volumeType::MIXED)
if (volumeStatus[celli] == volumeType::mixed)
{
volumeStatus[celli] = volumeType::UNKNOWN;
volumeStatus[celli] = volumeType::unknown;
}
icellWeights[celli] = max
@ -264,7 +264,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (oldCelli == -1)
{
newVolumeStatus[newCelli] = volumeType::UNKNOWN;
newVolumeStatus[newCelli] = volumeType::unknown;
}
else
{
@ -284,7 +284,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
// Determine/update the status of each cell
forAll(volumeStatus, celli)
{
if (volumeStatus[celli] == volumeType::UNKNOWN)
if (volumeStatus[celli] == volumeType::unknown)
{
treeBoundBox cellBb
(
@ -297,15 +297,15 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (geometry.overlaps(cellBb))
{
volumeStatus[celli] = volumeType::MIXED;
volumeStatus[celli] = volumeType::mixed;
}
else if (geometry.inside(cellBb.midpoint()))
{
volumeStatus[celli] = volumeType::INSIDE;
volumeStatus[celli] = volumeType::inside;
}
else
{
volumeStatus[celli] = volumeType::OUTSIDE;
volumeStatus[celli] = volumeType::outside;
}
}
}
@ -319,7 +319,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
forAll(volumeStatus, celli)
{
if (volumeStatus[celli] == volumeType::OUTSIDE)
if (volumeStatus[celli] == volumeType::outside)
{
cellsToRemove.append(celli);
}
@ -374,7 +374,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (oldCelli == -1)
{
newVolumeStatus[newCelli] = volumeType::UNKNOWN;
newVolumeStatus[newCelli] = volumeType::unknown;
}
else
{
@ -523,7 +523,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
weightEstimate = 1.0;
if (volType == volumeType::MIXED)
if (volType == volumeType::mixed)
{
// // Assess the cell size at the nearest point on the surface for the
// // MIXED cells, if the cell is large with respect to the cell size,
@ -603,7 +603,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
// return true;
// }
}
else if (volType == volumeType::INSIDE)
else if (volType == volumeType::inside)
{
// scalar s =
// foamyHexMesh_.cellShapeControl_.cellSize(cellBb.midpoint());
@ -638,7 +638,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::selectRefinementCells
// Determine/update the status of each cell
forAll(volumeStatus, celli)
{
if (volumeStatus[celli] == volumeType::MIXED)
if (volumeStatus[celli] == volumeType::mixed)
{
if (meshCutter_.cellLevel()[celli] < minLevels_)
{
@ -646,7 +646,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::selectRefinementCells
}
}
if (volumeStatus[celli] != volumeType::OUTSIDE)
if (volumeStatus[celli] != volumeType::outside)
{
if
(
@ -1036,7 +1036,7 @@ bool Foam::backgroundMeshDecomposition::positionOnThisProcessor
{
// return bFTreePtr_().findAnyOverlap(pt, 0.0);
return (bFTreePtr_().getVolumeType(pt) == volumeType::INSIDE);
return (bFTreePtr_().getVolumeType(pt) == volumeType::inside);
}

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
View File

@ -186,7 +186,7 @@ bool linearDistance::cellSize(const point& pt, scalar& size) const
if
(
sideMode_ == smInside
&& vTL[0] == volumeType::INSIDE
&& vTL[0] == volumeType::inside
)
{
size = sizeFunction(hitPt, dist, hitIndex);
@ -196,7 +196,7 @@ bool linearDistance::cellSize(const point& pt, scalar& size) const
else if
(
sideMode_ == smOutside
&& vTL[0] == volumeType::OUTSIDE
&& vTL[0] == volumeType::outside
)
{
size = sizeFunction(hitPt, dist, hitIndex);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
View File

@ -150,7 +150,7 @@ bool linearSpatial::cellSize
if
(
sideMode_ == smInside
&& vTL[0] == volumeType::INSIDE
&& vTL[0] == volumeType::inside
)
{
size = sizeFunction(pt);
@ -160,7 +160,7 @@ bool linearSpatial::cellSize
else if
(
sideMode_ == smOutside
&& vTL[0] == volumeType::OUTSIDE
&& vTL[0] == volumeType::outside
)
{
size = sizeFunction(pt);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
View File

@ -250,7 +250,7 @@ bool surfaceOffsetLinearDistance::cellSize
if
(
sideMode_ == smInside
&& vTL[0] == volumeType::INSIDE
&& vTL[0] == volumeType::inside
)
{
size = sizeFunction(hitPt, dist, hitIndex);
@ -260,7 +260,7 @@ bool surfaceOffsetLinearDistance::cellSize
else if
(
sideMode_ == smOutside
&& vTL[0] == volumeType::OUTSIDE
&& vTL[0] == volumeType::outside
)
{
size = sizeFunction(hitPt, dist, hitIndex);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
View File

@ -138,7 +138,7 @@ bool uniform::cellSize
if
(
sideMode_ == smInside
&& vTL[0] == volumeType::INSIDE
&& vTL[0] == volumeType::inside
)
{
size = surfaceCellSizeFunction_().interpolate(hitPt, index);
@ -148,7 +148,7 @@ bool uniform::cellSize
else if
(
sideMode_ == smOutside
&& vTL[0] == volumeType::OUTSIDE
&& vTL[0] == volumeType::outside
)
{
size = surfaceCellSizeFunction_().interpolate(hitPt, index);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
View File

@ -162,7 +162,7 @@ bool uniformDistance::cellSize
if
(
sideMode_ == smInside
&& vTL[0] == volumeType::INSIDE
&& vTL[0] == volumeType::inside
)
{
size = surfaceCellSizeFunction_().interpolate(hitPt, index);
@ -172,7 +172,7 @@ bool uniformDistance::cellSize
else if
(
sideMode_ == smOutside
&& vTL[0] == volumeType::OUTSIDE
&& vTL[0] == volumeType::outside
)
{
size = surfaceCellSizeFunction_().interpolate(hitPt, index);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -407,8 +407,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
}
while
(
circ.circulate(CirculatorBase::CLOCKWISE),
circNormalDirs.circulate(CirculatorBase::CLOCKWISE)
circ.circulate(CirculatorBase::direction::clockwise),
circNormalDirs.circulate(CirculatorBase::direction::clockwise)
);

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
View File

@ -266,7 +266,7 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
volTypeInsidePoint
);
if (volTypeInsidePoint[0] == volumeType::OUTSIDE)
if (volTypeInsidePoint[0] == volumeType::outside)
{
selectInside = false;
}
@ -283,11 +283,11 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
if
(
(
volType[pointi] == volumeType::INSIDE
volType[pointi] == volumeType::inside
&& selectInside
)
|| (
volType[pointi] == volumeType::OUTSIDE
volType[pointi] == volumeType::outside
&& !selectInside
)
)

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
View File

@ -340,7 +340,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
);
}
} while (circ.circulate(CirculatorBase::CLOCKWISE));
} while (circ.circulate(CirculatorBase::direction::clockwise));
addMasterAndSlavePoints
(

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
View File

@ -64,7 +64,7 @@ void Foam::conformationSurfaces::hasBoundedVolume
List<volumeType> vTypes
(
pts.size(),
volumeType::UNKNOWN
volumeType::unknown
);
surface.getVolumeType(pts, vTypes);
@ -569,7 +569,7 @@ Foam::conformationSurfaces::conformationSurfaces
referenceVolumeTypes_.setSize
(
surfaces_.size(),
volumeType::UNKNOWN
volumeType::unknown
);
Info<< endl
@ -666,7 +666,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
List<volumeType>
(
samplePts.size(),
volumeType::UNKNOWN
volumeType::unknown
)
);
@ -731,7 +731,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
if
(
!surface.hasVolumeType()
//&& surfaceVolumeTests[s][i] == volumeType::UNKNOWN
//&& surfaceVolumeTests[s][i] == volumeType::unknown
)
{
pointField sample(1, samplePts[i]);
@ -760,7 +760,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
}
}
if (surfaceVolumeTests[s][i] == volumeType::OUTSIDE)
if (surfaceVolumeTests[s][i] == volumeType::outside)
{
if
(
@ -772,7 +772,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
break;
}
}
else if (surfaceVolumeTests[s][i] == volumeType::INSIDE)
else if (surfaceVolumeTests[s][i] == volumeType::inside)
{
if
(

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -357,11 +357,11 @@ tmp<scalarField> signedDistance
volumeType vT = volType[i];
if (vT == volumeType::OUTSIDE)
if (vT == volumeType::outside)
{
fld[pointi] = dist;
}
else if (vT == volumeType::INSIDE)
else if (vT == volumeType::inside)
{
fld[i] = -dist;
}

2
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
View File

@ -112,7 +112,7 @@ class distanceCalc
surfaces,
samples,
scalarField(1, great),
volumeType::OUTSIDE,
volumeType::outside,
nearestSurfaces,
distance
);