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
242 lines
6.2 KiB
C
242 lines
6.2 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2017-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-surfaceIntersection
|
|
|
|
Description
|
|
Test surface-surface intersection
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
#include "Time.H"
|
|
#include "triSurface.H"
|
|
#include "triSurfaceMesh.H"
|
|
#include "surfaceIntersection.H"
|
|
#include "OBJstream.H"
|
|
|
|
using namespace Foam;
|
|
|
|
autoPtr<triSurface> loadSurface
|
|
(
|
|
const Foam::Time& runTime,
|
|
const fileName& surfName,
|
|
const scalar scaleFactor
|
|
)
|
|
{
|
|
Info<< "Reading surface " << surfName << nl;
|
|
if (scaleFactor > 0)
|
|
{
|
|
Info<<"Scaling : " << scaleFactor << nl;
|
|
}
|
|
|
|
const fileName fallback =
|
|
runTime.constantPath()/triSurfaceMesh::meshSubDir/surfName;
|
|
|
|
autoPtr<triSurface> surfPtr;
|
|
if (isFile(surfName))
|
|
{
|
|
surfPtr.set(new triSurface(surfName, scaleFactor));
|
|
}
|
|
else if (isFile(fallback))
|
|
{
|
|
surfPtr.set(new triSurface(fallback, scaleFactor));
|
|
}
|
|
else
|
|
{
|
|
FatalErrorInFunction
|
|
<< "No such file:" << surfName << exit(FatalError);
|
|
}
|
|
|
|
return surfPtr;
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::addNote
|
|
(
|
|
"Intersection of two surfaces. Writes obj file"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"debug2",
|
|
"set surfaceIntersection debug=2"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"debug4",
|
|
"set surfaceIntersection debug=4"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"print",
|
|
"print information about cuts, etc"
|
|
);
|
|
argList::addBoolOption
|
|
(
|
|
"mergeEdges",
|
|
"merge duplicate edges"
|
|
);
|
|
argList::addOption
|
|
(
|
|
"mergePoints",
|
|
"mergeTol",
|
|
"merge points (and edges) using the specified tolerance"
|
|
);
|
|
argList::addOption
|
|
(
|
|
"scale",
|
|
"factor",
|
|
"geometry scaling factor"
|
|
);
|
|
|
|
argList::addOption
|
|
(
|
|
"dict",
|
|
"file",
|
|
"Dictionary of intersect options"
|
|
);
|
|
|
|
argList::addNote
|
|
(
|
|
"Test intersect of two surfaces. Writes obj file"
|
|
);
|
|
argList::noParallel();
|
|
argList::noFunctionObjects();
|
|
argList::addArgument("surface file");
|
|
argList::addArgument("surface file");
|
|
|
|
#include "setRootCase.H"
|
|
#include "createTime.H"
|
|
|
|
const scalar scaleFactor = args.getOrDefault<scalar>("scale", -1);
|
|
|
|
const word outputFile(args.executable() + ".obj");
|
|
|
|
const auto surf1Name = args.get<fileName>(1);
|
|
triSurface surf1 = loadSurface(runTime, surf1Name, scaleFactor)();
|
|
Info<< surf1Name << " statistics:" << endl;
|
|
surf1.writeStats(Info);
|
|
Info<< endl;
|
|
|
|
const auto surf2Name = args.get<fileName>(2);
|
|
triSurface surf2 = loadSurface(runTime, surf2Name, scaleFactor)();
|
|
Info<< surf2Name << " statistics:" << endl;
|
|
surf2.writeStats(Info);
|
|
Info<< endl;
|
|
|
|
|
|
if (args.found("debug2"))
|
|
{
|
|
surfaceIntersection::debug |= 2;
|
|
}
|
|
if (args.found("debug4"))
|
|
{
|
|
surfaceIntersection::debug |= 4;
|
|
}
|
|
const bool optPrint = args.found("print");
|
|
|
|
dictionary intersectOptions;
|
|
if (args.found("dict"))
|
|
{
|
|
intersectOptions = IOdictionary
|
|
(
|
|
IOobject
|
|
(
|
|
args["dict"],
|
|
runTime,
|
|
IOobject::MUST_READ_IF_MODIFIED,
|
|
IOobject::NO_WRITE
|
|
)
|
|
);
|
|
}
|
|
|
|
intersectOptions.writeEntry("intersectOptions", Info);
|
|
Info<< endl;
|
|
|
|
triSurfaceSearch query1(surf1);
|
|
triSurfaceSearch query2(surf2);
|
|
surfaceIntersection cuts(query1, query2, intersectOptions);
|
|
|
|
Info<<"intersection "
|
|
<< cuts.cutPoints().size() << " points "
|
|
<< cuts.cutEdges().size() << " edges" << nl;
|
|
|
|
if (optPrint)
|
|
{
|
|
Info<< "surf1-cuts: " << cuts.surf1EdgeCuts() << nl
|
|
<< "surf2-cuts: " << cuts.surf2EdgeCuts() << nl
|
|
<< "face-pairs: " << cuts.facePairToEdgeId() << nl
|
|
<< "edges: " << cuts.cutEdges() << nl;
|
|
}
|
|
|
|
word mergeOp;
|
|
if (args.found("mergePoints"))
|
|
{
|
|
cuts.mergePoints(args.get<scalar>("mergePoints"));
|
|
mergeOp = "mergePoints";
|
|
}
|
|
else if (args.found("mergeEdges"))
|
|
{
|
|
cuts.mergeEdges();
|
|
mergeOp = "mergeEdges";
|
|
}
|
|
|
|
if (!mergeOp.empty())
|
|
{
|
|
Info<< mergeOp << ": "
|
|
<< cuts.cutPoints().size() << " points "
|
|
<< cuts.cutEdges().size() << " edges" << nl;
|
|
|
|
if (optPrint)
|
|
{
|
|
Info<< "surf1-cuts: " << cuts.surf1EdgeCuts() << nl
|
|
<< "surf2-cuts: " << cuts.surf2EdgeCuts() << nl
|
|
<< "face-pairs: " << cuts.facePairToEdgeId() << nl
|
|
<< "edges: " << cuts.cutEdges() << nl;
|
|
}
|
|
}
|
|
|
|
const pointField& points = cuts.cutPoints();
|
|
const edgeList& edges = cuts.cutEdges();
|
|
|
|
if (points.size() || edges.size())
|
|
{
|
|
Info<<"write to " << outputFile << nl;
|
|
OBJstream(outputFile).write(edges, points);
|
|
}
|
|
|
|
Info<< "End\n" << endl;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|