From 31cea7cb8fff66af50d2a75ef5b3e4d8794e3400 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 30 Mar 2011 16:47:03 +0100
Subject: [PATCH] STYLE: treeData*: renamed points() to shapePoints() to avoid
confusion
---
src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C | 2 +-
src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H | 2 +-
src/OpenFOAM/meshes/polyMesh/polyMesh.C | 2 ++
src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C | 2 ++
src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H | 6 ++++--
src/meshTools/indexedOctree/treeDataEdge.C | 4 ++--
src/meshTools/indexedOctree/treeDataEdge.H | 4 ++--
src/meshTools/indexedOctree/treeDataFace.C | 4 ++--
src/meshTools/indexedOctree/treeDataFace.H | 4 ++--
src/meshTools/indexedOctree/treeDataPoint.C | 2 +-
src/meshTools/indexedOctree/treeDataPoint.H | 7 ++++++-
src/meshTools/indexedOctree/treeDataPrimitivePatch.C | 4 ++--
src/meshTools/indexedOctree/treeDataPrimitivePatch.H | 4 ++--
src/meshTools/indexedOctree/treeDataTriSurface.C | 4 ++--
src/meshTools/indexedOctree/treeDataTriSurface.H | 4 ++--
15 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
index c528f8fa16c..0ea4168bd25 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
@@ -126,7 +126,7 @@ Foam::treeDataCell::treeDataCell
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::pointField Foam::treeDataCell::points() const
+Foam::pointField Foam::treeDataCell::shapePoints() const
{
pointField cc(cellLabels_.size());
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
index 7cebddafa94..0e55f5168a4 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
@@ -125,7 +125,7 @@ public:
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 9891c79e5bb..4c08d917e7c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -34,6 +34,8 @@ License
#include "OSspecific.H"
#include "demandDrivenData.H"
#include "polyMeshTetDecomposition.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
#include "pointMesh.H"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index b0e83ce670c..d14807abf80 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -25,6 +25,8 @@ License
#include "primitiveMesh.H"
#include "demandDrivenData.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index cc3bc2c80a8..92937ed1587 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -67,14 +67,16 @@ SourceFiles
#include "Map.H"
#include "EdgeMap.H"
#include "boundBox.H"
-#include "indexedOctree.H"
-#include "treeDataCell.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+// Forward declaration of classes
+class treeDataCell;
+template<class Type> class indexedOctree;
+
/*---------------------------------------------------------------------------*\
Class primitiveMesh Declaration
\*---------------------------------------------------------------------------*/
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 3146bcd4d42..2dab1ce1e6e 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,7 +95,7 @@ Foam::treeDataEdge::treeDataEdge
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::pointField Foam::treeDataEdge::points() const
+Foam::pointField Foam::treeDataEdge::shapePoints() const
{
pointField eMids(edgeLabels_.size());
diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/meshTools/indexedOctree/treeDataEdge.H
index 635babcf61f..9a4864783f9 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.H
+++ b/src/meshTools/indexedOctree/treeDataEdge.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -128,7 +128,7 @@ public:
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 66d6feec71d..5afdfc98b46 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -144,7 +144,7 @@ Foam::treeDataFace::treeDataFace
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::pointField Foam::treeDataFace::points() const
+Foam::pointField Foam::treeDataFace::shapePoints() const
{
pointField cc(faceLabels_.size());
diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H
index 89ed27e24b6..71a08887ba5 100644
--- a/src/meshTools/indexedOctree/treeDataFace.H
+++ b/src/meshTools/indexedOctree/treeDataFace.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -140,7 +140,7 @@ public:
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index cabc1acf7f3..1685b3b4e98 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -54,7 +54,7 @@ Foam::treeDataPoint::treeDataPoint
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::pointField Foam::treeDataPoint::points() const
+Foam::pointField Foam::treeDataPoint::shapePoints() const
{
if (pointLabels_.size())
{
diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H
index 4f67b15a3fc..291927625c5 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.H
+++ b/src/meshTools/indexedOctree/treeDataPoint.H
@@ -94,9 +94,14 @@ public:
return pointLabels_;
}
+ const pointField& points() const
+ {
+ return points_;
+ }
+
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 87f033d3a3f..e6b485d6f42 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -128,7 +128,7 @@ template
>
Foam::pointField
Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
-points() const
+shapePoints() const
{
pointField cc(patch_.size());
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
index 5c098d0be82..b87514a4a28 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -118,7 +118,7 @@ public:
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index 3e515cf6994..63c76de4825 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -187,7 +187,7 @@ Foam::treeDataTriSurface::treeDataTriSurface(const triSurface& surface)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::pointField Foam::treeDataTriSurface::points() const
+Foam::pointField Foam::treeDataTriSurface::shapePoints() const
{
const pointField& points = surface_.points();
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.H b/src/meshTools/indexedOctree/treeDataTriSurface.H
index 377294dcbd6..47778c61c59 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.H
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -103,7 +103,7 @@ public:
//- Get representative point cloud for all shapes inside
// (one point per shape)
- pointField points() const;
+ pointField shapePoints() const;
// Search
--
GitLab