zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: foamyHexMesh: Remove reconformation enum.

Browse Source
This commit is contained in:
laurence
2013-07-29 15:40:39 +01:00
parent 56421096d1
commit 8b12dcfdb3
5 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
View File

@ -38,12 +38,14 @@ Description
#ifdef CGAL_INEXACT
// Fast kernel using a double as the storage type but the triangulation may
// fail. Adding robust circumcentre traits
// fail. Adding robust circumcentre traits.
#include "CGAL/Exact_predicates_inexact_constructions_kernel.h"
typedef CGAL::Exact_predicates_inexact_constructions_kernel baseK;
// #include <CGAL/Robust_circumcenter_traits_3.h>
#include <CGAL/Robust_circumcenter_filtered_traits_3.h>
// typedef CGAL::Robust_circumcenter_traits_3<baseK> K;
#include <CGAL/Robust_circumcenter_filtered_traits_3.h>
typedef CGAL::Robust_circumcenter_filtered_traits_3<baseK> K;
#else
@ -55,6 +57,7 @@ Description
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

1
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
View File

@ -53,6 +53,7 @@ typedef CGAL::Triangulation_data_structure_3<Vb, Cb> Tds;
typedef CGAL::Delaunay_triangulation_3<K, Tds, CompactLocator> Delaunay;
typedef CGAL::Delaunay_triangulation_3<K, Tds, FastLocator> CellSizeDelaunay;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -44,8 +44,6 @@ namespace Foam
defineTypeNameAndDebug(conformalVoronoiMesh, 0);
}
const Foam::scalar Foam::conformalVoronoiMesh::tolParallel = 1e-3;
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //

10
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
View File

@ -103,12 +103,6 @@ class conformalVoronoiMesh
{
public:
enum reconformationMode
{
rmOff, // Do not rebuild the surface conformation
rmOn
};
typedef Delaunay::Vertex_handle Vertex_handle;
typedef Delaunay::Cell_handle Cell_handle;
typedef Delaunay::Edge Edge;
@ -126,8 +120,6 @@ private:
// Static data
static const scalar tolParallel;
static const scalar searchConeAngle;
static const scalar searchAngleOppositeSurface;
@ -492,7 +484,7 @@ private:
//- Decision making function for when to rebuild the surface
// conformation
reconformationMode reconformationControl() const;
bool reconformToSurface() const;
//- Determines geometrically whether a vertex is close to a surface
// This is an optimisation

25
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

@ -55,7 +55,7 @@ void Foam::conformalVoronoiMesh::conformToSurface()
cit->cellIndex() = Cb::ctUnassigned;
}
if (reconformationControl() == rmOff)
if (!reconformToSurface())
{
// Reinsert stored surface conformation
reinsertSurfaceConformation();
@ -87,8 +87,7 @@ void Foam::conformalVoronoiMesh::conformToSurface()
}
Foam::conformalVoronoiMesh::reconformationMode
Foam::conformalVoronoiMesh::reconformationControl() const
bool Foam::conformalVoronoiMesh::reconformToSurface() const
{
if
(
@ -96,10 +95,10 @@ Foam::conformalVoronoiMesh::reconformationControl() const
% foamyHexMeshControls().surfaceConformationRebuildFrequency() == 0
)
{
return rmOn;
return true;
}
return rmOff;
return false;
}
@ -220,19 +219,9 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
{
timeCheck("Start buildSurfaceConformation");
if (reconformationControl() == rmOff)
{
WarningIn("buildSurfaceConformation()")
<< "reconformationMode rmNone specified, not building conformation"
<< endl;
return;
}
else
{
Info<< nl << "Rebuilding surface conformation for more iterations"
<< endl;
}
Info<< nl
<< "Rebuilding surface conformation for more iterations"
<< endl;
existingEdgeLocations_.clearStorage();
existingSurfacePtLocations_.clearStorage();