From a53b192d7de188172c589706f2249f4b1dc63372 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Dec 2011 11:23:54 +0000
Subject: [PATCH] STYLE: Minor code formatting corrections and corrected
copyright year
---
.../generation/cv2DMesh/CGALTriangulation2Ddefs.H | 2 +-
.../utilities/mesh/generation/cv2DMesh/CV2D.C | 8 ++++----
.../utilities/mesh/generation/cv2DMesh/CV2D.H | 13 +++++--------
.../utilities/mesh/generation/cv2DMesh/CV2DI.H | 8 +++++++-
.../utilities/mesh/generation/cv2DMesh/CV2DIO.C | 2 +-
.../cv2DControls/cv2DControls.C | 2 +-
.../cv2DControls/cv2DControls.H | 2 +-
.../mesh/generation/cv2DMesh/indexedFace.H | 2 +-
.../mesh/generation/cv2DMesh/indexedVertex.H | 3 +--
.../cv2DMesh/insertBoundaryConformPointPairs.C | 2 +-
.../cv2DMesh/insertSurfaceNearPointPairs.C | 2 +-
.../cv2DMesh/insertSurfaceNearestPointPairs.C | 2 +-
.../mesh/generation/cv2DMesh/shortEdgeFilter2D.C | 6 +-----
.../mesh/generation/cv2DMesh/shortEdgeFilter2D.H | 11 +++--------
14 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H b/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H
index 1485226d98c..ae18cd6f6ec 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 aa45a88b3e9..bbd546cd030 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 305420e73f9..7a694b65286 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 c96f47ab45f..80069eb6948 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 60e4fa61134..e8fa096737b 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 b2b92a845f0..0feb90d1380 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 0d1f47b1ca0..9470badb2f3 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 4cea4a7c51f..6ebc154e3f4 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 cda593840d9..8efb22c735c 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 b4cf64091c9..55f46274778 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 0773e41138d..a1d1919f124 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 e04955ab088..fd941137dd7 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 5e960cb558f..4efe5a564ed 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 1a100bcb200..7b9adea1d05 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);
-
};
--
GitLab