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

COMP: resolve 'point' ambiguity in foamyQuadMesh

Browse Source 
- CGAL Triangulation_2.h (version 4.12) defines a point function,
  which interferes with the Foam::point typedef.
This commit is contained in:
Alexey Matveichev
2018-06-01 14:10:17 +02:00
committed by Mark Olesen
parent d571e5231b
commit 8058184b0c
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ Foam::CV2D::CV2D
), ),
z_ z_
( (
point Foam::point
( (
cvMeshDict.subDict("surfaceConformation").lookup("locationInMesh") cvMeshDict.subDict("surfaceConformation").lookup("locationInMesh")
).z() ).z()
@ -260,7 +260,7 @@ void Foam::CV2D::insertGrid()
{ {
for (int j=0; j<nj; j++) for (int j=0; j<nj; j++)
{ {
point p(x0 + i*deltax, y0 + j*deltay, 0); Foam::point p(x0 + i*deltax, y0 + j*deltay, 0);
if (meshControls().randomiseInitialGrid()) if (meshControls().randomiseInitialGrid())
{ {

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
View File

@ -347,9 +347,9 @@ public:
// Conversion functions between point2D, point and Point // Conversion functions between point2D, point and Point
inline const point2D& toPoint2D(const point&) const; inline const point2D& toPoint2D(const Foam::point&) const;
inline const point2DField toPoint2D(const pointField&) const; inline const point2DField toPoint2D(const pointField&) const;
inline point toPoint3D(const point2D&) const; inline Foam::point toPoint3D(const point2D&) const;
#ifdef CGAL_INEXACT #ifdef CGAL_INEXACT
typedef const point2D& point2DFromPoint; typedef const point2D& point2DFromPoint;
@ -361,7 +361,7 @@ public:
inline point2DFromPoint toPoint2D(const Point&) const; inline point2DFromPoint toPoint2D(const Point&) const;
inline PointFromPoint2D toPoint(const point2D&) const; inline PointFromPoint2D toPoint(const point2D&) const;
inline point toPoint3D(const Point&) const; inline Foam::point toPoint3D(const Point&) const;
// Point insertion // Point insertion

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
View File

@ -121,7 +121,7 @@ inline const Foam::cv2DControls& Foam::CV2D::meshControls() const
} }
inline const Foam::point2D& Foam::CV2D::toPoint2D(const point& p) const inline const Foam::point2D& Foam::CV2D::toPoint2D(const Foam::point& p) const
{ {
return reinterpret_cast<const point2D&>(p); return reinterpret_cast<const point2D&>(p);
} }
@ -140,7 +140,7 @@ inline const Foam::point2DField Foam::CV2D::toPoint2D(const pointField& p) const
inline Foam::point Foam::CV2D::toPoint3D(const point2D& p) const inline Foam::point Foam::CV2D::toPoint3D(const point2D& p) const
{ {
return point(p.x(), p.y(), z_); return Foam::point(p.x(), p.y(), z_);
} }
@ -175,7 +175,7 @@ inline Foam::CV2D::PointFromPoint2D Foam::CV2D::toPoint(const point2D& p) const
inline Foam::point Foam::CV2D::toPoint3D(const Point& P) const inline Foam::point Foam::CV2D::toPoint3D(const Point& P) const
{ {
return point(CGAL::to_double(P.x()), CGAL::to_double(P.y()), z_); return Foam::point(CGAL::to_double(P.x()), CGAL::to_double(P.y()), z_);
} }

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

@ -210,8 +210,8 @@ void Foam::CV2D::extractPatches
|| (vB->internalOrBoundaryPoint() && !vA->internalOrBoundaryPoint()) || (vB->internalOrBoundaryPoint() && !vA->internalOrBoundaryPoint())
) )
{ {
point ptA = toPoint3D(vA->point()); Foam::point ptA = toPoint3D(vA->point());
point ptB = toPoint3D(vB->point()); Foam::point ptB = toPoint3D(vB->point());
label patchIndex = qSurf_.findPatch(ptA, ptB); label patchIndex = qSurf_.findPatch(ptA, ptB);

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertBoundaryConformPointPairs.C
View File

@ -295,7 +295,7 @@ void Foam::CV2D::markNearBoundaryPoints()
{ {
if (vit->internalPoint()) if (vit->internalPoint())
{ {
point vert(toPoint3D(vit->point())); Foam::point vert(toPoint3D(vit->point()));
pointIndexHit pHit; pointIndexHit pHit;
label hitSurface = -1; label hitSurface = -1;

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

@ -109,8 +109,8 @@ void Foam::CV2D::insertFeaturePoints()
{ {
const edge& e = feMesh.edges()[edgeI]; const edge& e = feMesh.edges()[edgeI];
const point& ep0 = points[e.start()]; const Foam::point& ep0 = points[e.start()];
const point& ep1 = points[e.end()]; const Foam::point& ep1 = points[e.end()];
const linePointRef line(ep0, ep1); const linePointRef line(ep0, ep1);

5
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
View File

@ -39,7 +39,7 @@ bool Foam::CV2D::dualCellSurfaceIntersection
{ {
if (!is_infinite(ec)) if (!is_infinite(ec))
{ {
point e0 = toPoint3D(circumcenter(ec->first)); Foam::point e0 = toPoint3D(circumcenter(ec->first));
// If edge end is outside bounding box then edge cuts boundary // If edge end is outside bounding box then edge cuts boundary
if (!qSurf_.globalBounds().contains(e0)) if (!qSurf_.globalBounds().contains(e0))
@ -47,7 +47,8 @@ bool Foam::CV2D::dualCellSurfaceIntersection
return true; return true;
} }
point e1 = toPoint3D(circumcenter(ec->first->neighbor(ec->second))); Foam::point e1 =
toPoint3D(circumcenter(ec->first->neighbor(ec->second)));
// If other edge end is outside bounding box then edge cuts boundary // If other edge end is outside bounding box then edge cuts boundary
if (!qSurf_.globalBounds().contains(e1)) if (!qSurf_.globalBounds().contains(e1))