diff --git a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C
index 274549fb3c7bb325a1cfba4c28cc5ff1281075c7..26f6241d5f0397e6224ff172043c7ed72296f953 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C
@@ -72,12 +72,6 @@ Foam::patchIdentifier::patchIdentifier
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::patchIdentifier::~patchIdentifier()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::patchIdentifier::inGroup(const word& name) const
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
index 760744a87e95442a9d8165b369a9c70b9184ef98..902cbd8b10e91ff0ec5cc5be4e47b7e2ab117510 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
+++ b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
@@ -43,10 +43,8 @@ SourceFiles
namespace Foam
{
+// Forward declarations
class dictionary;
-
-// Forward declaration of friend functions and operators
-
class patchIdentifier;
Ostream& operator<<(Ostream& os, const patchIdentifier& p);
@@ -92,7 +90,7 @@ public:
const label index
);
- //- Copy construct from geometric patch, resetting the index
+ //- Copy construct, resetting the index
patchIdentifier
(
const patchIdentifier& p,
@@ -101,7 +99,7 @@ public:
//- Destructor
- virtual ~patchIdentifier();
+ virtual ~patchIdentifier() = default;
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 4b987064da2aa69aca45126d01acc544febde09f..c83897b724b929a5c9dad6f5a99f8140334527b7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ License
namespace Foam
{
-defineTypeNameAndDebug(polyBoundaryMesh, 0);
+ defineTypeNameAndDebug(polyBoundaryMesh, 0);
}
@@ -220,11 +220,11 @@ void Foam::polyBoundaryMesh::calcGeometry()
// Dummy.
pBufs.finishedSends();
- forAll(patchSchedule, patchEvali)
+ for (const auto& patchEval : patchSchedule)
{
- const label patchi = patchSchedule[patchEvali].patch;
+ const label patchi = patchEval.patch;
- if (patchSchedule[patchEvali].init)
+ if (patchEval.init)
{
operator[](patchi).initGeometry(pBufs);
}
@@ -260,10 +260,8 @@ Foam::polyBoundaryMesh::neighbourEdges() const
neighbourEdges[patchi].setSize(pp.nEdges() - pp.nInternalEdges());
- forAll(neighbourEdges[patchi], i)
+ for (labelPair& edgeInfo : neighbourEdges[patchi])
{
- labelPair& edgeInfo = neighbourEdges[patchi][i];
-
edgeInfo[0] = -1;
edgeInfo[1] = -1;
}
@@ -349,12 +347,12 @@ Foam::polyBoundaryMesh::neighbourEdges() const
if (edgeInfo[0] == -1 || edgeInfo[1] == -1)
{
- label edgeI = pp.nInternalEdges() + i;
- const edge& e = pp.edges()[edgeI];
+ const label edgei = pp.nInternalEdges() + i;
+ const edge& e = pp.edges()[edgei];
FatalErrorInFunction
<< "Not all boundary edges of patches match up." << nl
- << "Edge " << edgeI << " on patch " << pp.name()
+ << "Edge " << edgei << " on patch " << pp.name()
<< " end points " << pp.localPoints()[e[0]] << ' '
<< pp.localPoints()[e[1]] << " is not matched to an"
<< " edge on any other patch." << nl
@@ -375,23 +373,20 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
{
patchIDPtr_.reset
(
- new labelList
- (
- mesh_.nFaces()
- - mesh_.nInternalFaces()
- )
+ new labelList(mesh_.nFaces() - mesh_.nInternalFaces())
);
- labelList& patchID = patchIDPtr_();
+ labelList& list = *patchIDPtr_;
- const polyBoundaryMesh& bm = *this;
+ const polyPatchList& patches = *this;
- forAll(bm, patchi)
+ forAll(patches, patchi)
{
- label bFacei = bm[patchi].start() - mesh_.nInternalFaces();
- forAll(bm[patchi], i)
- {
- patchID[bFacei++] = patchi;
- }
+ SubList<label>
+ (
+ list,
+ patches[patchi].size(),
+ (patches[patchi].start() - mesh_.nInternalFaces())
+ ) = patchi;
}
}
@@ -404,8 +399,8 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
{
if (!groupPatchIDsPtr_.valid())
{
- groupPatchIDsPtr_.reset(new HashTable<labelList>(10));
- HashTable<labelList>& groupPatchIDs = groupPatchIDsPtr_();
+ groupPatchIDsPtr_.reset(new HashTable<labelList>(16));
+ auto& groupPatchIDs = *groupPatchIDsPtr_;
const polyBoundaryMesh& bm = *this;
@@ -413,22 +408,17 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
{
const wordList& groups = bm[patchi].inGroups();
- forAll(groups, i)
+ for (const word& groupName : groups)
{
- const word& name = groups[i];
+ auto iter = groupPatchIDs.find(groupName);
- HashTable<labelList>::iterator iter = groupPatchIDs.find
- (
- name
- );
-
- if (iter != groupPatchIDs.end())
+ if (iter.found())
{
- iter().append(patchi);
+ (*iter).append(patchi);
}
else
{
- groupPatchIDs.insert(name, labelList(1, patchi));
+ groupPatchIDs.insert(groupName, labelList(one(), patchi));
}
}
}
@@ -454,7 +444,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
void Foam::polyBoundaryMesh::setGroup
(
const word& groupName,
- const labelList& patchIDs
+ const labelUList& patchIDs
)
{
groupPatchIDsPtr_.clear();
@@ -464,9 +454,8 @@ void Foam::polyBoundaryMesh::setGroup
boolList donePatch(patches.size(), false);
// Add to specified patches
- forAll(patchIDs, i)
+ for (const label patchi : patchIDs)
{
- label patchi = patchIDs[i];
polyPatch& pp = patches[patchi];
if (!pp.inGroup(groupName))
@@ -514,10 +503,8 @@ Foam::label Foam::polyBoundaryMesh::nNonProcessor() const
{
break;
}
- else
- {
- ++nonProc;
- }
+
+ ++nonProc;
}
return nonProc;
@@ -528,14 +515,14 @@ Foam::wordList Foam::polyBoundaryMesh::names() const
{
const polyPatchList& patches = *this;
- wordList t(patches.size());
+ wordList list(patches.size());
forAll(patches, patchi)
{
- t[patchi] = patches[patchi].name();
+ list[patchi] = patches[patchi].name();
}
- return t;
+ return list;
}
@@ -543,14 +530,14 @@ Foam::wordList Foam::polyBoundaryMesh::types() const
{
const polyPatchList& patches = *this;
- wordList t(patches.size());
+ wordList list(patches.size());
forAll(patches, patchi)
{
- t[patchi] = patches[patchi].type();
+ list[patchi] = patches[patchi].type();
}
- return t;
+ return list;
}
@@ -558,14 +545,36 @@ Foam::wordList Foam::polyBoundaryMesh::physicalTypes() const
{
const polyPatchList& patches = *this;
- wordList t(patches.size());
+ wordList list(patches.size());
forAll(patches, patchi)
{
- t[patchi] = patches[patchi].physicalType();
+ list[patchi] = patches[patchi].physicalType();
+ }
+
+ return list;
+}
+
+
+Foam::labelRange Foam::polyBoundaryMesh::range() const
+{
+ return labelRange
+ (
+ mesh_.nInternalFaces(),
+ mesh_.nFaces() - mesh_.nInternalFaces()
+ );
+}
+
+
+Foam::labelRange Foam::polyBoundaryMesh::range(const label patchi) const
+{
+ if (patchi < 0)
+ {
+ return labelRange(mesh_.nInternalFaces(), 0);
}
- return t;
+ // Will fail if patchi >= size()
+ return (*this)[patchi].range();
}
@@ -593,15 +602,18 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices
const wordList allGroupNames = groupPatchIDs().toc();
labelList groupIDs = findStrings(keyRe, allGroupNames);
- forAll(groupIDs, i)
+
+ for (const label groupi : groupIDs)
{
- const word& grpName = allGroupNames[groupIDs[i]];
+ const word& grpName = allGroupNames[groupi];
+
const labelList& patchIDs = groupPatchIDs()[grpName];
- forAll(patchIDs, j)
+
+ for (const label patchi : patchIDs)
{
- if (indexSet.insert(patchIDs[j]))
+ if (indexSet.insert(patchi))
{
- indices.append(patchIDs[j]);
+ indices.append(patchi);
}
}
}
@@ -630,12 +642,13 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices
{
labelHashSet indexSet(indices);
- const labelList& patchIDs = iter();
- forAll(patchIDs, j)
+ const labelList& patchIDs = *iter;
+
+ for (const label patchi : patchIDs)
{
- if (indexSet.insert(patchIDs[j]))
+ if (indexSet.insert(patchi))
{
- indices.append(patchIDs[j]);
+ indices.append(patchi);
}
}
}
@@ -656,10 +669,10 @@ Foam::label Foam::polyBoundaryMesh::findIndex(const keyType& key) const
{
labelList indices = this->findIndices(key);
- // return first element
+ // Return the first element
if (!indices.empty())
{
- return indices[0];
+ return indices.first();
}
}
else
@@ -673,7 +686,7 @@ Foam::label Foam::polyBoundaryMesh::findIndex(const keyType& key) const
}
}
- // not found
+ // Not found, return -1
return -1;
}
@@ -696,7 +709,7 @@ Foam::label Foam::polyBoundaryMesh::findPatchID
if (!allowNotFound)
{
- string regionStr("");
+ string regionStr;
if (mesh_.name() != polyMesh::defaultRegion)
{
regionStr = "in region '" + mesh_.name() + "' ";
@@ -777,10 +790,8 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
const wordList allPatchNames(this->names());
labelHashSet ids(size());
- forAll(patchNames, i)
+ for (const wordRe& patchName : patchNames)
{
- const wordRe& patchName = patchNames[i];
-
// Treat the given patch names as wild-cards and search the set
// of all patch names for matches
labelList patchIDs = findStrings(patchName, allPatchNames);
@@ -795,11 +806,13 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
// Regard as group name
labelList groupIDs = findStrings(patchName, allGroupNames);
- forAll(groupIDs, i)
+ for (const label groupi : groupIDs)
{
- const word& name = allGroupNames[groupIDs[i]];
- const labelList& extraPatchIDs = groupPatchIDs()[name];
- ids.insert(extraPatchIDs);
+ const word& groupName = allGroupNames[groupi];
+ ids.insert
+ (
+ groupPatchIDs()[groupName]
+ );
}
if (groupIDs.empty() && warnNotFound)
@@ -920,14 +933,15 @@ bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
Pstream::gatherList(allTypes);
Pstream::scatterList(allTypes);
- // Have every processor check but only master print error.
+ // Have every processor check but print error on master
+ // (in processor sequence).
- for (label proci = 1; proci < allNames.size(); ++proci)
+ for (label proci = 1; proci < Pstream::nProcs(); ++proci)
{
if
(
- (allNames[proci] != allNames[0])
- || (allTypes[proci] != allTypes[0])
+ (allNames[proci] != allNames.first())
+ || (allTypes[proci] != allTypes.first())
)
{
hasError = true;
@@ -935,10 +949,11 @@ bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
if (debug || (report && Pstream::master()))
{
Info<< " ***Inconsistent patches across processors, "
- "processor 0 has patch names:" << allNames[0]
- << " patch types:" << allTypes[0]
- << " processor " << proci << " has patch names:"
- << allNames[proci]
+ "processor 0 has patch names:"
+ << allNames.first()
+ << " patch types:" << allTypes.first()
+ << " processor " << proci
+ << " has patch names:" << allNames[proci]
<< " patch types:" << allTypes[proci]
<< endl;
}
@@ -1035,11 +1050,11 @@ void Foam::polyBoundaryMesh::movePoints(const pointField& p)
// Dummy.
pBufs.finishedSends();
- forAll(patchSchedule, patchEvali)
+ for (const auto& patchEval : patchSchedule)
{
- const label patchi = patchSchedule[patchEvali].patch;
+ const label patchi = patchEval.patch;
- if (patchSchedule[patchEvali].init)
+ if (patchEval.init)
{
operator[](patchi).initMovePoints(pBufs, p);
}
@@ -1085,11 +1100,11 @@ void Foam::polyBoundaryMesh::updateMesh()
// Dummy.
pBufs.finishedSends();
- forAll(patchSchedule, patchEvali)
+ for (const auto& patchEval : patchSchedule)
{
- const label patchi = patchSchedule[patchEvali].patch;
+ const label patchi = patchEval.patch;
- if (patchSchedule[patchEvali].init)
+ if (patchEval.init)
{
operator[](patchi).initUpdateMesh(pBufs);
}
@@ -1132,10 +1147,10 @@ bool Foam::polyBoundaryMesh::writeData(Ostream& os) const
os << patches.size() << nl << token::BEGIN_LIST << incrIndent << nl;
- forAll(patches, patchi)
+ for (const polyPatch& pp : patches)
{
- os.beginBlock(patches[patchi].name());
- os << patches[patchi];
+ os.beginBlock(pp.name());
+ os << pp;
os.endBlock();
}
@@ -1157,6 +1172,7 @@ bool Foam::polyBoundaryMesh::writeObject
return regIOobject::writeObject(fmt, ver, IOstream::UNCOMPRESSED, valid);
}
+
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
const Foam::polyPatch& Foam::polyBoundaryMesh::operator[]
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index c7f5ef70c5ca3cc66e2143add48d0206831533e5..397257ee0a3bffd52ab927d91f7032356f377aca 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -25,7 +25,8 @@ Class
Foam::polyBoundaryMesh
Description
- Foam::polyBoundaryMesh
+ A polyBoundaryMesh is a polyPatch list with additional search methods
+ and registered IO.
SourceFiles
polyBoundaryMesh.C
@@ -45,13 +46,11 @@ SourceFiles
namespace Foam
{
-// Forward declaration of classes
+// Forward declarations
class polyMesh;
class wordRe;
-// Forward declaration of friend functions and operators
-
-Ostream& operator<<(Ostream&, const polyBoundaryMesh&);
+Ostream& operator<<(Ostream& os, const polyBoundaryMesh& pbm);
/*---------------------------------------------------------------------------*\
@@ -63,22 +62,24 @@ class polyBoundaryMesh
public polyPatchList,
public regIOobject
{
- // private data
+ // Private Data
//- Reference to mesh
const polyMesh& mesh_;
+ //- Demand-driven: list of patch ids per face.
mutable autoPtr<labelList> patchIDPtr_;
+ //- Demand-driven:
mutable autoPtr<HashTable<labelList>> groupPatchIDsPtr_;
- //- Edges of neighbouring patches
+ //- Demand-driven: edges of neighbouring patches
mutable autoPtr<List<labelPairList>> neighbourEdgesPtr_;
// Private Member Functions
- //- Calculate the geometry for the patches (transformation tensors etc.)
+ //- Calculate geometry for the patches (transformation tensors etc.)
void calcGeometry();
//- No copy construct
@@ -104,24 +105,24 @@ public:
// Note point pointers are unset, only used in copying meshes
polyBoundaryMesh
(
- const IOobject&,
- const polyMesh&
+ const IOobject& io,
+ const polyMesh& mesh
);
//- Construct given size
polyBoundaryMesh
(
- const IOobject&,
- const polyMesh&,
+ const IOobject& io,
+ const polyMesh& mesh,
const label size
);
//- Construct given polyPatchList
polyBoundaryMesh
(
- const IOobject&,
- const polyMesh&,
- const polyPatchList&
+ const IOobject& io,
+ const polyMesh& mesh,
+ const polyPatchList& ppl
);
@@ -143,12 +144,13 @@ public:
return mesh_;
}
- //- Per patch the edges on the neighbouring patch. Is for every external
- // edge the neighbouring patch and neighbouring (external) patch edge
- // label. Note that edge indices are offset by nInternalEdges to keep
- // it as much as possible consistent with coupled patch addressing
- // (where coupling is by local patch face index).
- // Only valid for singly connected polyBoundaryMesh and not parallel
+ //- Per patch the edges on the neighbouring patch.
+ // Is for every external edge the neighbouring patch and
+ // neighbouring (external) patch edge label. Note that edge indices
+ // are offset by nInternalEdges to keep it as much as possible
+ // consistent with coupled patch addressing (where coupling is by
+ // local patch face index). Only valid for singly connected
+ // polyBoundaryMesh and not parallel
const List<labelPairList>& neighbourEdges() const;
//- Return the number of non-processor patches
@@ -163,6 +165,16 @@ public:
//- Return a list of physical types
wordList physicalTypes() const;
+ //- Return the range used for all boundary faces
+ // Spans [nInternalFaces, nFaces)
+ labelRange range() const;
+
+ //- Return the range used for boundary faces on patchi.
+ // Always returns an empty range for negative values of patchi,
+ // which allows safe use with findIndex or findPatchID.
+ labelRange range(const label patchi) const;
+
+
//- Return patch indices for all matches. Optionally matches patchGroups
labelList findIndices
(
@@ -173,7 +185,7 @@ public:
//- Return patch index for the first match, return -1 if not found
label findIndex(const keyType& key) const;
- //- Find patch index given a name
+ //- Find patch index given a name, return -1 if not found
label findPatchID
(
const word& patchName,
@@ -194,11 +206,11 @@ public:
const HashTable<labelList>& groupPatchIDs() const;
//- Set/add group with patches
- void setGroup(const word& groupName, const labelList& patchIDs);
+ void setGroup(const word& groupName, const labelUList& patchIDs);
//- Return the set of patch IDs corresponding to the given names
- // By default warns if given names are not found. Optionally
- // matches to patchGroups as well as patchNames
+ // By default warns if given names are not found.
+ // Optionally matches to patchGroups as well as patchNames.
labelHashSet patchSet
(
const UList<wordRe>& patchNames,
@@ -206,8 +218,9 @@ public:
const bool usePatchGroups = true
) const;
- //- Match the patches to groups. Returns all the (fully matched) groups
- // and any remaining unmatched patches.
+ //- Match the patches to groups.
+ // Returns all the (fully matched) groups and any remaining
+ // unmatched patches.
void matchGroups
(
const labelUList& patchIDs,
@@ -223,7 +236,7 @@ public:
bool checkDefinition(const bool report = false) const;
//- Correct polyBoundaryMesh after moving points
- void movePoints(const pointField&);
+ void movePoints(const pointField& p);
//- Correct polyBoundaryMesh after topology update
void updateMesh();
@@ -233,12 +246,12 @@ public:
// (is shuffle) If validBoundary calls updateMesh()
// after reordering to recalculate data (so call needs to be parallel
// sync in that case)
- void reorder(const labelUList&, const bool validBoundary);
+ void reorder(const labelUList& oldToNew, const bool validBoundary);
//- writeData member function required by regIOobject
- virtual bool writeData(Ostream&) const;
+ virtual bool writeData(Ostream& os) const;
- //- Write using given format, version and form uncompression
+ //- Write using given format, version, compression
virtual bool writeObject
(
IOstream::streamFormat fmt,
@@ -254,15 +267,15 @@ public:
using polyPatchList::operator[];
//- Return const reference to polyPatch by name.
- const polyPatch& operator[](const word&) const;
+ const polyPatch& operator[](const word& patchName) const;
//- Return reference to polyPatch by name.
- polyPatch& operator[](const word&);
+ polyPatch& operator[](const word& patchName);
// Ostream operator
- friend Ostream& operator<<(Ostream&, const polyBoundaryMesh&);
+ friend Ostream& operator<<(Ostream& os, const polyBoundaryMesh& pbm);
};
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.C
index df0a21291d838572429ae60e52b14e54a6c5e6aa..367a8c2c4c8ca40eca7f200d73d2b9b11d8679bc 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.C
@@ -29,7 +29,7 @@ License
namespace Foam
{
-defineTypeNameAndDebug(polyBoundaryMeshEntries, 0);
+ defineTypeNameAndDebug(polyBoundaryMeshEntries, 0);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
index 5a7d6518c9967ba25102c8f351e27a99321bef88..d158bf69615e4c962539a88b4761df9e949080d3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
@@ -79,7 +79,7 @@ public:
}
- // Member functions
+ // Member Functions
bool writeData(Ostream&) const
{