From 976de0baf53cd3e8efd8102d04409be1e954c28f Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 26 Jul 2021 16:48:14 +0100 Subject: [PATCH] topoSetSources: Removed redundant code --- .../badQualityToCell/badQualityToCell.C | 8 --- .../badQualityToCell/badQualityToCell.H | 3 -- .../badQualityToFace/badQualityToFace.C | 8 --- .../badQualityToFace/badQualityToFace.H | 3 -- .../sets/cellSources/boxToCell/boxToCell.C | 8 --- .../sets/cellSources/boxToCell/boxToCell.H | 2 - .../sets/cellSources/cellToCell/cellToCell.C | 8 --- .../sets/cellSources/cellToCell/cellToCell.H | 2 - .../cylinderAnnulusToCell.C | 9 ---- .../cylinderAnnulusToCell.H | 2 - .../cylinderToCell/cylinderToCell.C | 9 ---- .../cylinderToCell/cylinderToCell.H | 2 - .../sets/cellSources/faceToCell/faceToCell.C | 8 --- .../sets/cellSources/faceToCell/faceToCell.H | 2 - .../faceZoneToCell/faceZoneToCell.C | 9 ---- .../faceZoneToCell/faceZoneToCell.H | 2 - .../cellSources/fieldToCell/fieldToCell.C | 9 ---- .../cellSources/fieldToCell/fieldToCell.H | 9 ++-- .../cellSources/labelToCell/labelToCell.C | 8 --- .../cellSources/labelToCell/labelToCell.H | 2 - .../sets/cellSources/nbrToCell/nbrToCell.C | 8 --- .../sets/cellSources/nbrToCell/nbrToCell.H | 2 - .../cellSources/nearestToCell/nearestToCell.C | 8 --- .../cellSources/nearestToCell/nearestToCell.H | 2 - .../patchDistanceToCell/patchDistanceToCell.C | 34 ------------- .../patchDistanceToCell/patchDistanceToCell.H | 9 ---- .../cellSources/pointToCell/pointToCell.C | 8 --- .../cellSources/pointToCell/pointToCell.H | 2 - .../cellSources/regionToCell/regionToCell.C | 9 ---- .../cellSources/regionToCell/regionToCell.H | 2 - .../rotatedBoxToCell/rotatedBoxToCell.C | 19 ------- .../rotatedBoxToCell/rotatedBoxToCell.H | 7 +-- .../cellSources/shapeToCell/shapeToCell.C | 9 ---- .../cellSources/shapeToCell/shapeToCell.H | 2 - .../cellSources/sphereToCell/sphereToCell.C | 8 --- .../cellSources/sphereToCell/sphereToCell.H | 2 - .../cellSources/surfaceToCell/surfaceToCell.C | 18 ------- .../cellSources/surfaceToCell/surfaceToCell.H | 2 - .../targetVolumeToCell/targetVolumeToCell.C | 8 --- .../targetVolumeToCell/targetVolumeToCell.H | 2 - .../sets/cellSources/zoneToCell/zoneToCell.C | 9 ---- .../sets/cellSources/zoneToCell/zoneToCell.H | 2 - .../setToCellZone/setToCellZone.C | 8 --- .../setToCellZone/setToCellZone.H | 2 - .../boundaryToFace/boundaryToFace.C | 18 ------- .../boundaryToFace/boundaryToFace.H | 11 +---- .../sets/faceSources/boxToFace/boxToFace.C | 8 --- .../sets/faceSources/boxToFace/boxToFace.H | 2 - .../sets/faceSources/cellToFace/cellToFace.C | 8 --- .../sets/faceSources/cellToFace/cellToFace.H | 2 - .../cylinderAnnulusToFace.C | 9 ---- .../cylinderAnnulusToFace.H | 2 - .../cylinderToFace/cylinderToFace.C | 9 ---- .../cylinderToFace/cylinderToFace.H | 2 - .../sets/faceSources/faceToFace/faceToFace.C | 8 --- .../sets/faceSources/faceToFace/faceToFace.H | 2 - .../faceSources/labelToFace/labelToFace.C | 8 --- .../faceSources/labelToFace/labelToFace.H | 2 - .../faceSources/normalToFace/normalToFace.C | 9 ---- .../faceSources/normalToFace/normalToFace.H | 2 - .../faceSources/patchToFace/patchToFace.C | 8 --- .../faceSources/patchToFace/patchToFace.H | 2 - .../faceSources/pointToFace/pointToFace.C | 10 ---- .../faceSources/pointToFace/pointToFace.H | 2 - .../faceSources/regionToFace/regionToFace.C | 9 ---- .../faceSources/regionToFace/regionToFace.H | 2 - .../sets/faceSources/zoneToFace/zoneToFace.C | 9 ---- .../sets/faceSources/zoneToFace/zoneToFace.H | 2 - .../faceZoneToFaceZone/faceZoneToFaceZone.C | 8 --- .../faceZoneToFaceZone/faceZoneToFaceZone.H | 2 - .../planeToFaceZone/planeToFaceZone.C | 9 ---- .../planeToFaceZone/planeToFaceZone.H | 2 - .../searchableSurfaceToFaceZone.C | 9 ---- .../searchableSurfaceToFaceZone.H | 4 +- .../setAndNormalToFaceZone.C | 8 --- .../setAndNormalToFaceZone.H | 2 - .../setToFaceZone/setToFaceZone.C | 9 ---- .../setToFaceZone/setToFaceZone.H | 2 - .../setsToFaceZone/setsToFaceZone.C | 9 ---- .../setsToFaceZone/setsToFaceZone.H | 2 - .../sets/pointSources/boxToPoint/boxToPoint.C | 8 --- .../sets/pointSources/boxToPoint/boxToPoint.H | 2 - .../pointSources/cellToPoint/cellToPoint.C | 7 --- .../pointSources/cellToPoint/cellToPoint.H | 2 - .../pointSources/faceToPoint/faceToPoint.C | 7 --- .../pointSources/faceToPoint/faceToPoint.H | 2 - .../pointSources/labelToPoint/labelToPoint.C | 8 --- .../pointSources/labelToPoint/labelToPoint.H | 2 - .../nearestToPoint/nearestToPoint.C | 8 --- .../nearestToPoint/nearestToPoint.H | 2 - .../pointSources/pointToPoint/pointToPoint.C | 8 --- .../pointSources/pointToPoint/pointToPoint.H | 2 - .../surfaceToPoint/surfaceToPoint.C | 13 ----- .../surfaceToPoint/surfaceToPoint.H | 2 - .../pointSources/zoneToPoint/zoneToPoint.C | 9 ---- .../pointSources/zoneToPoint/zoneToPoint.H | 2 - .../setToPointZone/setToPointZone.C | 8 --- .../setToPointZone/setToPointZone.H | 2 - .../sets/topoSetSource/topoSetSource.C | 3 -- .../sets/topoSetSource/topoSetSource.H | 49 +------------------ 100 files changed, 7 insertions(+), 646 deletions(-) diff --git a/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C index a2efa8e3e4..0706a2d4d3 100644 --- a/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C +++ b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C @@ -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 diff --git a/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H index 90d569f915..d749feb5b7 100644 --- a/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H +++ b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H @@ -54,9 +54,6 @@ class badQualityToCell // Private Data - //- Add usage string - static addToUsageTable usage_; - //- Mesh quality dictionary const dictionary dict_; diff --git a/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C index 3f3aac739a..3bc7a70e5f 100644 --- a/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C +++ b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C @@ -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 diff --git a/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H index 86ad55352c..20f59819a8 100644 --- a/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H +++ b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H @@ -54,9 +54,6 @@ class badQualityToFace // Private Data - //- Add usage string - static addToUsageTable usage_; - //- Mesh quality dictionary const dictionary dict_; diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C index c56d913381..f6e03db90d 100644 --- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C +++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H index c57f472670..5e9a9fdf94 100644 --- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H +++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H @@ -53,8 +53,6 @@ class boxToCell { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Bounding box. treeBoundBoxList bbs_; diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C index 62e1fd8cd6..d349cc7cc6 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::cellToCell::usage_ -( - cellToCell::typeName, - "\n Usage: cellToCell \n\n" - " Select all cells in the cellSet\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::cellToCell::cellToCell diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H index 5e4965038c..2036294098 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H @@ -52,8 +52,6 @@ class cellToCell { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C index 43a0455a17..9160755701 100644 --- a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C +++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H index da564edf39..601f9cd035 100644 --- a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H +++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H @@ -54,8 +54,6 @@ class cylinderAnnulusToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- First point on cylinder axis vector point1_; diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C index 246a0e7508..44a60267fa 100644 --- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C +++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H index 8ef6d81907..d4a1207cba 100644 --- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H +++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H @@ -53,8 +53,6 @@ class cylinderToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- First point on cylinder axis vector point1_; diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C index deb5ff4a3a..f2676060e8 100644 --- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C +++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C @@ -50,14 +50,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_ -( - faceToCell::typeName, - "\n Usage: faceToCell 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::faceActionNames_; diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H index 63227001d8..3de13bc6a9 100644 --- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H +++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H @@ -66,8 +66,6 @@ private: static const NamedEnum faceActionNames_; - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C index 67500994e9..fd427e5b63 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C @@ -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::faceActionNames_; diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H index 8a29ec238b..5a484e782d 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H @@ -65,8 +65,6 @@ private: static const NamedEnum faceActionNames_; - //- Add usage string - static addToUsageTable usage_; //- Name/regular expression of faceZone wordRe zoneName_; diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C index da3ec44f9a..ee6ff3c007 100644 --- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C +++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H index 68836b1938..366ceda1d8 100644 --- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H +++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H @@ -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 diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.C b/src/meshTools/sets/cellSources/labelToCell/labelToCell.C index e370dcbf56..6c81863e06 100644 --- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.C +++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H index ada39fd0a3..784b4a0525 100644 --- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H +++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H @@ -53,8 +53,6 @@ class labelToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Cell labels read from dictionary labelList labels_; diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C index 27aed54b84..7ef45f4d87 100644 --- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C +++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C @@ -36,14 +36,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::nbrToCell::usage_ -( - nbrToCell::typeName, - "\n Usage: nbrToCell \n\n" - " Select all cells with <= nNeighbours neighbouring cells\n\n" -); - - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void Foam::nbrToCell::combine(topoSet& set, const bool add) const diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H index f363ae189b..6efc6369a0 100644 --- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H +++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H @@ -54,8 +54,6 @@ class nbrToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Number of internal faces on cell label minNbrs_; diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C index 44eaa666f2..12c8e0e6c9 100644 --- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C +++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H index 3935012cd7..c1df48d949 100644 --- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H +++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H @@ -53,8 +53,6 @@ class nearestToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Points to select nearest to pointField points_; diff --git a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C index dd19056809..42da6de22c 100644 --- a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C +++ b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C @@ -36,14 +36,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::patchDistanceToCell::usage_ -( - patchDistanceToCell::typeName, - "\n Usage: patchDistanceToCell () 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() diff --git a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H index 40cc5500b3..e7c8be4c21 100644 --- a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H +++ b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H @@ -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(); diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C index 99bb1d9192..2ebc6e2071 100644 --- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C +++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C @@ -48,14 +48,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_ -( - pointToCell::typeName, - "\n Usage: pointToCell 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::pointActionNames_; diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H index 7e0352eb5d..6a827b235c 100644 --- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H +++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H @@ -62,8 +62,6 @@ public: private: - //- Add usage string - static addToUsageTable usage_; static const NamedEnum pointActionNames_; diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C index 6378a9a9c1..e44485bb77 100644 --- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C +++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H index c612aeeafe..12465b6bc8 100644 --- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H +++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H @@ -70,8 +70,6 @@ class regionToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of cellSet to keep to const word setName_; diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C index 47ea7b6c45..9dfac1ea65 100644 --- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C +++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C @@ -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() diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H index ce3e4d6596..b3f10a0965 100644 --- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H +++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H @@ -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(); diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C index 7e6a22561b..55e9954d9b 100644 --- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C +++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C @@ -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)); diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H index b0df9d6f3c..4db2716d22 100644 --- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H +++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H @@ -56,8 +56,6 @@ class shapeToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of cell type word type_; diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C index ec6d166a38..c7f93f73b3 100644 --- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C +++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H index 9dccb5fa0a..f5006448fb 100644 --- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H +++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H @@ -53,8 +53,6 @@ class sphereToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Centre vector centre_; diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C index 9aa62356ad..3b08e6bff5 100644 --- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C +++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C @@ -42,24 +42,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::surfaceToCell::usage_ -( - surfaceToCell::typeName, - "\n Usage: surfaceToCell" - " \n\n" - " name of triSurface\n" - " list of points that define outside\n" - " boolean whether to include cells cut by surface\n" - " ,, ,, inside surface\n" - " ,, ,, outside surface\n" - " scalar; include cells with centre <= near to surface\n" - " 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 diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H index 7a2c07c57d..512f56ac85 100644 --- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H +++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H @@ -65,8 +65,6 @@ class surfaceToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of surface file const fileName surfName_; diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C index e1b7ac296d..b2db2739ef 100644 --- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C +++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H index 6cc86be5ef..4986267b5d 100644 --- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H +++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H @@ -55,8 +55,6 @@ class targetVolumeToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Wanted volume const scalar vol_; diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C index 352c6e6f46..59c3fb556c 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C @@ -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 diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H index 8e99688c7d..86d95d3138 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H @@ -54,8 +54,6 @@ class zoneToCell // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name/regular expression of cellZone wordRe zoneName_; diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C index 59be62aa20..b99a984487 100644 --- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C +++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::setToCellZone::usage_ -( - setToCellZone::typeName, - "\n Usage: setToCellZone \n\n" - " Select all cells in the cellSet.\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::setToCellZone::setToCellZone diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H index 066eb5ecb8..e25be3e510 100644 --- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H +++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H @@ -52,8 +52,6 @@ class setToCellZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C index d9a5b9def3..e61f8f991e 100644 --- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C +++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C @@ -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() diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H index bcbc13c8a5..2e0edb28e2 100644 --- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H +++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H @@ -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(); diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C index 07c17c2388..0a346840b0 100644 --- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C +++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H index 95c7157991..ab1f4f9ade 100644 --- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H +++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H @@ -53,8 +53,6 @@ class boxToFace { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Bounding box. treeBoundBoxList bbs_; diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C index 397fec446c..616fd90f10 100644 --- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C +++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C @@ -51,14 +51,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_ -( - cellToFace::typeName, - "\n Usage: cellToFace 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::cellActionNames_; diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H index c09fb04aa2..b1019920b4 100644 --- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H +++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H @@ -66,8 +66,6 @@ public: private: - //- Add usage string - static addToUsageTable usage_; static const NamedEnum cellActionNames_; diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C index d3fbf5e389..e3aa94b2a0 100644 --- a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C +++ b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H index 5cd0bee3b6..103fb38685 100644 --- a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H +++ b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H @@ -54,8 +54,6 @@ class cylinderAnnulusToFace // Private Data - //- Add usage string - static addToUsageTable usage_; //- First point on cylinder axis vector point1_; diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C index 2c55dde342..da62bb2631 100644 --- a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C +++ b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H index 128c903811..13895a99e2 100644 --- a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H +++ b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H @@ -53,8 +53,6 @@ class cylinderToFace // Private Data - //- Add usage string - static addToUsageTable usage_; //- First point on cylinder axis vector point1_; diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C index 7641258431..5766aceb8b 100644 --- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C +++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::faceToFace::usage_ -( - faceToFace::typeName, - "\n Usage: faceToFace \n\n" - " Select all faces in the faceSet\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::faceToFace::faceToFace diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H index cdb7416928..9a25f4dcc1 100644 --- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H +++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H @@ -52,8 +52,6 @@ class faceToFace { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C index 08a64ed401..e075974c64 100644 --- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C +++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H index 7bfbd0a858..6df6bc12ae 100644 --- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H +++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H @@ -53,8 +53,6 @@ class labelToFace // Private Data - //- Add usage string - static addToUsageTable usage_; //- Cell labels read from dictionary labelList labels_; diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C index 23a9a8aa6f..30c26193ac 100644 --- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C +++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C @@ -37,15 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::normalToFace::usage_ -( - normalToFace::typeName, - "\n Usage: normalToFace (nx ny nz) \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() diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H index af822c517e..342c5890fd 100644 --- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H +++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H @@ -54,8 +54,6 @@ class normalToFace private: - //- Add usage string - static addToUsageTable usage_; //- (unit)vector to compare to vector normal_; diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C index 2748f35800..2a05a654a3 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H index aa9c403702..3e80dc5513 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H @@ -54,8 +54,6 @@ class patchToFace // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name/regular expression of patch wordRe patchName_; diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C index e9349dd2ec..0216a14c15 100644 --- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C +++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C @@ -49,16 +49,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_ -( - pointToFace::typeName, - "\n Usage: pointToFace 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::pointActionNames_; diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H index 22256da36a..71083dcc1e 100644 --- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H +++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H @@ -65,8 +65,6 @@ public: private: - //- Add usage string - static addToUsageTable usage_; static const NamedEnum pointActionNames_; diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C index 538e18d405..031eaf945b 100644 --- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C +++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C @@ -42,15 +42,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::regionToFace::usage_ -( - regionToFace::typeName, - "\n Usage: regionToFace (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 diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.H b/src/meshTools/sets/faceSources/regionToFace/regionToFace.H index 0e97cb6f54..6809f4a68f 100644 --- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.H +++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.H @@ -55,8 +55,6 @@ class regionToFace { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C index 41ed0c7e82..732c3761db 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C @@ -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 diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H index 2aefff2703..adf7975006 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H @@ -54,8 +54,6 @@ class zoneToFace // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name/regular expression of cellZone wordRe zoneName_; diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C index 63a1843cd3..69af848290 100644 --- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::faceZoneToFaceZone::usage_ -( - faceZoneToFaceZone::typeName, - "\n Usage: faceZoneToFaceZone \n\n" - " Select all faces in the faceZone\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::faceZoneToFaceZone::faceZoneToFaceZone diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H index 8ed527fd71..9c70c785e2 100644 --- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H @@ -52,8 +52,6 @@ class faceZoneToFaceZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C index 387032433a..c26b6d1c62 100644 --- a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C @@ -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 diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H index 8c28067fd8..11f1c54081 100644 --- a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H @@ -77,8 +77,6 @@ private: // Private Data - //- Add usage string - static addToUsageTable usage_; //- Point on the plane const vector point_; diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C index 2392f605a9..ad7b77e1e4 100644 --- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C @@ -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 diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H index a68ee5f642..b50c78ff3c 100644 --- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H @@ -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 surfacePtr_; diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C index a4e9a6af88..684baba7da 100644 --- a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C @@ -42,14 +42,6 @@ addToRunTimeSelectionTable(topoSetSource, setAndNormalToFaceZone, word); } -Foam::topoSetSource::addToUsageTable Foam::setAndNormalToFaceZone::usage_ -( - setAndNormalToFaceZone::typeName, - "\n Usage: setAndNormalToFaceZone \n\n" - " Select all faces in the faceSet and orient using normal.\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::setAndNormalToFaceZone::setAndNormalToFaceZone diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H index ab5b0940ed..5e98337aa4 100644 --- a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H @@ -53,8 +53,6 @@ class setAndNormalToFaceZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C index d79f8d2020..e40c995a3f 100644 --- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C @@ -37,15 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::setToFaceZone::usage_ -( - setToFaceZone::typeName, - "\n Usage: setToFaceZone \n\n" - " Select all faces in the faceSet." - " Sets flipMap.\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::setToFaceZone::setToFaceZone diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H index bce5ac2388..d3c03dd3f1 100644 --- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H @@ -53,8 +53,6 @@ class setToFaceZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C index c18c6425fd..9edbe12a28 100644 --- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C @@ -39,15 +39,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::setsToFaceZone::usage_ -( - setsToFaceZone::typeName, - "\n Usage: setsToFaceZone \n\n" - " Select all faces in the faceSet." - " Orientated so slave side is in cellSet.\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::setsToFaceZone::setsToFaceZone diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H index 23c5e71f5b..2e2b1dc82e 100644 --- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H @@ -53,8 +53,6 @@ class setsToFaceZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use const word faceSetName_; diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C index ee2d78ffcb..4781742cc2 100644 --- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C +++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C @@ -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 diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H index dce6eafcc0..c71935d46a 100644 --- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H +++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H @@ -54,8 +54,6 @@ class boxToPoint // Private Data - //- Add usage string - static addToUsageTable usage_; //- Bounding box. treeBoundBoxList bbs_; diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C index 23ee605217..622f3ae152 100644 --- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C +++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C @@ -47,13 +47,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_ -( - cellToPoint::typeName, - "\n Usage: cellToPoint all\n\n" - " Select all points of cells in the cellSet\n\n" -); - const Foam::NamedEnum Foam::cellToPoint::cellActionNames_; diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H index f1d65c6dfe..234baaf12d 100644 --- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H +++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H @@ -61,8 +61,6 @@ public: private: - //- Add usage string - static addToUsageTable usage_; static const NamedEnum cellActionNames_; diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C index 48764b3b25..94b98d5798 100644 --- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C +++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C @@ -47,13 +47,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_ -( - faceToPoint::typeName, - "\n Usage: faceToPoint all\n\n" - " Select all points of faces in the faceSet\n\n" -); - const Foam::NamedEnum Foam::faceToPoint::faceActionNames_; diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H index 9dc075ecbd..a447af51dc 100644 --- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H +++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H @@ -61,8 +61,6 @@ public: private: - //- Add usage string - static addToUsageTable usage_; static const NamedEnum faceActionNames_; diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C index bb44d4dff3..98fdd8209c 100644 --- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C +++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C @@ -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 diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H index 8d267eff9f..498d9f023d 100644 --- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H +++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H @@ -53,8 +53,6 @@ class labelToPoint // Private Data - //- Add usage string - static addToUsageTable usage_; //- Point labels read from dictionary labelList labels_; diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C index 566fbc4c23..0bc75cf528 100644 --- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C +++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C @@ -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 diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H index dd861cf8ed..4e34d4346e 100644 --- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H +++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H @@ -53,8 +53,6 @@ class nearestToPoint // Private Data - //- Add usage string - static addToUsageTable usage_; //- Points to select nearest to pointField points_; diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C index eed63a13bb..75d305f59d 100644 --- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C +++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::pointToPoint::usage_ -( - pointToPoint::typeName, - "\n Usage: pointToPoint \n\n" - " Select all points in the pointSet\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::pointToPoint::pointToPoint diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H index 23ecb3321c..3605ecda98 100644 --- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H +++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H @@ -52,8 +52,6 @@ class pointToPoint { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C index 7114565fb5..41d18312ff 100644 --- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C +++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C @@ -39,19 +39,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::surfaceToPoint::usage_ -( - surfaceToPoint::typeName, - "\n Usage: surfaceToPoint \n\n" - " name of triSurface\n" - " scalar; include points with coordinate <= near to surface\n" - " boolean; whether to include points on opposite side of" - " surface normal\n" - " 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 diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H index 1605ca274d..f6d056c95d 100644 --- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H +++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H @@ -61,8 +61,6 @@ class surfaceToPoint // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of surface file fileName surfName_; diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C index 056fce74a3..5031ea8c9a 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C @@ -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 diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H index e2bc3257f7..c26c1c02e9 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H @@ -54,8 +54,6 @@ class zoneToPoint // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name/regular expression of zone wordRe zoneName_; diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C index 7ad94cdc6f..3eca721bc5 100644 --- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C +++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C @@ -37,14 +37,6 @@ namespace Foam } -Foam::topoSetSource::addToUsageTable Foam::setToPointZone::usage_ -( - setToPointZone::typeName, - "\n Usage: setToPointZone \n\n" - " Select all points in the pointSet.\n\n" -); - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::setToPointZone::setToPointZone diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H index e7e51f2b40..95e1bed19b 100644 --- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H +++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H @@ -52,8 +52,6 @@ class setToPointZone { // Private Data - //- Add usage string - static addToUsageTable usage_; //- Name of set to use word setName_; diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C index 6580e09af4..0044eebd1b 100644 --- a/src/meshTools/sets/topoSetSource/topoSetSource.C +++ b/src/meshTools/sets/topoSetSource/topoSetSource.C @@ -53,9 +53,6 @@ namespace Foam } -Foam::HashTable* Foam::topoSetSource::usageTablePtr_ = nullptr; - - const Foam::NamedEnum Foam::topoSetSource::actionNames_; diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H index dcc433e526..7d7a1d687f 100644 --- a/src/meshTools/sets/topoSetSource/topoSetSource.H +++ b/src/meshTools/sets/topoSetSource/topoSetSource.H @@ -92,36 +92,9 @@ public: REMOVE }; + protected: - //- A table of usage strings - static HashTable* 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(); - } - 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(); - } - - const HashTable& usageTable = *usageTablePtr_; - - if (usageTable.found(name)) - { - return usageTable[name]; - } - else - { - return illegalSource_; - } - } - - // Constructors //- Construct from components