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

topoSetSources: Removed redundant code

Browse Source
This commit is contained in:
Henry Weller
2021-07-26 16:48:14 +01:00
parent 47bb18c20f
commit 976de0baf5
100 changed files with 7 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C
View File

@ -38,14 +38,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::badQualityToCell::usage_
(
badQualityToCell::typeName,
"\n Usage: badQualityToCell mesh-quality-dictionary\n\n"
" Select all cells that do not satisfy the selection criterion\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::badQualityToCell::combine(topoSet& set, const bool add) const

3
src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H
View File

@ -54,9 +54,6 @@ class badQualityToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Mesh quality dictionary
const dictionary dict_;

8
src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C
View File

@ -38,14 +38,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::badQualityToFace::usage_
(
badQualityToFace::typeName,
"\n Usage: badQualityToFace mesh-quality-dictionary\n\n"
" Select all faces that do not satisfy the selection criterion\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::badQualityToFace::combine(topoSet& set, const bool add) const

3
src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H
View File

@ -54,9 +54,6 @@ class badQualityToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Mesh quality dictionary
const dictionary dict_;

8
src/meshTools/sets/cellSources/boxToCell/boxToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::boxToCell::usage_
(
boxToCell::typeName,
"\n Usage: boxToCell (minx miny minz) (maxx maxy maxz)\n\n"
" Select all cells with cellCentre within bounding box\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boxToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/boxToCell/boxToCell.H
View File

@ -53,8 +53,6 @@ class boxToCell
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Bounding box.
treeBoundBoxList bbs_;

8
src/meshTools/sets/cellSources/cellToCell/cellToCell.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cellToCell::usage_
(
cellToCell::typeName,
"\n Usage: cellToCell <cellSet>\n\n"
" Select all cells in the cellSet\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::cellToCell::cellToCell

2
src/meshTools/sets/cellSources/cellToCell/cellToCell.H
View File

@ -52,8 +52,6 @@ class cellToCell
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cylinderAnnulusToCell::usage_
(
cylinderAnnulusToCell::typeName,
"\n Usage: cylinderAnnulusToCell (point1X point1Y point1Z)"
" (point2X point2Y point2Z) outerRadius innerRadius\n\n"
" Select all cells with cell centre within bounding cylinder annulus\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::cylinderAnnulusToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H
View File

@ -54,8 +54,6 @@ class cylinderAnnulusToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- First point on cylinder axis
vector point1_;

9
src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cylinderToCell::usage_
(
cylinderToCell::typeName,
"\n Usage: cylinderToCell (point1X point1Y point1Z)"
" (point2X point2Y point2Z) radius\n\n"
" Select all cells with cell centre within bounding cylinder\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::cylinderToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
View File

@ -53,8 +53,6 @@ class cylinderToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- First point on cylinder axis
vector point1_;

8
src/meshTools/sets/cellSources/faceToCell/faceToCell.C
View File

@ -50,14 +50,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
(
faceToCell::typeName,
"\n Usage: faceToCell <faceSet> neighbour|owner|any|all\n\n"
" Select cells that are the owner|neighbour|any"
" of the faces in the faceSet or where all faces are in the faceSet\n\n"
);
const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
Foam::faceToCell::faceActionNames_;

2
src/meshTools/sets/cellSources/faceToCell/faceToCell.H
View File

@ -66,8 +66,6 @@ private:
static const NamedEnum<faceAction, 4> faceActionNames_;
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
View File

@ -47,15 +47,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
(
faceZoneToCell::typeName,
"\n Usage: faceZoneToCell zone master|slave\n\n"
" Select master or slave side of the faceZone."
" Note:accepts wildcards for zone.\n\n"
);
const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
Foam::faceZoneToCell::faceActionNames_;

2
src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
View File

@ -65,8 +65,6 @@ private:
static const NamedEnum<faceAction, 2> faceActionNames_;
//- Add usage string
static addToUsageTable usage_;
//- Name/regular expression of faceZone
wordRe zoneName_;

9
src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
View File

@ -29,7 +29,6 @@ License
#include "Time.H"
#include "IFstream.H"
#include "fieldDictionary.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -41,14 +40,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::fieldToCell::usage_
(
fieldToCell::typeName,
"\n Usage: fieldToCell field min max\n\n"
" Select all cells with field value >= min and <= max\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fieldToCell::applyToSet

9
src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
View File

@ -51,20 +51,15 @@ class fieldToCell
:
public topoSetSource
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of volScalarField
word fieldName_;
//- Min to subset field values with
scalar min_;
//- Max ,,
//- Max to subset field values with
scalar max_;
@ -78,11 +73,13 @@ class fieldToCell
topoSet& set
) const;
public:
//- Runtime type information
TypeName("fieldToCell");
// Constructors
//- Construct from components

8
src/meshTools/sets/cellSources/labelToCell/labelToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::labelToCell::usage_
(
labelToCell::typeName,
"\n Usage: labelToCell (i0 i1 .. in)\n\n"
" Select cells by cellLabel\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::labelToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/labelToCell/labelToCell.H
View File

@ -53,8 +53,6 @@ class labelToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Cell labels read from dictionary
labelList labels_;

8
src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::nbrToCell::usage_
(
nbrToCell::typeName,
"\n Usage: nbrToCell <nNeighbours>\n\n"
" Select all cells with <= nNeighbours neighbouring cells\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::nbrToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
View File

@ -54,8 +54,6 @@ class nbrToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Number of internal faces on cell
label minNbrs_;

8
src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::nearestToCell::usage_
(
nearestToCell::typeName,
"\n Usage: nearestToCell (pt0 .. ptn)\n\n"
" Select the nearest cell for each of the points pt0 ..ptn\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::nearestToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
View File

@ -53,8 +53,6 @@ class nearestToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Points to select nearest to
pointField points_;

34
src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::patchDistanceToCell::usage_
(
patchDistanceToCell::typeName,
"\n Usage: patchDistanceToCell (<patches>) distance\n\n"
" Select cells that are below a distance from a list of patches\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::patchDistanceToCell::combine(topoSet& set, const bool add) const
@ -83,32 +75,6 @@ Foam::patchDistanceToCell::patchDistanceToCell
{}
Foam::patchDistanceToCell::patchDistanceToCell
(
const polyMesh& mesh,
Istream& is
)
:
topoSetSource(mesh),
patches_(),
distance_()
{
token firstToken(is);
is.putBack(firstToken);
if (firstToken == token::BEGIN_LIST)
{
is >> patches_;
}
else
{
patches_ = wordReList(1, word(is));
}
is >> distance_;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::patchDistanceToCell::~patchDistanceToCell()

9
src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H
View File

@ -53,8 +53,6 @@ class patchDistanceToCell
{
private:
//- Add usage string
static addToUsageTable usage_;
//- List of patches
wordReList patches_;
@ -84,13 +82,6 @@ public:
const dictionary& dict
);
//- Construct from Istream
patchDistanceToCell
(
const polyMesh& mesh,
Istream&
);
//- Destructor
virtual ~patchDistanceToCell();

8
src/meshTools/sets/cellSources/pointToCell/pointToCell.C
View File

@ -48,14 +48,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
(
pointToCell::typeName,
"\n Usage: pointToCell <pointSet> any|edge\n\n"
" Select all cells with any point ('any') or any edge ('edge')"
" in the pointSet\n\n"
);
const Foam::NamedEnum<Foam::pointToCell::pointAction, 2>
Foam::pointToCell::pointActionNames_;

2
src/meshTools/sets/cellSources/pointToCell/pointToCell.H
View File

@ -62,8 +62,6 @@ public:
private:
//- Add usage string
static addToUsageTable usage_;
static const NamedEnum<pointAction, 2> pointActionNames_;

9
src/meshTools/sets/cellSources/regionToCell/regionToCell.C
View File

@ -39,15 +39,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::regionToCell::usage_
(
regionToCell::typeName,
"\n Usage: regionToCell subCellSet (pt0 .. ptn)\n\n"
" Select all cells in the connected region containing"
" points (pt0..ptn).\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::regionToCell::markRegionFaces

2
src/meshTools/sets/cellSources/regionToCell/regionToCell.H
View File

@ -70,8 +70,6 @@ class regionToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of cellSet to keep to
const word setName_;

19
src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
View File

@ -37,15 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::rotatedBoxToCell::usage_
(
rotatedBoxToCell::typeName,
"\n Usage: rotatedBoxToCell (originx originy originz)"
" (ix iy iz) (jx jy jz) (kx ky kz)\n\n"
" Select all cells with cellCentre within parallelepiped\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::rotatedBoxToCell::combine(topoSet& set, const bool add) const
@ -139,16 +130,6 @@ Foam::rotatedBoxToCell::rotatedBoxToCell
{}
Foam::rotatedBoxToCell::rotatedBoxToCell(const polyMesh& mesh, Istream& is)
:
topoSetSource(mesh),
origin_(is),
i_(is),
j_(is),
k_(is)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::rotatedBoxToCell::~rotatedBoxToCell()

7
src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -65,8 +65,6 @@ class rotatedBoxToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Skewed box
@ -101,9 +99,6 @@ public:
//- Construct from dictionary
rotatedBoxToCell(const polyMesh& mesh, const dictionary& dict);
//- Construct from Istream
rotatedBoxToCell(const polyMesh& mesh, Istream&);
//- Destructor
virtual ~rotatedBoxToCell();

9
src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
View File

@ -39,15 +39,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::shapeToCell::usage_
(
shapeToCell::typeName,
"\n Usage: shapeToCell tet|pyr|prism|hex|tetWedge|wedge|splitHex\n\n"
" Select all cells of given cellShape.\n"
" (splitHex hardcoded with internal angle < 10 degrees)\n"
);
// Angle for polys to be considered splitHexes.
Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(degToRad(10.0));

2
src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
View File

@ -56,8 +56,6 @@ class shapeToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of cell type
word type_;

8
src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::sphereToCell::usage_
(
sphereToCell::typeName,
"\n Usage: sphereToCell (centreX centreY centreZ) radius\n\n"
" Select all cells with cellCentre within bounding sphere\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::sphereToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
View File

@ -53,8 +53,6 @@ class sphereToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Centre
vector centre_;

18
src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
View File

@ -42,24 +42,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::surfaceToCell::usage_
(
surfaceToCell::typeName,
"\n Usage: surfaceToCell"
"<surface> <outsidePoints> <cut> <inside> <outside> <near> <curvature>\n\n"
" <surface> name of triSurface\n"
" <outsidePoints> list of points that define outside\n"
" <cut> boolean whether to include cells cut by surface\n"
" <inside> ,, ,, inside surface\n"
" <outside> ,, ,, outside surface\n"
" <near> scalar; include cells with centre <= near to surface\n"
" <curvature> scalar; include cells close to strong curvature"
" on surface\n"
" (curvature defined as difference in surface normal at nearest"
" point on surface for each vertex of cell)\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::label Foam::surfaceToCell::getNearest

2
src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
View File

@ -65,8 +65,6 @@ class surfaceToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of surface file
const fileName surfName_;

8
src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
View File

@ -39,14 +39,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::targetVolumeToCell::usage_
(
targetVolumeToCell::typeName,
"\n Usage: targetVolumeToCell (nx ny nz)\n\n"
" Adjust plane until obtained selected volume\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::scalar Foam::targetVolumeToCell::volumeOfSet

2
src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H
View File

@ -55,8 +55,6 @@ class targetVolumeToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Wanted volume
const scalar vol_;

9
src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::zoneToCell::usage_
(
zoneToCell::typeName,
"\n Usage: zoneToCell zone\n\n"
" Select all cells in the cellZone."
" Note:accepts wildcards for zone.\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::zoneToCell::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
View File

@ -54,8 +54,6 @@ class zoneToCell
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name/regular expression of cellZone
wordRe zoneName_;

8
src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::setToCellZone::usage_
(
setToCellZone::typeName,
"\n Usage: setToCellZone <cellSet>\n\n"
" Select all cells in the cellSet.\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::setToCellZone::setToCellZone

2
src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
View File

@ -52,8 +52,6 @@ class setToCellZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

18
src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::boundaryToFace::usage_
(
boundaryToFace::typeName,
"\n Usage: boundaryToFace\n\n"
" Select all boundary faces\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boundaryToFace::combine(topoSet& set, const bool add) const
@ -74,16 +66,6 @@ Foam::boundaryToFace::boundaryToFace(const polyMesh& mesh, const dictionary&)
{}
Foam::boundaryToFace::boundaryToFace
(
const polyMesh& mesh,
Istream& is
)
:
topoSetSource(mesh)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::boundaryToFace::~boundaryToFace()

11
src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,8 +52,6 @@ class boundaryToFace
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
// Private Member Functions
@ -78,13 +76,6 @@ public:
const dictionary& dict
);
//- Construct from Istream
boundaryToFace
(
const polyMesh& mesh,
Istream&
);
//- Destructor
virtual ~boundaryToFace();

8
src/meshTools/sets/faceSources/boxToFace/boxToFace.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::boxToFace::usage_
(
boxToFace::typeName,
"\n Usage: boxToFace ((minx miny minz) (maxx maxy maxz))\n\n"
" Select all face with faceCentre within bounding box\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boxToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/boxToFace/boxToFace.H
View File

@ -53,8 +53,6 @@ class boxToFace
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Bounding box.
treeBoundBoxList bbs_;

8
src/meshTools/sets/faceSources/cellToFace/cellToFace.C
View File

@ -51,14 +51,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
(
cellToFace::typeName,
"\n Usage: cellToFace <cellSet> all|both\n\n"
" Select -all : all faces of cells in the cellSet\n"
" -both: faces where both neighbours are in the cellSet\n\n"
);
const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
Foam::cellToFace::cellActionNames_;

2
src/meshTools/sets/faceSources/cellToFace/cellToFace.H
View File

@ -66,8 +66,6 @@ public:
private:
//- Add usage string
static addToUsageTable usage_;
static const NamedEnum<cellAction, 2> cellActionNames_;

9
src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cylinderAnnulusToFace::usage_
(
cylinderAnnulusToFace::typeName,
"\n Usage: cylinderAnnulusToFace (point1X point1Y point1Z)"
" (point2X point2Y point2Z) outerRadius innerRadius\n\n"
" Select all faces with face centre within bounding cylinder annulus\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::cylinderAnnulusToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H
View File

@ -54,8 +54,6 @@ class cylinderAnnulusToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- First point on cylinder axis
vector point1_;

9
src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cylinderToFace::usage_
(
cylinderToFace::typeName,
"\n Usage: cylinderToFace (point1X point1Y point1Z)"
" (point2X point2Y point2Z) radius\n\n"
" Select all faces with face centre within bounding cylinder\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::cylinderToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H
View File

@ -53,8 +53,6 @@ class cylinderToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- First point on cylinder axis
vector point1_;

8
src/meshTools/sets/faceSources/faceToFace/faceToFace.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::faceToFace::usage_
(
faceToFace::typeName,
"\n Usage: faceToFace <faceSet>\n\n"
" Select all faces in the faceSet\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::faceToFace::faceToFace

2
src/meshTools/sets/faceSources/faceToFace/faceToFace.H
View File

@ -52,8 +52,6 @@ class faceToFace
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

8
src/meshTools/sets/faceSources/labelToFace/labelToFace.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::labelToFace::usage_
(
labelToFace::typeName,
"\n Usage: labelToFace (i0 i1 .. in)\n\n"
" Select faces by label\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::labelToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/labelToFace/labelToFace.H
View File

@ -53,8 +53,6 @@ class labelToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Cell labels read from dictionary
labelList labels_;

9
src/meshTools/sets/faceSources/normalToFace/normalToFace.C
View File

@ -37,15 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::normalToFace::usage_
(
normalToFace::typeName,
"\n Usage: normalToFace (nx ny nz) <tol>\n\n"
" Select faces with normal aligned to unit vector (nx ny nz)\n"
" to within tol\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::normalToFace::setNormal()

2
src/meshTools/sets/faceSources/normalToFace/normalToFace.H
View File

@ -54,8 +54,6 @@ class normalToFace
private:
//- Add usage string
static addToUsageTable usage_;
//- (unit)vector to compare to
vector normal_;

8
src/meshTools/sets/faceSources/patchToFace/patchToFace.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::patchToFace::usage_
(
patchToFace::typeName,
"\n Usage: patchToFace patch\n\n"
" Select all faces in the patch. Note:accepts wildcards for patch.\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::patchToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/patchToFace/patchToFace.H
View File

@ -54,8 +54,6 @@ class patchToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name/regular expression of patch
wordRe patchName_;

10
src/meshTools/sets/faceSources/pointToFace/pointToFace.C
View File

@ -49,16 +49,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
(
pointToFace::typeName,
"\n Usage: pointToFace <pointSet> any|all|edge\n\n"
" Select faces with\n"
" -any point in the pointSet\n"
" -all points in the pointSet\n\n"
" -two consecutive points (an edge) in the pointSet\n\n"
);
const Foam::NamedEnum<Foam::pointToFace::pointAction, 3>
Foam::pointToFace::pointActionNames_;

2
src/meshTools/sets/faceSources/pointToFace/pointToFace.H
View File

@ -65,8 +65,6 @@ public:
private:
//- Add usage string
static addToUsageTable usage_;
static const NamedEnum<pointAction, 3> pointActionNames_;

9
src/meshTools/sets/faceSources/regionToFace/regionToFace.C
View File

@ -42,15 +42,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::regionToFace::usage_
(
regionToFace::typeName,
"\n Usage: regionToFace <faceSet> (x y z)\n\n"
" Select all faces in the connected region of the faceSet"
" starting from the point.\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::regionToFace::markZone

2
src/meshTools/sets/faceSources/regionToFace/regionToFace.H
View File

@ -55,8 +55,6 @@ class regionToFace
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C
View File

@ -36,15 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::zoneToFace::usage_
(
zoneToFace::typeName,
"\n Usage: zoneToFace zone\n\n"
" Select all faces in the faceZone."
" Note:accepts wildcards for zone.\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::zoneToFace::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
View File

@ -54,8 +54,6 @@ class zoneToFace
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name/regular expression of cellZone
wordRe zoneName_;

8
src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::faceZoneToFaceZone::usage_
(
faceZoneToFaceZone::typeName,
"\n Usage: faceZoneToFaceZone <faceZone>\n\n"
" Select all faces in the faceZone\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::faceZoneToFaceZone::faceZoneToFaceZone

2
src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
View File

@ -52,8 +52,6 @@ class faceZoneToFaceZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C
View File

@ -54,15 +54,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::planeToFaceZone::usage_
(
planeToFaceZone::typeName,
"\n Usage: planeToFaceZone (px py pz) (nx ny nz) include\n\n"
" Select faces for which the adjacent cell centres lie on opposite "
" of a plane\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::planeToFaceZone::combine(faceZoneSet& fzSet, const bool add) const

2
src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H
View File

@ -77,8 +77,6 @@ private:
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Point on the plane
const vector point_;

9
src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C
View File

@ -46,15 +46,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::searchableSurfaceToFaceZone::usage_
(
searchableSurfaceToFaceZone::typeName,
"\n Usage: searchableSurfaceToFaceZone surface\n\n"
" Select all faces whose cell-cell centre vector intersects the surface "
"\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::searchableSurfaceToFaceZone::combine

4
src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,8 +56,6 @@ class searchableSurfaceToFaceZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Surface
autoPtr<searchableSurface> surfacePtr_;

8
src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
View File

@ -42,14 +42,6 @@ addToRunTimeSelectionTable(topoSetSource, setAndNormalToFaceZone, word);
}
Foam::topoSetSource::addToUsageTable Foam::setAndNormalToFaceZone::usage_
(
setAndNormalToFaceZone::typeName,
"\n Usage: setAndNormalToFaceZone <faceSet> <normal>\n\n"
" Select all faces in the faceSet and orient using normal.\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::setAndNormalToFaceZone::setAndNormalToFaceZone

2
src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H
View File

@ -53,8 +53,6 @@ class setAndNormalToFaceZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C
View File

@ -37,15 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::setToFaceZone::usage_
(
setToFaceZone::typeName,
"\n Usage: setToFaceZone <faceSet>\n\n"
" Select all faces in the faceSet."
" Sets flipMap.\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::setToFaceZone::setToFaceZone

2
src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
View File

@ -53,8 +53,6 @@ class setToFaceZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

9
src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
View File

@ -39,15 +39,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::setsToFaceZone::usage_
(
setsToFaceZone::typeName,
"\n Usage: setsToFaceZone <faceSet> <slaveCellSet>\n\n"
" Select all faces in the faceSet."
" Orientated so slave side is in cellSet.\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::setsToFaceZone::setsToFaceZone

2
src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
View File

@ -53,8 +53,6 @@ class setsToFaceZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
const word faceSetName_;

8
src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::boxToPoint::usage_
(
boxToPoint::typeName,
"\n Usage: boxToPoint ((minx miny minz) (maxx maxy maxz))\n\n"
" Select all points with coordinate within bounding box\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boxToPoint::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
View File

@ -54,8 +54,6 @@ class boxToPoint
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Bounding box.
treeBoundBoxList bbs_;

7
src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
View File

@ -47,13 +47,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
(
cellToPoint::typeName,
"\n Usage: cellToPoint <cellSet> all\n\n"
" Select all points of cells in the cellSet\n\n"
);
const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
Foam::cellToPoint::cellActionNames_;

2
src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
View File

@ -61,8 +61,6 @@ public:
private:
//- Add usage string
static addToUsageTable usage_;
static const NamedEnum<cellAction, 1> cellActionNames_;

7
src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
View File

@ -47,13 +47,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
(
faceToPoint::typeName,
"\n Usage: faceToPoint <faceSet> all\n\n"
" Select all points of faces in the faceSet\n\n"
);
const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
Foam::faceToPoint::faceActionNames_;

2
src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
View File

@ -61,8 +61,6 @@ public:
private:
//- Add usage string
static addToUsageTable usage_;
static const NamedEnum<faceAction, 1> faceActionNames_;

8
src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::labelToPoint::usage_
(
labelToPoint::typeName,
"\n Usage: labelToPoint (i0 i1 .. in)\n\n"
" Select points by label\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::labelToPoint::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
View File

@ -53,8 +53,6 @@ class labelToPoint
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Point labels read from dictionary
labelList labels_;

8
src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
View File

@ -36,14 +36,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::nearestToPoint::usage_
(
nearestToPoint::typeName,
"\n Usage: nearestToPoint (pt0 .. ptn)\n\n"
" Select the nearest point for each of the points pt0 ..ptn\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::nearestToPoint::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
View File

@ -53,8 +53,6 @@ class nearestToPoint
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Points to select nearest to
pointField points_;

8
src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::pointToPoint::usage_
(
pointToPoint::typeName,
"\n Usage: pointToPoint <pointSet>\n\n"
" Select all points in the pointSet\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::pointToPoint::pointToPoint

2
src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
View File

@ -52,8 +52,6 @@ class pointToPoint
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

13
src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
View File

@ -39,19 +39,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::surfaceToPoint::usage_
(
surfaceToPoint::typeName,
"\n Usage: surfaceToPoint <surface> <near> <inside> <outside>\n\n"
" <surface> name of triSurface\n"
" <near> scalar; include points with coordinate <= near to surface\n"
" <inside> boolean; whether to include points on opposite side of"
" surface normal\n"
" <outside> boolean; whether to include points on this side of"
" surface normal\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::surfaceToPoint::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
View File

@ -61,8 +61,6 @@ class surfaceToPoint
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of surface file
fileName surfName_;

9
src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C
View File

@ -37,15 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::zoneToPoint::usage_
(
zoneToPoint::typeName,
"\n Usage: zoneToPoint zone\n\n"
" Select all points in the pointZone."
" Note:accepts wildcards for zone.\n\n"
);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::zoneToPoint::combine(topoSet& set, const bool add) const

2
src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
View File

@ -54,8 +54,6 @@ class zoneToPoint
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name/regular expression of zone
wordRe zoneName_;

8
src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
View File

@ -37,14 +37,6 @@ namespace Foam
}
Foam::topoSetSource::addToUsageTable Foam::setToPointZone::usage_
(
setToPointZone::typeName,
"\n Usage: setToPointZone <pointSet>\n\n"
" Select all points in the pointSet.\n\n"
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::setToPointZone::setToPointZone

2
src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
View File

@ -52,8 +52,6 @@ class setToPointZone
{
// Private Data
//- Add usage string
static addToUsageTable usage_;
//- Name of set to use
word setName_;

3
src/meshTools/sets/topoSetSource/topoSetSource.C
View File

@ -53,9 +53,6 @@ namespace Foam
}
Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = nullptr;
const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>
Foam::topoSetSource::actionNames_;

49
src/meshTools/sets/topoSetSource/topoSetSource.H
View File

@ -92,36 +92,9 @@ public:
REMOVE
};
protected:
//- A table of usage strings
static HashTable<string>* usageTablePtr_;
//- Class with constructor to add usage string to table
class addToUsageTable
{
public:
addToUsageTable(const word& name, const string& msg)
{
if (!usageTablePtr_)
{
usageTablePtr_ = new HashTable<string>();
}
usageTablePtr_->insert(name, msg);
}
~addToUsageTable()
{
if (usageTablePtr_)
{
delete usageTablePtr_;
usageTablePtr_ = nullptr;
}
}
};
// Protected data
const polyMesh& mesh_;
@ -190,26 +163,6 @@ public:
};
static const string& usage(const word& name)
{
if (!usageTablePtr_)
{
usageTablePtr_ = new HashTable<string>();
}
const HashTable<string>& usageTable = *usageTablePtr_;
if (usageTable.found(name))
{
return usageTable[name];
}
else
{
return illegalSource_;
}
}
// Constructors
//- Construct from components