ENH: change wordRes to be a List of wordRe instead of a wrapper (issue #259)

- this permits direct storage of a list with additional matcher
  capabilities

- provide wordRes::matcher class for similar behaviour as previously
This commit is contained in:
Mark Olesen
2018-02-21 10:05:30 +01:00
parent 03b287ed24
commit c126464d1c
113 changed files with 572 additions and 801 deletions

View File

@ -29,10 +29,8 @@ License
#include "profiling.H"
#include "argList.H"
#include "timeControlFunctionObject.H"
//#include "IFstream.H"
#include "dictionaryEntry.H"
#include "stringOps.H"
#include "wordRes.H"
#include "Tuple2.H"
#include "etcFiles.H"
#include "IOdictionary.H"
@ -468,12 +466,6 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjectList::~functionObjectList()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::functionObjectList::resetState()
@ -623,7 +615,7 @@ bool Foam::functionObjectList::execute(const label subIndex)
bool Foam::functionObjectList::execute
(
const wordRes& functionNames,
const UList<wordRe>& functionNames,
const label subIndex
)
{
@ -635,7 +627,7 @@ bool Foam::functionObjectList::execute
{
functionObject& funcObj = operator[](obji);
if (functionNames.match(funcObj.name()))
if (stringOps::match(functionNames, funcObj.name()))
{
ok = funcObj.execute(subIndex) && ok;
}

View File

@ -55,7 +55,7 @@ namespace Foam
// Forward declarations
class argList;
class mapPolyMesh;
class wordRes;
class wordRe;
/*---------------------------------------------------------------------------*\
Class functionObjectList Declaration
@ -160,7 +160,7 @@ public:
//- Destructor
~functionObjectList();
~functionObjectList() = default;
// Member Functions
@ -270,7 +270,7 @@ public:
// execute
// \param subIndex an execution sub-index corresponding to a
// sub-cycle or something similar
bool execute(const wordRes& functionNames, const label subIndex);
bool execute(const UList<wordRe>& functionNames, const label subIndex);
//- Called when Time::run() determines that the time-loop exits
bool end();

View File

@ -148,12 +148,6 @@ Foam::functionObjects::regionFunctionObject::regionFunctionObject
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::regionFunctionObject::~regionFunctionObject()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::functionObjects::regionFunctionObject::read(const dictionary& dict)

View File

@ -170,7 +170,7 @@ public:
//- Destructor
virtual ~regionFunctionObject();
virtual ~regionFunctionObject() = default;
// Member Functions