zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

searchableSurface: Renamed geometry directory triSurface -> geometry

Browse Source 
Originally the only supported geometry specification were triangulated surfaces,
hence the name of the directory: constant/triSurface, however now that other
surface specifications are supported and provided it is much more logical that
the directory is named accordingly: constant/geometry.  All tutorial and
template cases have been updated.

Note that backward compatibility is provided such that if the constant/geometry
directory does not exist but constant/triSurface does then the geometry files
are read from there.
This commit is contained in:
Henry Weller
2021-02-04 13:51:48 +00:00
parent 1e728ad7e3
commit 66c62e9296
171 changed files with 323 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -305,7 +305,7 @@ int main(int argc, char *argv[])
(
"cvSearchableSurfaces",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE

28
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -145,7 +145,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
(
surfaceName_ + ".cellSize",
surface_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surface_.searchableSurface::time(),
IOobject::NO_READ,
IOobject::NO_WRITE
@ -169,7 +172,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
(
curvatureFile_,
surface_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surface_.searchableSurface::time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -214,7 +220,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
(
internalClosenessFile_,
surface_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surface_.searchableSurface::time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -247,7 +256,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
(
featureProximityFile_,
surface_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surface_.searchableSurface::time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -291,7 +303,11 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
surface_.searchableSurface::time().writeFormat()
).write
(
surface_.searchableSurface::time().constant()/"triSurface",
surface_.searchableSurface::time().constant()/
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surfaceName_.lessExt().name(),
surface_.points(),
faces,

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -87,7 +87,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::fieldFromFile::load()
(
fileName_,
surface_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surface_.searchableSurface::time()
),
surface_.searchableSurface::time(),
IOobject::MUST_READ,
IOobject::NO_WRITE

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,10 @@ Foam::nonUniformField::nonUniformField
(
"pointCellSize.cellSize",
surfaceTriMesh_.searchableSurface::time().constant(),
"triSurface",
searchableSurface::geometryDir
(
surfaceTriMesh_.searchableSurface::time()
),
surfaceTriMesh_.searchableSurface::time(),
IOobject::NO_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -835,7 +835,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
(
"cvSearchableSurfaces",
runTime_.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime_,
IOobject::MUST_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -83,7 +83,7 @@ int main(int argc, char *argv[])
(
"cvSearchableSurfaces",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -432,7 +432,7 @@ int main(int argc, char *argv[])
(
"cvSearchableSurfaces",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE

10
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -401,7 +401,7 @@ int main(int argc, char *argv[])
(
"cvSearchableSurfaces",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -611,9 +611,9 @@ int main(int argc, char *argv[])
IOobject
(
exportName,
runTime.constant(), // instance
"triSurface",
runTime, // registry
runTime.constant(),
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false

10
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,7 +88,7 @@ int main(int argc, char *argv[])
(
"cvSearchableSurfaces",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -323,9 +323,9 @@ int main(int argc, char *argv[])
IOobject
(
exportName,
runTime.constant(), // instance
"triSurface",
runTime, // registry
runTime.constant(),
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -117,7 +117,7 @@ Foam::CV2D::CV2D
(
"cvSearchableSurfaces",
runTime_.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime_,
IOobject::MUST_READ,
IOobject::NO_WRITE

9
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -867,11 +867,10 @@ int main(int argc, char *argv[])
(
IOobject
(
"abc", // dummy name
mesh.time().constant(), // instance
// mesh.time().findInstance("triSurface", word::null),// instance
"triSurface", // local
mesh.time(), // registry
"abc",
mesh.time().constant(),
searchableSurface::geometryDir(mesh.time()),
mesh.time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
),

5
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,7 +49,7 @@ Description
#include "pointFields.H"
#include "fvMeshMapper.H"
#include "faceSelection.H"
#include "searchableSurface.H"
#include "fvMeshTools.H"
using namespace Foam;
@ -446,7 +446,6 @@ int main(int argc, char *argv[])
runTime.functionObjects().off();
#include "createNamedMesh.H"
const bool overwrite = args.optionFound("overwrite");
const word oldInstance = mesh.pointsInstance();

4
applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,7 +66,7 @@ Foam::faceSelections::searchableSurfaceSelection::searchableSurfaceSelection
(
dict.lookupOrDefault("name", mesh.objectRegistry::db().name()),
mesh.time().constant(),
"triSurface",
searchableSurface::geometryDir(mesh.time()),
mesh.objectRegistry::db(),
IOobject::MUST_READ,
IOobject::NO_WRITE

6
applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
View File

@ -56,9 +56,9 @@ distributedTriSurfaceMesh surfacesMesh
IOobject
(
"wallSurface.stl",
runTime.constant(), // directory
"triSurface", // instance
runTime, // registry
runTime.constant(),
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -780,10 +780,10 @@ int main(int argc, char *argv[])
(
IOobject
(
sFeatFileName + ".eMesh", // name
runTime.constant(), // instance
"triSurface",
runTime, // registry
sFeatFileName + ".eMesh",
runTime.constant(),
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false

47
applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -180,7 +180,12 @@ namespace Foam
// Read
// ~~~~
triSurface surf(runTime.constantPath()/"triSurface"/surfaceFileName);
triSurface surf
(
runTime.constantPath()
/searchableSurface::geometryDir(runTime)
/surfaceFileName
);
Info<< "Statistics:" << endl;
surf.writeStats(Info);
@ -405,7 +410,7 @@ namespace Foam
(
surfaceFileName.lessExt().name() + ".eMesh",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
@ -457,7 +462,7 @@ namespace Foam
(
sFeatFileName + ".closeness",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime
),
surf
@ -488,8 +493,9 @@ namespace Foam
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
searchSurf.objectRegistry::name(), // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
searchSurf.objectRegistry::name(),
searchSurf.points(),
faces,
"internalCloseness", // fieldName
@ -499,8 +505,9 @@ namespace Foam
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
searchSurf.objectRegistry::name(), // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
searchSurf.objectRegistry::name(),
searchSurf.points(),
faces,
"externalCloseness", // fieldName
@ -554,8 +561,9 @@ namespace Foam
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
searchSurf.objectRegistry::name(), // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
searchSurf.objectRegistry::name(),
searchSurf.points(),
faces,
"internalPointCloseness", // fieldName
@ -565,8 +573,9 @@ namespace Foam
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
searchSurf.objectRegistry::name(), // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
searchSurf.objectRegistry::name(),
searchSurf.points(),
faces,
"externalPointCloseness", // fieldName
@ -589,7 +598,7 @@ namespace Foam
(
sFeatFileName + ".curvature",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime
),
surf,
@ -603,8 +612,9 @@ namespace Foam
{
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
sFeatFileName, // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
sFeatFileName,
surf.points(),
faces,
"curvature", // fieldName
@ -659,7 +669,7 @@ namespace Foam
(
sFeatFileName + ".featureProximity",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE
@ -675,8 +685,9 @@ namespace Foam
{
vtkSurfaceWriter(runTime.writeFormat()).write
(
runTime.constantPath()/"triSurface",// outputDir
sFeatFileName, // surfaceName
runTime.constantPath()
/searchableSurface::geometryDir(runTime),
sFeatFileName,
surf.points(),
faces,
"featureProximity", // fieldName

8
applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -300,7 +300,7 @@ int main(int argc, char *argv[])
(
"surfacesToHook",
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime
),
dict,
@ -345,7 +345,7 @@ int main(int argc, char *argv[])
(
"hookedSurface_" + surfs.names()[surfI],
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime
),
surf
@ -559,7 +559,7 @@ int main(int argc, char *argv[])
(
"hookedSurface_" + surfs.names()[surfI],
runTime.constant(),
"triSurface",
searchableSurface::geometryDir(runTime),
runTime
),
triSurface

6
applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,7 +85,7 @@ int main(int argc, char *argv[])
argList::addBoolOption("clean");
argList::addBoolOption("orient");
argList::addBoolOption("surfMesh");
argList::addBoolOption("triSurface");
argList::addBoolOption(triSurface::typeName);
argList::addBoolOption("unsorted");
argList::addBoolOption("triFace");
@ -119,7 +119,7 @@ int main(int argc, char *argv[])
return 1;
}
if (args.optionFound("triSurface"))
if (args.optionFound(triSurface::typeName))
{
triSurface surf(importName);

11
applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -158,11 +158,10 @@ int main(int argc, char *argv[])
IOobject io
(
surfFileName, // name
// runTime.findInstance("triSurface", surfFileName), // instance
runTime.constant(), // instance
"triSurface", // local
runTime, // registry
surfFileName,
runTime.constant(),
searchableSurface::geometryDir(runTime),
runTime,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
);