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
141 lines
4.0 KiB
C
141 lines
4.0 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2011-2013 OpenFOAM Foundation
|
|
Copyright (C) 2020-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/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
|
|
#include "vector.H"
|
|
#include "IFstream.H"
|
|
|
|
#include "BSpline.H"
|
|
#include "CatmullRomSpline.H"
|
|
|
|
using namespace Foam;
|
|
|
|
inline Ostream& printPoint(Ostream& os, const point& p)
|
|
{
|
|
os << p.x() << ' ' << p.y() << ' ' << p.z() << nl;
|
|
return os;
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::noParallel();
|
|
argList::addArgument("file .. fileN");
|
|
argList::addBoolOption("B", "B-Spline implementation");
|
|
argList::addBoolOption("CMR", "catmull-rom spline (default)");
|
|
argList::addOption
|
|
(
|
|
"n",
|
|
"INT",
|
|
"number of segments for evaluation - default 20"
|
|
);
|
|
|
|
argList args(argc, argv, false, true);
|
|
|
|
if (args.size() <= 1)
|
|
{
|
|
args.printUsage();
|
|
}
|
|
|
|
bool useBSpline = args.found("B");
|
|
bool useCatmullRom = args.found("CMR");
|
|
const label nSeg = args.getOrDefault<label>("n", 20);
|
|
|
|
if (!useCatmullRom && !useBSpline)
|
|
{
|
|
Info<<"defaulting to Catmull-Rom spline" << endl;
|
|
useCatmullRom = true;
|
|
}
|
|
|
|
for (label argi=1; argi < args.size(); ++argi)
|
|
{
|
|
const auto srcFile = args.get<fileName>(argi);
|
|
Info<< nl << "reading " << srcFile << nl;
|
|
IFstream ifs(srcFile);
|
|
|
|
List<pointField> pointFields(ifs);
|
|
|
|
|
|
forAll(pointFields, splineI)
|
|
{
|
|
Info<<"\n# points:" << endl;
|
|
forAll(pointFields[splineI], ptI)
|
|
{
|
|
printPoint(Info, pointFields[splineI][ptI]);
|
|
}
|
|
|
|
if (useBSpline)
|
|
{
|
|
BSpline spl(pointFields[splineI]);
|
|
|
|
Info<< nl << "# B-Spline" << endl;
|
|
|
|
for (label segI = 0; segI <= nSeg; ++segI)
|
|
{
|
|
scalar lambda = scalar(segI)/scalar(nSeg);
|
|
printPoint(Info, spl.position(lambda));
|
|
}
|
|
}
|
|
|
|
if (useCatmullRom)
|
|
{
|
|
CatmullRomSpline spl(pointFields[splineI]);
|
|
|
|
Info<< nl <<"# Catmull-Rom" << endl;
|
|
|
|
for (label segI = 0; segI <= nSeg; ++segI)
|
|
{
|
|
scalar lambda = scalar(segI)/scalar(nSeg);
|
|
printPoint(Info, spl.position(lambda));
|
|
}
|
|
}
|
|
|
|
{
|
|
polyLine pl(pointFields[splineI]);
|
|
|
|
Info<< nl <<"# polyList" << endl;
|
|
|
|
for (label segI = 0; segI <= nSeg; ++segI)
|
|
{
|
|
scalar lambda = scalar(segI)/scalar(nSeg);
|
|
printPoint(Info, pl.position(lambda));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|