STYLE: remove/replace unneeded SortableList

This commit is contained in:
Mark Olesen
2021-07-15 13:00:12 +02:00
parent aca366d293
commit 0c15f773e0
20 changed files with 16 additions and 51 deletions

View File

@ -53,7 +53,6 @@ SourceFiles
#include "Time.H" #include "Time.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "plane.H" #include "plane.H"
#include "SortableList.H"
#include "meshTools.H" #include "meshTools.H"
#include "dynamicIndexedOctree.H" #include "dynamicIndexedOctree.H"
#include "dynamicTreeDataPoint.H" #include "dynamicTreeDataPoint.H"

View File

@ -47,7 +47,6 @@ Description
#include "argList.H" #include "argList.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "Time.H" #include "Time.H"
#include "SortableList.H"
#include "OFstream.H" #include "OFstream.H"
#include "meshTools.H" #include "meshTools.H"
#include "faceSet.H" #include "faceSet.H"
@ -703,25 +702,21 @@ int main(int argc, char *argv[])
{ {
const word setName(dict.get<word>("set")); const word setName(dict.get<word>("set"));
faceSet faces(mesh, setName); faceSet set(mesh, setName);
Info<< "Read " << returnReduce(faces.size(), sumOp<label>()) Info<< "Read " << returnReduce(set.size(), sumOp<label>())
<< " faces from faceSet " << faces.name() << endl; << " faces from faceSet " << set.name() << endl;
// Sort (since faceSet contains faces in arbitrary order) // Sort (since faceSet contains faces in arbitrary order)
labelList faceLabels(faces.toc()); labelList faceLabels(set.sortedToc());
SortableList<label> patchFaces(faceLabels); for (const label facei : faceLabels)
forAll(patchFaces, i)
{ {
label facei = patchFaces[i];
if (mesh.isInternalFace(facei)) if (mesh.isInternalFace(facei))
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Face " << facei << " specified in set " << "Face " << facei << " specified in set "
<< faces.name() << set.name()
<< " is not an external face of the mesh." << endl << " is not an external face of the mesh." << endl
<< "This application can only repatch existing boundary" << "This application can only repatch existing boundary"
<< " faces." << exit(FatalError); << " faces." << exit(FatalError);

View File

@ -53,7 +53,6 @@ Description
#include "faceSet.H" #include "faceSet.H"
#include "pointSet.H" #include "pointSet.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "SortableList.H"
#include "timeSelector.H" #include "timeSelector.H"
using namespace Foam; using namespace Foam;
@ -114,7 +113,7 @@ int main(int argc, char *argv[])
{ {
// Not in memory. Load it. // Not in memory. Load it.
pointSet set(*iter()); pointSet set(*iter());
SortableList<label> pointLabels(set.toc()); labelList pointLabels(set.sortedToc());
// The original number of zones // The original number of zones
const label nOrigZones = mesh.pointZones().size(); const label nOrigZones = mesh.pointZones().size();
@ -150,7 +149,7 @@ int main(int argc, char *argv[])
{ {
// Not in memory. Load it. // Not in memory. Load it.
faceSet set(*iter()); faceSet set(*iter());
SortableList<label> faceLabels(set.toc()); labelList faceLabels(set.sortedToc());
DynamicList<label> addressing(set.size()); DynamicList<label> addressing(set.size());
DynamicList<bool> flipMap(set.size()); DynamicList<bool> flipMap(set.size());
@ -278,7 +277,7 @@ int main(int argc, char *argv[])
{ {
// Not in memory. Load it. // Not in memory. Load it.
cellSet set(*iter()); cellSet set(*iter());
SortableList<label> cellLabels(set.toc()); labelList cellLabels(set.sortedToc());
// The original number of zones // The original number of zones
const label nOrigZones = mesh.cellZones().size(); const label nOrigZones = mesh.cellZones().size();

View File

@ -97,7 +97,6 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "SortableList.H"
#include "argList.H" #include "argList.H"
#include "regionSplit.H" #include "regionSplit.H"
#include "fvMeshSubset.H" #include "fvMeshSubset.H"

View File

@ -27,7 +27,6 @@ License
#include "helpType.H" #include "helpType.H"
#include "doxygenXmlParser.H" #include "doxygenXmlParser.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -95,7 +94,7 @@ void Foam::helpType::displayDocOptions
Info<< parser; Info<< parser;
} }
Info<< "Valid types include:" << nl << SortableList<word>(parser.toc()); Info<< "Valid types:" << nl << parser.sortedToc();
} }
@ -168,24 +167,12 @@ void Foam::helpType::displayDoc
{ {
FatalErrorInFunction FatalErrorInFunction
<< "No help for type " << className << " found." << "No help for type " << className << " found."
<< " Valid options include:" << SortableList<word>(parser.toc()) << " Valid options:" << parser.sortedToc()
<< exit(FatalError); << exit(FatalError);
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::helpType::helpType()
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::helpType::~helpType()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::helpType::init() void Foam::helpType::init()

View File

@ -47,8 +47,7 @@ SourceFiles
namespace Foam namespace Foam
{ {
// forward declaration of classes // Forward Declarations
class fvMesh; class fvMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
@ -57,7 +56,6 @@ class fvMesh;
class helpType class helpType
{ {
protected: protected:
//- Return file path to the Doxygen sources (if available) //- Return file path to the Doxygen sources (if available)
@ -97,14 +95,14 @@ public:
); );
//- Constructor //- Default construct
helpType(); helpType() = default;
//- Selector //- Selector
static autoPtr<helpType> New(const word& helpTypeName); static autoPtr<helpType> New(const word& helpTypeName);
//- Destructor //- Destructor
virtual ~helpType(); virtual ~helpType() = default;
// Member Functions // Member Functions

View File

@ -29,7 +29,6 @@ License
#define steadyParticleTracksTemplates_H #define steadyParticleTracksTemplates_H
#include "OFstream.H" #include "OFstream.H"
#include "SortableList.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "PtrList.H" #include "PtrList.H"
#include "Field.H" #include "Field.H"

View File

@ -45,7 +45,6 @@ SourceFiles
#include "polyMesh.H" #include "polyMesh.H"
#include "mapAddedPolyMesh.H" #include "mapAddedPolyMesh.H"
#include "faceCoupleInfo.H" #include "faceCoupleInfo.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -38,7 +38,6 @@ License
#include "faMeshLduAddressing.H" #include "faMeshLduAddressing.H"
#include "wedgeFaPatch.H" #include "wedgeFaPatch.H"
#include "faPatchData.H" #include "faPatchData.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

View File

@ -27,7 +27,6 @@ License
#include "CFCCellToCellStencil.H" #include "CFCCellToCellStencil.H"
#include "syncTools.H" #include "syncTools.H"
#include "SortableList.H"
#include "emptyPolyPatch.H" #include "emptyPolyPatch.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

View File

@ -28,7 +28,6 @@ License
#include "cellToCellStencil.H" #include "cellToCellStencil.H"
#include "syncTools.H" #include "syncTools.H"
#include "SortableList.H"
#include "emptyPolyPatch.H" #include "emptyPolyPatch.H"
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //

View File

@ -28,7 +28,6 @@ License
#include "extendedCellToFaceStencil.H" #include "extendedCellToFaceStencil.H"
#include "globalIndex.H" #include "globalIndex.H"
#include "syncTools.H" #include "syncTools.H"
#include "SortableList.H"
/* * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * */

View File

@ -27,7 +27,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellToFaceStencil.H" #include "cellToFaceStencil.H"
#include "SortableList.H"
#include "emptyPolyPatch.H" #include "emptyPolyPatch.H"
#include "syncTools.H" #include "syncTools.H"
#include "dummyTransform.H" #include "dummyTransform.H"

View File

@ -27,7 +27,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fvmSup.H" #include "fvmSup.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //

View File

@ -28,7 +28,6 @@ License
#include "InjectedParticleInjection.H" #include "InjectedParticleInjection.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "bitSet.H" #include "bitSet.H"
#include "SortableList.H"
#include "injectedParticleCloud.H" #include "injectedParticleCloud.H"
using namespace Foam::constant; using namespace Foam::constant;

View File

@ -39,6 +39,7 @@ Description
#define SprayCloud_H #define SprayCloud_H
#include "sprayCloud.H" #include "sprayCloud.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -27,7 +27,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "polyTopoChange.H" #include "polyTopoChange.H"
#include "SortableList.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "polyAddPoint.H" #include "polyAddPoint.H"
#include "polyModifyPoint.H" #include "polyModifyPoint.H"

View File

@ -27,7 +27,6 @@ License
#include "searchablePlane.H" #include "searchablePlane.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

View File

@ -28,7 +28,6 @@ License
#include "searchablePlate.H" #include "searchablePlate.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "SortableList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

View File

@ -28,7 +28,6 @@ License
#include "searchableSurfaceCollection.H" #include "searchableSurfaceCollection.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "SortableList.H"
#include "Time.H" #include "Time.H"
#include "ListOps.H" #include "ListOps.H"