diff --git a/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H b/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H index 1485226d98ce2814ee8862864582744a73675930..ae18cd6f6ecac24588752340a1c479f3b93e5c9b 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H +++ b/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2D.C b/applications/utilities/mesh/generation/cv2DMesh/CV2D.C index aa45a88b3e9fd47319a5332a0899d28492a0a943..bbd546cd03003587caa314a3f7196245029698fc 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/CV2D.C +++ b/applications/utilities/mesh/generation/cv2DMesh/CV2D.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,9 +32,7 @@ License namespace Foam { - -defineTypeNameAndDebug(CV2D, 0); - + defineTypeNameAndDebug(CV2D, 0); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -67,6 +65,7 @@ void Foam::CV2D::fast_restore_Delaunay(Vertex_handle vh) } while (f != start); } + void Foam::CV2D::external_flip(Face_handle& f, int i) { Face_handle n = f->neighbor(i); @@ -82,6 +81,7 @@ void Foam::CV2D::external_flip(Face_handle& f, int i) external_flip(n, i); } + bool Foam::CV2D::internal_flip(Face_handle& f, int i) { Face_handle n = f->neighbor(i); diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2D.H b/applications/utilities/mesh/generation/cv2DMesh/CV2D.H index 305420e73f9c6d6ffb3bbb5d784c40dd349c6bb0..7a694b652861e58f2d78acef63c14e7b3a5e0c03 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/CV2D.H +++ b/applications/utilities/mesh/generation/cv2DMesh/CV2D.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -321,18 +321,14 @@ private: public: - //- Runtime type information - ClassName("CV2D"); + //- Runtime type information + ClassName("CV2D"); // Constructors //- Construct for given surface - CV2D - ( - const Time& runTime, - const dictionary& controlDict - ); + CV2D(const Time& runTime, const dictionary& controlDict); //- Destructor @@ -420,6 +416,7 @@ public: EdgeMap<label>& mapEdgesRegion ) const; + // Write //- Write internal points to .obj file diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2DI.H b/applications/utilities/mesh/generation/cv2DMesh/CV2DI.H index c96f47ab45fe877ba77647c48a2ccba8c57af3ee..80069eb694877d00a280e7153dd0d2e0f3588ae6 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/CV2DI.H +++ b/applications/utilities/mesh/generation/cv2DMesh/CV2DI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -120,11 +120,13 @@ inline const Foam::cv2DControls& Foam::CV2D::meshControls() const return controls_; } + inline const Foam::point2D& Foam::CV2D::toPoint2D(const point& p) const { return reinterpret_cast<const point2D&>(p); } + inline const Foam::point2DField Foam::CV2D::toPoint2D(const pointField& p) const { point2DField temp(p.size()); @@ -135,6 +137,7 @@ inline const Foam::point2DField Foam::CV2D::toPoint2D(const pointField& p) const return temp; } + inline Foam::point Foam::CV2D::toPoint3D(const point2D& p) const { return point(p.x(), p.y(), z_); @@ -148,6 +151,7 @@ inline Foam::CV2D::point2DFromPoint Foam::CV2D::toPoint2D(const Point& P) const return reinterpret_cast<point2DFromPoint>(P); } + inline Foam::CV2D::PointFromPoint2D Foam::CV2D::toPoint(const point2D& p) const { return reinterpret_cast<PointFromPoint2D>(p); @@ -160,6 +164,7 @@ inline Foam::CV2D::point2DFromPoint Foam::CV2D::toPoint2D(const Point& P) const return point2D(CGAL::to_double(P.x()), CGAL::to_double(P.y())); } + inline Foam::CV2D::PointFromPoint2D Foam::CV2D::toPoint(const point2D& p) const { return Point(p.x(), p.y()); @@ -207,6 +212,7 @@ inline bool Foam::boundaryTriangle(const CV2D::Face_handle fc) ); } + inline bool Foam::outsideTriangle(const CV2D::Face_handle fc) { return outsideTriangle diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C b/applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C index 60e4fa6113403596987e913b9bbdfc4c6348d6f9..e8fa096737b60b5e2be89a10ad253465999f2725 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C +++ b/applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C index b2b92a845f0b0c9263c19d640d00f164a8907de0..0feb90d13801b691eaabf10fb56f9a449d0da85c 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C +++ b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H index 0d1f47b1ca0190a2bb9866adfffb971d0f4efde8..9470badb2f3bd86196b77804091a03e18f297fd2 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H +++ b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedFace.H b/applications/utilities/mesh/generation/cv2DMesh/indexedFace.H index 4cea4a7c51f6f11f83a861b017154350b7d8de4b..6ebc154e3f4e02c23b8fd5d803c6edc073694e0b 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/indexedFace.H +++ b/applications/utilities/mesh/generation/cv2DMesh/indexedFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H b/applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H index cda593840d98c9f22da247940af5fedd1701270f..8efb22c735c6f65d6563480e73ac266b42996475 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H +++ b/applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -252,7 +252,6 @@ public: || (v1.farPoint() || v1.ppSlave()) || (v2.farPoint() || v2.ppSlave()); } - }; diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C b/applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C index b4cf64091c92aa83937c057366d0b758401d9131..55f46274778ce348ef8fec3ba3dc83ddc8a67dd7 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C +++ b/applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C index 0773e41138dc75e0940c4f759d60bfb595fd6f34..a1d1919f124db2960ce16d9eaac2b825d63ab5f1 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C +++ b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C index e04955ab0886f9886e2c6f9865505f8e069233e3..fd941137dd7b741beffd61114b0726601f785b3b 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C +++ b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C index 5e960cb558fe3118f9eaf3df280c6be05a69d965..4efe5a564edbeb5cc72a75832beb2e7603c5e942 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C +++ b/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C @@ -27,13 +27,9 @@ License namespace Foam { - -defineTypeNameAndDebug(shortEdgeFilter2D, 0); - + defineTypeNameAndDebug(shortEdgeFilter2D, 0); } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H index 1a100bcb200d6dd604f4fa25bd2a3dc904cf3989..7b9adea1d05e862c5212b0907c902a3bb3872739 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H +++ b/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,6 @@ class shortEdgeFilter2D { // Private data - //- Description of data_ const CV2D& cv2Dmesh_; MeshedSurface<face> ms_; @@ -83,11 +82,7 @@ public: // Constructors - shortEdgeFilter2D - ( - const CV2D& cv2Dmesh, - const dictionary& dict - ); + shortEdgeFilter2D(const CV2D& cv2Dmesh, const dictionary& dict); //- Destructor @@ -116,12 +111,12 @@ public: return ms_; } + // Member Functions void filter(); void writeInfo(Ostream& os); - };