Commit 3d66b926 authored by Andrew Heather's avatar Andrew Heather
Browse files

BUG: Reinstated regex functionality for particle local interaction

parent fe91e842
...@@ -46,7 +46,7 @@ const Foam::word& Foam::patchInteractionData::interactionTypeName() const ...@@ -46,7 +46,7 @@ const Foam::word& Foam::patchInteractionData::interactionTypeName() const
} }
const Foam::word& Foam::patchInteractionData::patchName() const const Foam::keyType& Foam::patchInteractionData::patchName() const
{ {
return patchName_; return patchName_;
} }
......
...@@ -61,7 +61,7 @@ class patchInteractionData ...@@ -61,7 +61,7 @@ class patchInteractionData
word interactionTypeName_; word interactionTypeName_;
//- Patch name //- Patch name
word patchName_; keyType patchName_;
//- Elasticity coefficient //- Elasticity coefficient
scalar e_; scalar e_;
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
const word& interactionTypeName() const; const word& interactionTypeName() const;
//- Return const access to the patch name //- Return const access to the patch name
const word& patchName() const; const keyType& patchName() const;
//- Return const access to the elasticity coefficient //- Return const access to the elasticity coefficient
scalar e() const; scalar e() const;
......
...@@ -24,7 +24,6 @@ License ...@@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "patchInteractionDataList.H" #include "patchInteractionDataList.H"
#include "stringListOps.H"
#include "emptyPolyPatch.H" #include "emptyPolyPatch.H"
// * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
...@@ -46,13 +45,11 @@ Foam::patchInteractionDataList::patchInteractionDataList ...@@ -46,13 +45,11 @@ Foam::patchInteractionDataList::patchInteractionDataList
patchGroupIDs_(this->size()) patchGroupIDs_(this->size())
{ {
const polyBoundaryMesh& bMesh = mesh.boundaryMesh(); const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
const wordList allPatchNames(bMesh.names());
const List<patchInteractionData>& items = *this; const List<patchInteractionData>& items = *this;
forAllReverse(items, i) forAllReverse(items, i)
{ {
const word& patchName = items[i].patchName(); const keyType& patchName = items[i].patchName();
labelList ids = findIndices(allPatchNames, patchName); labelList ids = bMesh.findIndices(patchName);
if (ids.empty()) if (ids.empty())
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment