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
148 lines
3.9 KiB
C
148 lines
3.9 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2018-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
|
|
Test-surfaceReading
|
|
|
|
Description
|
|
Test basic surface format reading capabilities (and speeds)
|
|
|
|
Note
|
|
The filename extensions are used to determine the file format type.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
#include "Time.H"
|
|
#include "clockTime.H"
|
|
#include "triSurface.H"
|
|
#include "MeshedSurfaces.H"
|
|
#include "UnsortedMeshedSurfaces.H"
|
|
#include "STLReader.H"
|
|
|
|
using namespace Foam;
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::addNote
|
|
(
|
|
"Test basic surface format reading capabilities (and speeds)"
|
|
);
|
|
|
|
argList::noParallel();
|
|
argList::addArgument("inputFile");
|
|
|
|
argList::addBoolOption
|
|
(
|
|
"triSurface",
|
|
"Use triSurface for read"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"triFace",
|
|
"Use triFace instead of face"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"unsorted",
|
|
"Use UnsortedMeshedSurface instead of MeshedSurface, "
|
|
"or unsorted output (with -triSurface option)"
|
|
);
|
|
|
|
argList::addOption
|
|
(
|
|
"ext",
|
|
"name",
|
|
"Force alternative extension"
|
|
);
|
|
|
|
argList::addOption
|
|
(
|
|
"stl-parser",
|
|
"N",
|
|
"ASCII parser type: 0=Flex, 1=Ragel, 2=Manual"
|
|
);
|
|
|
|
#include "setRootCase.H"
|
|
|
|
const auto importName = args.get<fileName>(1);
|
|
|
|
word ext;
|
|
if (!args.readIfPresent("ext", ext))
|
|
{
|
|
ext = importName.ext();
|
|
if (ext == "gz")
|
|
{
|
|
ext = importName.lessExt().ext();
|
|
}
|
|
}
|
|
|
|
args.readIfPresent("stl-parser", fileFormats::STLReader::parserType);
|
|
|
|
clockTime timing;
|
|
|
|
if (args.found("triSurface"))
|
|
{
|
|
triSurface surf(importName, ext);
|
|
|
|
Info<< "Read surface:" << endl;
|
|
surf.writeStats(Info);
|
|
Info<< "Area : " << sum(surf.magSf()) << nl << endl;
|
|
}
|
|
else if (args.found("triFace"))
|
|
{
|
|
MeshedSurface<triFace> surf(importName, ext);
|
|
|
|
Info<< "Read surface:" << endl;
|
|
surf.writeStats(Info);
|
|
Info<< "Area : " << sum(surf.magSf()) << nl << endl;
|
|
}
|
|
else if (args.found("unsorted"))
|
|
{
|
|
UnsortedMeshedSurface<face> surf(importName, ext);
|
|
|
|
Info<< "Read surface:" << endl;
|
|
surf.writeStats(Info);
|
|
Info<< "Area : " << sum(surf.magSf()) << nl << endl;
|
|
}
|
|
else
|
|
{
|
|
MeshedSurface<face> surf(importName, ext);
|
|
|
|
Info<< "Read surface:" << endl;
|
|
surf.writeStats(Info);
|
|
Info<< "Area : " << sum(surf.magSf()) << nl << endl;
|
|
}
|
|
|
|
Info<< nl << "Reading took " << timing.elapsedTime() << "s" << nl
|
|
<< "\nEnd\n" << endl;
|
|
|
|
return 0;
|
|
}
|
|
|
|
// ************************************************************************* //
|