zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

23
src/functionObjects/utilities/writeObjects/writeObjects.C
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) 2016 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -81,12 +81,6 @@ Foam::functionObjects::writeObjects::writeObjects
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::writeObjects::~writeObjects()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::functionObjects::writeObjects::read(const dictionary& dict)
@ -134,29 +128,26 @@ bool Foam::functionObjects::writeObjects::write()
}
DynamicList<word> allNames(obr_.toc().size());
forAll(objectNames_, i)
for (const wordRe& objName : objectNames_)
{
wordList names(obr_.names<regIOobject>(objectNames_[i]));
wordList names(obr_.names<regIOobject>(objName));
if (names.size())
{
allNames.append(names);
allNames.append(std::move(names));
}
else
{
WarningInFunction
<< "Object " << objectNames_[i] << " not found in "
<< "Object " << objName << " not found in "
<< "database. Available objects:" << nl << obr_.sortedToc()
<< endl;
}
}
forAll(allNames, i)
for (const word& objName : allNames)
{
regIOobject& obj = const_cast<regIOobject&>
(
obr_.lookupObject<regIOobject>(allNames[i])
);
regIOobject& obj = obr_.lookupObjectRef<regIOobject>(objName);
switch (writeOption_)
{