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

@ -69,7 +69,7 @@ preserveFaceZonesConstraint
Foam::decompositionConstraints::preserveFaceZonesConstraint::
preserveFaceZonesConstraint
(
const wordReList& zones
const UList<wordRe>& zones
)
:
decompositionConstraint(dictionary(), typeName),

View File

@ -37,7 +37,7 @@ SourceFiles
#define preserveFaceZonesConstraint_H
#include "decompositionConstraint.H"
#include "wordReList.H"
#include "wordRes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -58,7 +58,7 @@ class preserveFaceZonesConstraint
// Private data
//- List of zones to keep together
wordReList zones_;
wordRes zones_;
public:
@ -77,12 +77,11 @@ public:
);
//- Construct from components
preserveFaceZonesConstraint(const wordReList& zones);
preserveFaceZonesConstraint(const UList<wordRe>& zones);
//- Destructor
virtual ~preserveFaceZonesConstraint()
{}
virtual ~preserveFaceZonesConstraint() = default;
// Member Functions

View File

@ -69,7 +69,7 @@ preservePatchesConstraint
Foam::decompositionConstraints::preservePatchesConstraint::
preservePatchesConstraint
(
const wordReList& patches
const UList<wordRe>& patches
)
:
decompositionConstraint(dictionary(), typeName),

View File

@ -37,7 +37,7 @@ SourceFiles
#define preservePatchesConstraint_H
#include "decompositionConstraint.H"
#include "wordReList.H"
#include "wordRes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -58,7 +58,7 @@ class preservePatchesConstraint
// Private data
//- List of patches to keep together
wordReList patches_;
wordRes patches_;
public:
@ -77,13 +77,12 @@ public:
);
//- Construct from components
preservePatchesConstraint(const wordReList& patches);
preservePatchesConstraint(const UList<wordRe>& patches);
//- Destructor
virtual ~preservePatchesConstraint()
{}
virtual ~preservePatchesConstraint() = default;
// Member Functions

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

View File

@ -36,6 +36,7 @@ SourceFiles
#define structuredDecomp_H
#include "decompositionMethod.H"
#include "wordRes.H"
namespace Foam
{
@ -52,7 +53,7 @@ class structuredDecomp
dictionary methodDict_;
wordReList patches_;
wordRes patches_;
autoPtr<decompositionMethod> method_;
@ -77,8 +78,7 @@ public:
//- Destructor
virtual ~structuredDecomp()
{}
virtual ~structuredDecomp() = default;
// Member Functions