mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
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
143 lines
4.9 KiB
C
143 lines
4.9 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2011-2012 OpenFOAM Foundation
|
|
Copyright (C) 2021 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
Application
|
|
dictionaryTest
|
|
|
|
Description
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
#include "IOstreams.H"
|
|
#include "IOobject.H"
|
|
#include "IFstream.H"
|
|
#include "dictionary.H"
|
|
#include "stringOps.H"
|
|
|
|
using namespace Foam;
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::noParallel();
|
|
argList::addArgument("dict .. dictN");
|
|
argList args(argc, argv, false, true);
|
|
|
|
{
|
|
dictionary dict;
|
|
dict.add(word("ab" + getEnv("WM_MPLIB") + "cd"), 16);
|
|
|
|
string s("DDD_${ab${WM_MPLIB}cd}_EEE");
|
|
stringOps::inplaceExpand(s, dict, true, false);
|
|
Info<< "variable expansion:" << s << endl;
|
|
}
|
|
|
|
Info<< nl
|
|
<< "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
|
|
<< "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
|
|
<< endl;
|
|
|
|
if (args.size() <= 1)
|
|
{
|
|
{
|
|
dictionary dict1(IFstream("testDict")());
|
|
dict1.writeEntry("dict1", Info);
|
|
|
|
Info<< nl
|
|
<< "toc: " << dict1.toc() << nl
|
|
<< "keys: " << dict1.keys() << nl
|
|
<< "patterns: " << dict1.keys(true) << endl;
|
|
|
|
dictionary dict2(std::move(dict1));
|
|
|
|
Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc() << nl
|
|
<< "dict2.toc(): " << dict2.name() << " " << dict2.toc()
|
|
<< endl;
|
|
|
|
// copy back
|
|
dict1 = dict2;
|
|
Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc()
|
|
<< endl;
|
|
|
|
dictionary dict3(dict2.findDict("boundaryField"));
|
|
dictionary dict4(dict2.findDict("NONEXISTENT"));
|
|
|
|
Info<< "dictionary construct from pointer" << nl
|
|
<< "ok = " << dict3.name() << " " << dict3.toc() << nl
|
|
<< "no = " << dict4.name() << " " << dict4.toc() << endl;
|
|
}
|
|
|
|
IOobject::writeDivider(Info);
|
|
|
|
{
|
|
dictionary dict(IFstream("testDictRegex")());
|
|
dict.add(keyType("fooba[rz]", keyType::REGEX), "anything");
|
|
|
|
dict.writeEntry("testDictRegex", Info);
|
|
Info<< nl
|
|
<< "toc: " << dict.toc() << nl
|
|
<< "keys: " << dict.keys() << nl
|
|
<< "patterns: " << dict.keys(true) << endl;
|
|
|
|
Info<< "Pattern find \"abc\" in top directory : "
|
|
<< dict.lookup("abc") << endl;
|
|
Info<< "Pattern find \"abc\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("abc") << nl;
|
|
Info<< "Recursive pattern find \"def\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("def", true) << nl;
|
|
Info<< "Recursive pattern find \"foo\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("foo", true) << nl;
|
|
Info<< "Recursive pattern find \"fooz\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("fooz", true) << nl;
|
|
Info<< "Recursive pattern find \"bar\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("bar", true) << nl;
|
|
Info<< "Recursive pattern find \"xxx\" in sub directory : "
|
|
<< dict.subDict("someDict").lookup("xxx", true) << nl;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
IOobject::writeDivider(Info);
|
|
for (label argi=1; argi < args.size(); ++argi)
|
|
{
|
|
const auto dictFile = args.get<fileName>(argi);
|
|
IFstream is(dictFile);
|
|
|
|
dictionary dict(is);
|
|
|
|
Info<< dict << endl;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|