diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H index b25a0867f5..e68577d566 100644 --- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H +++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H @@ -26,7 +26,6 @@ License #include "boundBox.H" #include "pointField.H" - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // inline Foam::boundBox::boundBox() @@ -45,8 +44,8 @@ inline Foam::boundBox::boundBox(const point& min, const point& max) inline Foam::boundBox::boundBox(const dictionary& dict) : - min_(dict.lookup("min")), - max_(dict.lookup("max")) + min_(dict.lookup("min", dimLength)), + max_(dict.lookup("max", dimLength)) {} diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C index 3bda7520d0..797461616a 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C +++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "plane.H" #include "tensor.H" +#include "unitConversion.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -127,19 +128,19 @@ Foam::plane::plane(const dictionary& dict) { calcPntAndVec ( - subDict.lookup("a"), - subDict.lookup("b"), - subDict.lookup("c"), - subDict.lookup("d") + subDict.lookup("a", unitNone), + subDict.lookup("b", unitNone), + subDict.lookup("c", unitNone), + subDict.lookup("d", unitNone) ); } else if (planeType == "embeddedPoints") { calcPntAndVec ( - subDict.lookup("point1"), - subDict.lookup("point2"), - subDict.lookup("point3") + subDict.lookup("point1", dimLength), + subDict.lookup("point2", dimLength), + subDict.lookup("point3", dimLength) ); } else if (planeType == "pointAndNormal") @@ -147,7 +148,8 @@ Foam::plane::plane(const dictionary& dict) point_ = subDict.lookupBackwardsCompatible ( - {"point", "basePoint"} + {"point", "basePoint"}, + dimLength ); normal_ = @@ -155,7 +157,8 @@ Foam::plane::plane(const dictionary& dict) ( subDict.lookupBackwardsCompatible ( - {"normal", "normalVector"} + {"normal", "normalVector"}, + dimless ) ); } diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C index 213d422aeb..1c0c0d614d 100644 --- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C +++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C @@ -97,7 +97,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo zoneInside_ = areaSelectionAlgoNames[method]; if (zoneInside_ == INSIDEPOINT) { - surfacesDict.lookup("insidePoint") >> zoneInsidePoint_; + zoneInsidePoint_ = + surfacesDict.lookup("insidePoint", dimLength); } } diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C index a331bf5eef..f7f0c90b69 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C @@ -78,20 +78,20 @@ Foam::refinementParameters::cellSelectionPoints::cellSelectionPoints inside_ ( dict.found("insidePoints") - ? List(dict.lookup("insidePoints")) + ? dict.lookup>("insidePoints", dimLength) : dict.found("insidePoint") - ? List(1, dict.lookup("insidePoint")) - : dict.found("locationInMesh") - ? List(1, dict.lookup("locationInMesh")) - : List::null() + ? List(1, dict.lookup("insidePoint", dimLength)) + : dict.found("locationInMesh") + ? List(1, dict.lookup("locationInMesh", dimLength)) + : List::null() ), outside_ ( dict.found("outsidePoints") - ? List(dict.lookup("outsidePoints")) + ? dict.lookup>("outsidePoints", dimLength) : dict.found("outsidePoint") - ? List(1, dict.lookup("outsidePoint")) - : List::null() + ? List(1, dict.lookup("outsidePoint", dimLength)) + : List::null() ) { if (inside_.size()) diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C index 7e05473486..a917d7be9b 100644 --- a/src/meshTools/cellClassification/cellClassification.C +++ b/src/meshTools/cellClassification/cellClassification.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -248,7 +248,7 @@ void Foam::cellClassification::markCells ( const meshSearch& queryMesh, const boolList& piercedFace, - const pointField& outsidePts + const List& outsidePts ) { // Use meshwave to partition mesh, starting from outsidePt @@ -482,7 +482,7 @@ Foam::cellClassification::cellClassification const polyMesh& mesh, const meshSearch& meshQuery, const triSurfaceSearch& surfQuery, - const pointField& outsidePoints + const List& outsidePoints ) : labelList(mesh.nCells(), cellClassification::NOTSET), diff --git a/src/meshTools/cellClassification/cellClassification.H b/src/meshTools/cellClassification/cellClassification.H index 438f4af5f7..a7711783fd 100644 --- a/src/meshTools/cellClassification/cellClassification.H +++ b/src/meshTools/cellClassification/cellClassification.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,6 @@ SourceFiles #ifndef cellClassification_H #define cellClassification_H -#include "pointField.H" #include "Map.H" #include "boolList.H" #include "labelList.H" @@ -155,6 +154,7 @@ private: //- Count number of occurrences of elem in list static label count(const labelList& elems, const label elem); + // Private Member Functions //- Mark all faces intersected by or intersecting surface @@ -167,7 +167,7 @@ private: ( const meshSearch& queryMesh, const boolList& piercedFace, - const pointField& outsidePts + const List& outsidePts ); //- Use cell status to classify points as being internal to meshType, @@ -190,6 +190,7 @@ private: // (meshType and non-meshType). void getMeshOutside(const label meshType, faceList&, labelList&) const; + public: // Static Data Members @@ -203,7 +204,7 @@ public: const polyMesh& mesh, const meshSearch& meshQuery, const triSurfaceSearch& surfQuery, - const pointField& outsidePoints + const List& outsidePoints ); //- Construct from mesh and type for every cell. diff --git a/src/meshTools/searchableSurfaces/searchableBox/searchableBox.C b/src/meshTools/searchableSurfaces/searchableBox/searchableBox.C index eaae9803cf..7d72c9792c 100644 --- a/src/meshTools/searchableSurfaces/searchableBox/searchableBox.C +++ b/src/meshTools/searchableSurfaces/searchableBox/searchableBox.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -188,7 +188,7 @@ Foam::searchableBox::searchableBox ) : searchableSurface(io), - treeBoundBox(dict.lookup("min"), dict.lookup("max")) + treeBoundBox(dict) { if (!contains(midpoint())) { diff --git a/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.C b/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.C index 8d17910bc8..2e9d663c33 100644 --- a/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.C +++ b/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -500,11 +500,11 @@ Foam::searchableCylinder::searchableCylinder ) : searchableSurface(io), - point1_(dict.lookup("point1")), - point2_(dict.lookup("point2")), - magDir_(mag(point2_-point1_)), - unitDir_((point2_-point1_)/magDir_), - radius_(dict.lookup("radius")) + point1_(dict.lookup("point1", dimLength)), + point2_(dict.lookup("point2", dimLength)), + magDir_(mag(point2_ - point1_)), + unitDir_((point2_ - point1_)/magDir_), + radius_(dict.lookup("radius", dimLength)) { bounds() = calcBounds(); } diff --git a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C index 906b5b4687..ce5cb6a315 100644 --- a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C +++ b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -160,9 +160,9 @@ Foam::searchableDisk::searchableDisk ) : searchableSurface(io), - origin_(dict.lookup("origin")), - normal_(dict.lookup("normal")), - radius_(dict.lookup("radius")) + origin_(dict.lookup("origin", dimLength)), + normal_(dict.lookup("normal", dimless)), + radius_(dict.lookup("radius", dimLength)) { normal_ /= mag(normal_); diff --git a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C index 22b10fd5ed..8bd9fe9b52 100644 --- a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C +++ b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle ).objectPath(global()) ) ), - radius_(dict.lookup("radius")) + radius_(dict.lookup("radius", dimLength)) { const edgeMesh& eMesh = eMeshPtr_(); diff --git a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C index c306d5cd87..76fc20731f 100644 --- a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C +++ b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -236,8 +236,8 @@ Foam::searchablePlate::searchablePlate ) : searchableSurface(io), - origin_(dict.lookup("origin")), - span_(dict.lookup("span")), + origin_(dict.lookup("origin", dimLength)), + span_(dict.lookup("span", dimLength)), normalDir_(calcNormal(span_)) { if (debug) diff --git a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C index 4027ab0402..32182f0fdb 100644 --- a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C +++ b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -148,8 +148,8 @@ Foam::searchableSphere::searchableSphere ) : searchableSurface(io), - centre_(dict.lookup("centre")), - radius_(dict.lookup("radius")) + centre_(dict.lookup("centre", dimLength)), + radius_(dict.lookup("radius", dimLength)) { bounds() = boundBox ( diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C index 1bdf803f90..193c26830d 100644 --- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C +++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -197,7 +197,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection const dictionary& subDict = dict.subDict(instance_[surfI]); - scale_[surfI] = subDict.lookup("scale"); + scale_[surfI] = subDict.lookup("scale", dimless); transform_.set ( surfI, diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C index d8e7aa3c3c..c3dc4ef22c 100644 --- a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C +++ b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -178,7 +178,7 @@ Foam::searchableSurfaceWithGaps::searchableSurfaceWithGaps ) : searchableSurface(io), - gap_(dict.lookup("gap")), + gap_(dict.lookup("gap", dimLength)), subGeom_(1) { const word subGeomName(dict.lookup("surface")); diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H index 5e9a9fdf94..02f3cbd952 100644 --- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H +++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,6 @@ class boxToCell { // Private Data - //- Bounding box. treeBoundBoxList bbs_; @@ -68,6 +67,7 @@ public: //- Runtime type information TypeName("boxToCell"); + // Constructors //- Construct from components diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H index 4fe19c5d14..46ba5868aa 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,6 +61,7 @@ public: //- Runtime type information TypeName("cellToCell"); + // Constructors //- Construct from components diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C index 9160755701..d870dcccc8 100644 --- a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C +++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,10 +90,10 @@ Foam::cylinderAnnulusToCell::cylinderAnnulusToCell ) : topoSetSource(mesh), - point1_(dict.lookupBackwardsCompatible({"point1", "p1"})), - point2_(dict.lookupBackwardsCompatible({"point2", "p2"})), - outerRadius_(dict.lookup("outerRadius")), - innerRadius_(dict.lookup("innerRadius")) + point1_(dict.lookupBackwardsCompatible({"point1", "p1"}, dimLength)), + point2_(dict.lookupBackwardsCompatible({"point2", "p2"}, dimLength)), + outerRadius_(dict.lookup("outerRadius", dimLength)), + innerRadius_(dict.lookup("innerRadius", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H index 601f9cd035..9ce7752f1d 100644 --- a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H +++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class cylinderAnnulusToCell : public topoSetSource { - // Private Data - //- First point on cylinder axis vector point1_; @@ -115,7 +113,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C index 44a60267fa..38f6877b75 100644 --- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C +++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,9 +87,9 @@ Foam::cylinderToCell::cylinderToCell ) : topoSetSource(mesh), - point1_(dict.lookupBackwardsCompatible({"point1", "p1"})), - point2_(dict.lookupBackwardsCompatible({"point2", "p2"})), - radius_(dict.lookup("radius")) + point1_(dict.lookupBackwardsCompatible({"point1", "p1"}, dimLength)), + point2_(dict.lookupBackwardsCompatible({"point2", "p2"}, dimLength)), + radius_(dict.lookup("radius", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H index d4a1207cba..d69408e927 100644 --- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H +++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class cylinderToCell : public topoSetSource { - // Private Data - //- First point on cylinder axis vector point1_; @@ -110,7 +108,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H index 3de13bc6a9..ededd59cc3 100644 --- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H +++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,9 @@ class faceToCell public topoSetSource { public: + + // Public Enumerations + //- Enumeration defining the valid options enum faceAction { @@ -61,11 +64,13 @@ public: ALL }; -private: - + //- Names of the valid options static const NamedEnum faceActionNames_; +private: + + // Private Data //- Name of set to use word setName_; @@ -120,7 +125,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H index 5a484e782d..89b5e64f37 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,9 @@ class faceZoneToCell public topoSetSource { public: + + // Public Enumerations + //- Enumeration defining the valid options enum faceAction { @@ -59,13 +62,14 @@ public: SLAVE }; + //- Names of the valid options + static const NamedEnum faceActionNames_; + + private: // Private Data - static const NamedEnum faceActionNames_; - - //- Name/regular expression of faceZone wordRe zoneName_; @@ -83,6 +87,7 @@ public: //- Runtime type information TypeName("faceZoneToCell"); + // Constructors //- Construct from components @@ -117,7 +122,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/hemisphereToCell/hemisphereToCell.C b/src/meshTools/sets/cellSources/hemisphereToCell/hemisphereToCell.C index aaf0034694..25b910e33c 100644 --- a/src/meshTools/sets/cellSources/hemisphereToCell/hemisphereToCell.C +++ b/src/meshTools/sets/cellSources/hemisphereToCell/hemisphereToCell.C @@ -80,10 +80,9 @@ Foam::hemisphereToCell::hemisphereToCell ) : topoSetSource(mesh), - centre_(dict.lookup("centre")), - radius_(dict.lookup("radius")), - axis_(dict.lookup("axis")) - + centre_(dict.lookup("centre", dimLength)), + radius_(dict.lookup("radius", dimLength)), + axis_(dict.lookup("axis", dimless)) {} diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H index 784b4a0525..e8e93b83b1 100644 --- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H +++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class labelToCell : public topoSetSource { - // Private Data - //- Cell labels read from dictionary labelList labels_; @@ -68,6 +66,7 @@ public: //- Runtime type information TypeName("labelToCell"); + // Constructors //- Construct from components @@ -101,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H index 6efc6369a0..bc15a7e542 100644 --- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H +++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class nbrToCell : public topoSetSource { - // Private Data - //- Number of internal faces on cell label minNbrs_; @@ -69,6 +67,7 @@ public: //- Runtime type information TypeName("nbrToCell"); + // Constructors //- Construct from components @@ -102,7 +101,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C index 12c8e0e6c9..51518bee6e 100644 --- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C +++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ Foam::nearestToCell::nearestToCell ) : topoSetSource(mesh), - points_(dict.lookup("points")) + points_(dict.lookup>("points", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H index c1df48d949..f327ad979e 100644 --- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H +++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,12 +50,10 @@ class nearestToCell : public topoSetSource { - // Private Data - //- Points to select nearest to - pointField points_; + List points_; // Private Member Functions @@ -68,6 +66,7 @@ public: //- Runtime type information TypeName("nearestToCell"); + // Constructors //- Construct from components @@ -101,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C index 9678b39995..d613ca03d4 100644 --- a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C +++ b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ Foam::patchDistanceToCell::patchDistanceToCell ? dict.lookup("patches") : wordReList(1, dict.lookup("patch")) ), - distance_(dict.lookup("distance")) + distance_(dict.lookup("distance", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H index e7c8be4c21..d5c54445e5 100644 --- a/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H +++ b/src/meshTools/sets/cellSources/patchDistanceToCell/patchDistanceToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,6 +53,7 @@ class patchDistanceToCell { private: + // Private Data //- List of patches wordReList patches_; diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H index 6a827b235c..06cc8cb661 100644 --- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H +++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,9 @@ class pointToCell public topoSetSource { public: + + // Public Enumerations + //- Enumeration defining the valid options enum pointAction { @@ -60,10 +63,13 @@ public: // ALL // Possible extension: cells whose all points are in set }; + //- Names of the valid options + static const NamedEnum pointActionNames_; + + private: - - static const NamedEnum pointActionNames_; + // Private Data //- Name of set to use word setName_; @@ -83,6 +89,7 @@ public: //- Runtime type information TypeName("pointToCell"); + // Constructors //- Construct from components @@ -117,7 +124,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C index 6c61fd44fd..194f9c5977 100644 --- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C +++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -391,8 +391,8 @@ Foam::regionToCell::regionToCell insidePoints_ ( dict.found("insidePoint") - ? pointField(1, dict.lookup("insidePoint")) - : dict.lookup("insidePoints") + ? List(1, dict.lookup("insidePoint", dimLength)) + : dict.lookup>("insidePoints", dimLength) ), nErode_(dict.lookupOrDefault("nErode", 0)) {} diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H index fb2ce49e2d..709bb1fdf7 100644 --- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H +++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,15 +67,13 @@ class regionToCell : public topoSetSource { - // Private Data - //- Name of cellSet to keep to const word setName_; //- Coordinate(s) that is inside connected region - const pointField insidePoints_; + const List insidePoints_; //- Number of layers to erode const label nErode_; @@ -112,6 +110,7 @@ public: //- Runtime type information TypeName("regionToCell"); + // Constructors //- Construct from components @@ -142,9 +141,11 @@ public: return CELLSETSOURCE; } - virtual void applyToSet(const topoSetSource::setAction action, topoSet&) - const; - + virtual void applyToSet + ( + const topoSetSource::setAction action, + topoSet& + ) const; }; diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C index 521536f652..d8236fb6b2 100644 --- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C +++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -134,9 +134,12 @@ Foam::rotatedBoxToCell::rotatedBoxToCell if (dict.found("box")) { const boundBox bb(dict.lookup("box")); - const vector c(dict.lookupOrDefault("centre", bb.midpoint())); - const vector n1(normalised(dict.lookup("n1"))); - const vector n2(normalised(dict.lookup("n2"))); + const vector c + ( + dict.lookupOrDefault("centre", dimLength, bb.midpoint()) + ); + const vector n1(normalised(dict.lookup("n1", dimless))); + const vector n2(normalised(dict.lookup("n2", dimless))); const tensor R(rotationTensor(n1, n2)); const pointField bbPoints(bb.points()); @@ -148,10 +151,10 @@ Foam::rotatedBoxToCell::rotatedBoxToCell } else { - origin_ = dict.lookup("origin"); - i_ = dict.lookup("i"); - j_ = dict.lookup("j"); - k_ = dict.lookup("k"); + origin_ = dict.lookup("origin", dimLength); + i_ = dict.lookup("i", dimLength); + j_ = dict.lookup("j", dimLength); + k_ = dict.lookup("k", dimLength); } } diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H index 13a5a6f70d..05595395b2 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,6 +108,7 @@ public: //- Runtime type information TypeName("rotatedBoxToCell"); + // Constructors //- Construct from components @@ -140,7 +141,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C index c7f93f73b3..60710ba100 100644 --- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C +++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,8 +77,8 @@ Foam::sphereToCell::sphereToCell ) : topoSetSource(mesh), - centre_(dict.lookup("centre")), - radius_(dict.lookup("radius")) + centre_(dict.lookup("centre", dimLength)), + radius_(dict.lookup("radius", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H index f5006448fb..1d88c79f34 100644 --- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H +++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class sphereToCell : public topoSetSource { - // Private Data - //- Centre vector centre_; @@ -106,7 +104,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C index 3b08e6bff5..398b1c20f0 100644 --- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C +++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -406,7 +406,7 @@ Foam::surfaceToCell::surfaceToCell : topoSetSource(mesh), surfName_(fileName(dict.lookup("file")).expand()), - outsidePoints_(dict.lookup("outsidePoints")), + outsidePoints_(dict.lookup>("outsidePoints", dimLength)), includeCut_(readBool(dict.lookup("includeCut"))), includeInside_(readBool(dict.lookup("includeInside"))), includeOutside_(readBool(dict.lookup("includeOutside"))), @@ -414,8 +414,8 @@ Foam::surfaceToCell::surfaceToCell ( dict.lookupOrDefault("useSurfaceOrientation", false) ), - nearDist_(dict.lookup("nearDistance")), - curvature_(dict.lookup("curvature")), + nearDist_(dict.lookup("nearDistance", dimLength)), + curvature_(dict.lookup("curvature", unitNone)), surfPtr_(new triSurface(surfName_)), querySurfPtr_(new triSurfaceSearch(*surfPtr_)), IOwnPtrs_(true) diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H index 512f56ac85..00c01618c4 100644 --- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H +++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,15 +62,13 @@ class surfaceToCell : public topoSetSource { - // Private Data - //- Name of surface file const fileName surfName_; //- Points which are outside - const pointField outsidePoints_; + const List outsidePoints_; //- Include cut cells const bool includeCut_; @@ -148,6 +146,7 @@ public: //- Runtime type information TypeName("surfaceToCell"); + // Constructors //- Construct from components @@ -204,7 +203,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C index b2db2739ef..61bb8e3700 100644 --- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C +++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -274,8 +274,8 @@ Foam::targetVolumeToCell::targetVolumeToCell ) : topoSetSource(mesh), - vol_(dict.lookup("volume")), - n_(dict.lookup("normal")), + vol_(dict.lookup("volume", pow3(dimLength))), + n_(dict.lookup("normal", dimless)), maskSetName_(dict.lookupOrDefault("set", "")) {} diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H index 4986267b5d..77bcd803e5 100644 --- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H +++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,10 +52,8 @@ class targetVolumeToCell : public topoSetSource { - // Private Data - //- Wanted volume const scalar vol_; @@ -85,6 +83,7 @@ public: //- Runtime type information TypeName("targetVolumeToCell"); + // Constructors //- Construct from components @@ -119,7 +118,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/truncatedConeToCell/truncatedConeToCell.C b/src/meshTools/sets/cellSources/truncatedConeToCell/truncatedConeToCell.C index 73b2745037..7d6872afa3 100644 --- a/src/meshTools/sets/cellSources/truncatedConeToCell/truncatedConeToCell.C +++ b/src/meshTools/sets/cellSources/truncatedConeToCell/truncatedConeToCell.C @@ -91,10 +91,10 @@ Foam::truncatedConeToCell::truncatedConeToCell ) : topoSetSource(mesh), - point1_(dict.lookup("point1")), - point2_(dict.lookup("point2")), - radius1_(dict.lookup("radius1")), - radius2_(dict.lookup("radius2")) + point1_(dict.lookup("point1", dimLength)), + point2_(dict.lookup("point2", dimLength)), + radius1_(dict.lookup("radius1", dimLength)), + radius2_(dict.lookup("radius2", dimLength)) {} diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H index 86d95d3138..d984cd96cf 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class zoneToCell : public topoSetSource { - // Private Data - //- Name/regular expression of cellZone wordRe zoneName_; @@ -69,6 +67,7 @@ public: //- Runtime type information TypeName("zoneToCell"); + // Constructors //- Construct from components @@ -102,7 +101,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H index e25be3e510..49395a1f25 100644 --- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H +++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,16 @@ class setToCellZone { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("setToCellZone"); + // Constructors //- Construct from components @@ -94,7 +95,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H index 2e0edb28e2..6567ea1a96 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,6 @@ class boundaryToFace : public topoSetSource { - // Private Data - - - // Private Member Functions void combine(topoSet& set, const bool add) const; @@ -64,6 +60,7 @@ public: //- Runtime type information TypeName("boundaryToFace"); + // Constructors //- Construct from components @@ -93,7 +90,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H index ab1f4f9ade..afa903576b 100644 --- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H +++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,8 +53,7 @@ class boxToFace { // Private Data - - //- Bounding box. + //- Bounding box treeBoundBoxList bbs_; @@ -68,6 +67,7 @@ public: //- Runtime type information TypeName("boxToFace"); + // Constructors //- Construct from components diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H index b1019920b4..6b775d9507 100644 --- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H +++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,6 +56,9 @@ class cellToFace public topoSetSource { public: + + // Public Enumerations + //- Enumeration defining the valid options enum cellAction { @@ -63,11 +66,13 @@ public: BOTH }; + //- Names of the valid options + static const NamedEnum cellActionNames_; + private: - - static const NamedEnum cellActionNames_; + // Private Data //- Name of set to use word setName_; @@ -87,6 +92,7 @@ public: //- Runtime type information TypeName("cellToFace"); + // Constructors //- Construct from components @@ -121,7 +127,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C index e3aa94b2a0..c379e1607b 100644 --- a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C +++ b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,10 +90,10 @@ Foam::cylinderAnnulusToFace::cylinderAnnulusToFace ) : topoSetSource(mesh), - point1_(dict.lookupBackwardsCompatible({"point1", "p1"})), - point2_(dict.lookupBackwardsCompatible({"point2", "p2"})), - outerRadius_(dict.lookup("outerRadius")), - innerRadius_(dict.lookup("innerRadius")) + point1_(dict.lookupBackwardsCompatible({"point1", "p1"}, dimLength)), + point2_(dict.lookupBackwardsCompatible({"point2", "p2"}, dimLength)), + outerRadius_(dict.lookup("outerRadius", dimLength)), + innerRadius_(dict.lookup("innerRadius", dimLength)) {} diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H index 103fb38685..d17ec8a719 100644 --- a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H +++ b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class cylinderAnnulusToFace : public topoSetSource { - // Private Data - //- 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 da62bb2631..c52c54fc5b 100644 --- a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C +++ b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,9 +87,9 @@ Foam::cylinderToFace::cylinderToFace ) : topoSetSource(mesh), - point1_(dict.lookupBackwardsCompatible({"point1", "p1"})), - point2_(dict.lookupBackwardsCompatible({"point2", "p2"})), - radius_(dict.lookup("radius")) + point1_(dict.lookupBackwardsCompatible({"point1", "p1"}, dimLength)), + point2_(dict.lookupBackwardsCompatible({"point2", "p2"}, dimLength)), + radius_(dict.lookup("radius", dimLength)) {} diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H index 13895a99e2..7cbf370d8f 100644 --- a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H +++ b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class cylinderToFace : public topoSetSource { - // Private Data - //- First point on cylinder axis vector point1_; diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H index 9a25f4dcc1..4c81d05b42 100644 --- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H +++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,16 @@ class faceToFace { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("faceToFace"); + // Constructors //- Construct from components @@ -94,7 +95,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H index 6df6bc12ae..abf76d2402 100644 --- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H +++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class labelToFace : public topoSetSource { - // Private Data - //- Cell labels read from dictionary labelList labels_; @@ -68,6 +66,7 @@ public: //- Runtime type information TypeName("labelToFace"); + // Constructors //- Construct from components @@ -101,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C index 30c26193ac..e8a0924713 100644 --- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C +++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,8 +74,8 @@ Foam::normalToFace::normalToFace Foam::normalToFace::normalToFace(const polyMesh& mesh, const dictionary& dict) : topoSetSource(mesh), - normal_(dict.lookup("normal")), - tol_(dict.lookup("cos")) + normal_(dict.lookup("normal", dimless)), + tol_(dict.lookup("cos", dimless)) { setNormal(); } diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H index 342c5890fd..f45cac1bfc 100644 --- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H +++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,11 +51,11 @@ class normalToFace : public topoSetSource { - private: + // Private Data - //- (unit)vector to compare to + //- (unit) vector to compare to vector normal_; //- Tolerance (i.e. cos of angle between normal_ and faceNormal) @@ -73,6 +73,7 @@ public: //- Runtime type information TypeName("normalToFace"); + // Constructors //- Construct from components @@ -103,7 +104,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H index 3e80dc5513..b2fc56829b 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class patchToFace : public topoSetSource { - // Private Data - //- Name/regular expression of patch wordRe patchName_; @@ -69,6 +67,7 @@ public: //- Runtime type information TypeName("patchToFace"); + // Constructors //- Construct from components @@ -102,7 +101,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H index 71083dcc1e..9bcb333468 100644 --- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H +++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,9 +51,10 @@ class pointToFace : public topoSetSource { - public: + // Public Enumerations + //- Enumeration defining the valid options enum pointAction { @@ -62,11 +63,13 @@ public: EDGE }; + //- Names of the valid options + static const NamedEnum pointActionNames_; + private: - - static const NamedEnum pointActionNames_; + // Private Data //- Name of set to use word setName_; @@ -86,6 +89,7 @@ public: //- Runtime type information TypeName("pointToFace"); + // Constructors //- Construct from components @@ -120,7 +124,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C index 1913b489f8..d862e523d1 100644 --- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C +++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -174,7 +174,7 @@ Foam::regionToFace::regionToFace : topoSetSource(mesh), setName_(dict.lookup("set")), - nearPoint_(dict.lookup("nearPoint")) + nearPoint_(dict.lookup("nearPoint", dimLength)) {} diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.H b/src/meshTools/sets/faceSources/regionToFace/regionToFace.H index 6809f4a68f..cd8b38ba1d 100644 --- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.H +++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,13 +55,13 @@ class regionToFace { // Private Data - //- Name of set to use word setName_; //- Coordinate that is nearest/on connected region point nearPoint_; + // Private Member Functions //- Walk edge-face-edge @@ -76,11 +76,13 @@ class regionToFace void combine(topoSet& set, const bool add) const; + public: //- Runtime type information TypeName("regionToFace"); + // Constructors //- Construct from components @@ -115,7 +117,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.C b/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.C index 9e5e3f6d54..1d0400720f 100644 --- a/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.C +++ b/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -134,9 +134,12 @@ Foam::rotatedBoxToFace::rotatedBoxToFace if (dict.found("box")) { const boundBox bb(dict.lookup("box")); - const vector c(dict.lookupOrDefault("centre", bb.midpoint())); - const vector n1(normalised(dict.lookup("n1"))); - const vector n2(normalised(dict.lookup("n2"))); + const vector c + ( + dict.lookupOrDefault("centre", dimLength, bb.midpoint()) + ); + const vector n1(normalised(dict.lookup("n1", dimless))); + const vector n2(normalised(dict.lookup("n2", dimless))); const tensor R(rotationTensor(n1, n2)); const pointField bbPoints(bb.points()); @@ -148,10 +151,10 @@ Foam::rotatedBoxToFace::rotatedBoxToFace } else { - origin_ = dict.lookup("origin"); - i_ = dict.lookup("i"); - j_ = dict.lookup("j"); - k_ = dict.lookup("k"); + origin_ = dict.lookup("origin", dimLength); + i_ = dict.lookup("i", dimLength); + j_ = dict.lookup("j", dimLength); + k_ = dict.lookup("k", dimLength); } } diff --git a/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.H b/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.H index b6d02a3042..6b7fd6d2fd 100644 --- a/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.H +++ b/src/meshTools/sets/faceSources/rotatedBoxToFace/rotatedBoxToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,6 +108,7 @@ public: //- Runtime type information TypeName("rotatedBoxToFace"); + // Constructors //- Construct from components @@ -140,7 +141,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H index a2d0415b22..877f7a6763 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,6 +67,7 @@ public: //- Runtime type information TypeName("zoneToFace"); + // Constructors //- Construct from components diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H index 9c70c785e2..225d0a112d 100644 --- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,16 @@ class faceZoneToFaceZone { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("faceZoneToFaceZone"); + // Constructors //- Construct from components @@ -94,7 +95,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C index e06bd77f3a..40ed2985f6 100644 --- a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C @@ -364,8 +364,8 @@ Foam::planeToFaceZone::planeToFaceZone ) : topoSetSource(mesh), - point_(dict.lookup("point")), - normal_(dict.lookup("normal")), + point_(dict.lookup("point", dimLength)), + normal_(dict.lookup("normal", dimless)), include_ ( includeNames_ diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H index 11f1c54081..9099c8ea59 100644 --- a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,9 @@ class planeToFaceZone : public topoSetSource { - public: +public: + + // Public Enumerations //- Enumeration for what to include enum include @@ -77,7 +79,6 @@ private: // Private Data - //- 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 34221ab865..54cb9b66fa 100644 --- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -223,7 +223,7 @@ Foam::searchableSurfaceToFaceZone::searchableSurfaceToFaceZone dict ) ), - tol_(dict.lookupOrDefault("tol", rootSmall)) + tol_(dict.lookupOrDefault("tol", dimless, rootSmall)) {} diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H index b50c78ff3c..0b2c1aca84 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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,6 @@ class searchableSurfaceToFaceZone { // Private Data - //- Surface autoPtr surfacePtr_; @@ -74,6 +73,7 @@ public: //- Runtime type information TypeName("searchableSurfaceToFaceZone"); + // Constructors //- Construct from dictionary @@ -100,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C index 872dfda7c3..c7f63d4197 100644 --- a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ Foam::setAndNormalToFaceZone::setAndNormalToFaceZone : topoSetSource(mesh), setName_(dict.lookupBackwardsCompatible({"set", "faceSet"})), - normal_(dict.lookup("normal")) + normal_(dict.lookup("normal", dimless)) {} diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H index 5e98337aa4..c16bcd2698 100644 --- a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,6 @@ class setAndNormalToFaceZone { // Private Data - //- Name of set to use word setName_; @@ -66,6 +65,7 @@ public: //- Runtime type information TypeName("setAndNormalToFaceZone"); + // Constructors //- Construct from components @@ -100,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H index d3c03dd3f1..7eafe2b429 100644 --- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,15 +53,16 @@ class setToFaceZone { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("setToFaceZone"); + // Constructors //- Construct from components @@ -95,7 +96,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H index 2e2b1dc82e..95935a1acf 100644 --- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H +++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,6 @@ class setsToFaceZone { // Private Data - //- Name of set to use const word faceSetName_; @@ -63,11 +62,13 @@ class setsToFaceZone //- Whether cellSet is slave cells or master cells const Switch flip_; + public: //- Runtime type information TypeName("setsToFaceZone"); + // Constructors //- Construct from components @@ -103,7 +104,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H index c71935d46a..9ddc3af6d1 100644 --- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H +++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,11 +51,9 @@ class boxToPoint : public topoSetSource { - // Private Data - - //- Bounding box. + //- Bounding box treeBoundBoxList bbs_; @@ -69,6 +67,7 @@ public: //- Runtime type information TypeName("boxToPoint"); + // Constructors //- Construct from components @@ -102,7 +101,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H index 234baaf12d..3ce11b62e7 100644 --- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H +++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,19 +51,22 @@ class cellToPoint : public topoSetSource { - public: + + // Public Enumerations + //- Enumeration defining the valid options enum cellAction { ALL }; -private: - - + //- Names of the valid options static const NamedEnum cellActionNames_; + +private: + //- Name of set to use word setName_; @@ -82,6 +85,7 @@ public: //- Runtime type information TypeName("cellToPoint"); + // Constructors //- Construct from components @@ -116,7 +120,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H index a447af51dc..63c7a76f07 100644 --- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H +++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,19 +51,22 @@ class faceToPoint : public topoSetSource { - public: + + // Public Enumerations + //- Enumeration defining the valid options enum faceAction { ALL }; -private: - - + //- Names of the valid options static const NamedEnum faceActionNames_; + +private: + //- Name of set to use word setName_; @@ -82,6 +85,7 @@ public: //- Runtime type information TypeName("faceToPoint"); + // Constructors //- Construct from components @@ -116,7 +120,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H index 498d9f023d..03cd562fd8 100644 --- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H +++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ class labelToPoint : public topoSetSource { - // Private Data - //- Point labels read from dictionary labelList labels_; @@ -68,6 +66,7 @@ public: //- Runtime type information TypeName("labelToPoint"); + // Constructors //- Construct from components @@ -101,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C index 0bc75cf528..4fbd6c75a3 100644 --- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C +++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ Foam::nearestToPoint::nearestToPoint ) : topoSetSource(mesh), - points_(dict.lookup("points")) + points_(dict.lookup>("points", dimLength)) {} diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H index 4e34d4346e..7d8529f527 100644 --- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H +++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,12 +50,10 @@ class nearestToPoint : public topoSetSource { - // Private Data - //- Points to select nearest to - pointField points_; + List points_; // Private Member Functions @@ -68,6 +66,7 @@ public: //- Runtime type information TypeName("nearestToPoint"); + // Constructors //- Construct from components @@ -101,7 +100,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H index 3605ecda98..f1c0233c5e 100644 --- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H +++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,16 @@ class pointToPoint { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("pointToPoint"); + // Constructors //- Construct from components @@ -94,7 +95,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C index 41d18312ff..b82b433279 100644 --- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C +++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,7 @@ Foam::surfaceToPoint::surfaceToPoint : topoSetSource(mesh), surfName_(fileName(dict.lookup("file")).expand()), - nearDist_(dict.lookup("nearDistance")), + nearDist_(dict.lookup("nearDistance", dimLength)), includeInside_(readBool(dict.lookup("includeInside"))), includeOutside_(readBool(dict.lookup("includeOutside"))) { diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H index f6d056c95d..93964ee86e 100644 --- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H +++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,10 +58,8 @@ class surfaceToPoint : public topoSetSource { - // Private Data - //- Name of surface file fileName surfName_; @@ -83,11 +81,13 @@ class surfaceToPoint //- Check settings at construction time. void checkSettings() const; + public: //- Runtime type information TypeName("surfaceToPoint"); + // Constructors //- Construct from components @@ -124,7 +124,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H index c26c1c02e9..8911be59fb 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,8 @@ class zoneToPoint : public topoSetSource { - // Private Data - //- Name/regular expression of zone wordRe zoneName_; @@ -69,6 +67,7 @@ public: //- Runtime type information TypeName("zoneToPoint"); + // Constructors //- Construct from components @@ -102,7 +101,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H index 95e1bed19b..cb64c0a757 100644 --- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H +++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,16 @@ class setToPointZone { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information TypeName("setToPointZone"); + // Constructors //- Construct from components @@ -94,7 +95,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/sets/topoSets/cellZoneSet.H index 1fdeff71af..2057b41edb 100644 --- a/src/meshTools/sets/topoSets/cellZoneSet.H +++ b/src/meshTools/sets/topoSets/cellZoneSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,6 +57,7 @@ class cellZoneSet labelList addressing_; + public: //- Runtime type information diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H index 1d7610280e..3322301ef5 100644 --- a/src/meshTools/sets/topoSets/faceSet.H +++ b/src/meshTools/sets/topoSets/faceSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,8 +50,6 @@ class faceSet : public topoSet { - - public: //- Runtime type information @@ -60,7 +58,6 @@ public: // Constructors - //- Construct from IOobject faceSet(const IOobject& obj); @@ -123,7 +120,6 @@ public: const primitiveMesh&, const label maxLen ) const; - }; diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/sets/topoSets/faceZoneSet.H index 13d396a762..5154d3b3e1 100644 --- a/src/meshTools/sets/topoSets/faceZoneSet.H +++ b/src/meshTools/sets/topoSets/faceZoneSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,8 +59,6 @@ class faceZoneSet boolList flipMap_; - // Private Member Functions - public: diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H index f4450f455f..0df71d3e84 100644 --- a/src/meshTools/sets/topoSets/pointSet.H +++ b/src/meshTools/sets/topoSets/pointSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,8 +50,6 @@ class pointSet : public topoSet { - - public: //- Runtime type information @@ -60,7 +58,6 @@ public: // Constructors - //- Construct from IOobject pointSet(const IOobject& obj); @@ -126,7 +123,6 @@ public: const primitiveMesh&, const label maxLen ) const; - }; diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/sets/topoSets/pointZoneSet.H index 7e714ccd8b..f439a56c8e 100644 --- a/src/meshTools/sets/topoSets/pointZoneSet.H +++ b/src/meshTools/sets/topoSets/pointZoneSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,8 +58,6 @@ class pointZoneSet labelList addressing_; - // Private Member Functions - public: diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H index 2ae40e963f..de34a5cba1 100644 --- a/src/meshTools/sets/topoSets/topoSet.H +++ b/src/meshTools/sets/topoSets/topoSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,6 @@ class topoSet public regIOobject, public labelHashSet { - protected: // Protected Member Functions @@ -300,12 +299,10 @@ public: virtual label maxSize(const polyMesh& mesh) const = 0; - // Member Operators //- Copy labelHashSet part only void operator=(const topoSet&); - };