b060378dca
- wrap command-line retrieval of fileName with an implicit validate.
Instead of this:
fileName input(args[1]);
fileName other(args["someopt"]);
Now use this:
auto input = args.get<fileName>(1);
auto other = args.get<fileName>("someopt");
which adds a fileName::validate on the inputs
Because of how it is implemented, it will automatically also apply
to argList getOrDefault<fileName>, readIfPresent<fileName> etc.
- adjust fileName::validate and clean to handle backslash conversion.
This makes it easier to ensure that path names arising from MS-Windows
are consistently handled internally.
- dictionarySearch: now check for initial '/' directly instead of
relying on fileName isAbsolute(), which now does more things
BREAKING: remove fileName::clean() const method
- relying on const/non-const to control the behaviour (inplace change
or return a copy) is too fragile and the const version was
almost never used.
Replace:
fileName sanitized = constPath.clean();
With:
fileName sanitized(constPath);
sanitized.clean());
STYLE: test empty() instead of comparing with fileName::null
99 lines
2.4 KiB
C
99 lines
2.4 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2021 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
|
|
|
Application
|
|
Test-dictionaryCopy
|
|
|
|
Description
|
|
Test copying a dictionary with filtering
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
#include "IOobject.H"
|
|
#include "IOstreams.H"
|
|
#include "IFstream.H"
|
|
#include "dictionaryContent.H"
|
|
|
|
using namespace Foam;
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::noParallel();
|
|
argList::addArgument("dict .. dictN");
|
|
argList args(argc, argv, false, true);
|
|
|
|
const wordRes allow;
|
|
const wordRes deny
|
|
({
|
|
wordRe("boundary.*", wordRe::REGEX)
|
|
});
|
|
|
|
Info<< nl
|
|
<< "allow: " << flatOutput(allow) << nl
|
|
<< "deny: " << flatOutput(deny) << nl << nl;
|
|
|
|
if (args.size() <= 1)
|
|
{
|
|
const string dictFile = "testDictCopy";
|
|
IFstream is(dictFile);
|
|
|
|
dictionary input(is);
|
|
|
|
dictionary copied
|
|
(
|
|
dictionaryContent::copyDict
|
|
(
|
|
input,
|
|
allow,
|
|
deny
|
|
)
|
|
);
|
|
|
|
IOobject::writeDivider(Info);
|
|
input.writeEntry("input", Info);
|
|
copied.writeEntry("copied", Info);
|
|
}
|
|
|
|
for (label argi=1; argi < args.size(); ++argi)
|
|
{
|
|
const auto dictFile = args.get<fileName>(argi);
|
|
IFstream is(dictFile);
|
|
|
|
dictionary input(is);
|
|
|
|
dictionary copied
|
|
(
|
|
dictionaryContent::copyDict
|
|
(
|
|
input,
|
|
allow,
|
|
deny
|
|
)
|
|
);
|
|
|
|
IOobject::writeDivider(Info);
|
|
input.writeEntry("input", Info);
|
|
copied.writeEntry("copied", Info);
|
|
}
|
|
|
|
IOobject::writeEndDivider(Info);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|