From 344940829a78f5ea4e166ecf569d40746216e8eb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 28 Apr 2020 16:10:09 +0200
Subject: [PATCH] STYLE: use simpler typedefs for PrimitivePatch instances
---
.../patchToPatchInterpolation.H | 19 ++++++++++---------
.../PrimitivePatchInterpolation.C | 12 ++++--------
.../primitivePatchInterpolation.H | 12 ++++--------
.../primitivePatch/indirectPrimitivePatch.H | 4 +++-
.../primitivePatch/primitiveFacePatch.H | 6 +++++-
.../primitivePatch/primitivePatch.H | 6 +++++-
.../primitivePatch/uindirectPrimitivePatch.H | 4 +++-
src/dynamicMesh/boundaryMesh/boundaryMesh.C | 7 ++-----
src/dynamicMesh/boundaryMesh/boundaryMesh.H | 6 +++---
.../AMIPatchToPatchInterpolation.H | 13 ++++---------
10 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
index 0443e08b969..34fde341e37 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -23,26 +24,26 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+Typedef
+ Foam::patchToPatchInterpolation
+
+Description
+ Foam::patchToPatchInterpolation
+
\*---------------------------------------------------------------------------*/
#ifndef patchToPatchInterpolation_H
#define patchToPatchInterpolation_H
#include "PatchToPatchInterpolation.H"
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "SubList.H"
-#include "pointField.H"
+#include "primitivePatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef PatchToPatchInterpolation
- <
- PrimitivePatch<face, SubList, const pointField&>,
- PrimitivePatch<face, SubList, const pointField&>
- > patchToPatchInterpolation;
+ typedef PatchToPatchInterpolation<primitivePatch, primitivePatch>
+ patchToPatchInterpolation;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index a7597b5e60d..ccc578f7a1c 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -64,7 +64,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
const List<typename Patch::face_type>& faces = patch_.localFaces();
faceToPointWeightsPtr_ = new scalarListList(points.size());
- scalarListList& weights = *faceToPointWeightsPtr_;
+ auto& weights = *faceToPointWeightsPtr_;
// get reference to addressing
const labelListList& pointFaces = patch_.pointFaces();
@@ -122,7 +122,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
const labelListList& edgeFaces = patch_.edgeFaces();
faceToEdgeWeightsPtr_ = new scalarList(patch_.nInternalEdges());
- scalarList& weights = *faceToEdgeWeightsPtr_;
+ auto& weights = *faceToEdgeWeightsPtr_;
forAll(weights, edgei)
{
@@ -301,12 +301,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
<< abort(FatalError);
}
- tmp<Field<Type>> tresult
- (
- new Field<Type>(patch_.nEdges(), Zero)
- );
-
- Field<Type>& result = tresult.ref();
+ auto tresult = tmp<Field<Type>>::New(patch_.nEdges(), Zero);
+ auto& result = tresult.ref();
const edgeList& edges = patch_.edges();
const labelListList& edgeFaces = patch_.edgeFaces();
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
index 814f75d4503..93f26a19221 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -35,19 +36,14 @@ Description
#define primitivePatchInterpolation_H
#include "PrimitivePatchInterpolation.H"
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "SubList.H"
-#include "pointField.H"
+#include "primitivePatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef PrimitivePatchInterpolation
- <
- PrimitivePatch<face, SubList, const pointField&>
- > primitivePatchInterpolation;
+ typedef PrimitivePatchInterpolation<primitivePatch>
+ primitivePatchInterpolation;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
index 9c2bd3e3dab..a170f8cfd51 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,8 @@ Typedef
Foam::indirectPrimitivePatch
Description
- A PrimitivePatch using an IndirectList for the faces.
+ A PrimitivePatch with an IndirectList for the faces, const reference
+ for the point field.
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitiveFacePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitiveFacePatch.H
index a072d754766..0406e4cbc10 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitiveFacePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitiveFacePatch.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,10 @@ Typedef
Foam::primitiveFacePatch
Description
- Foam::primitiveFacePatch
+ A PrimitivePatch with List storage for the faces,
+ const reference for the point field.
+
+ Can be used to store faces.
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
index a3e116da17e..2b78ffc6378 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,10 @@ Typedef
Foam::primitivePatch
Description
- Addressing for a faceList slice.
+ A PrimitivePatch with a SubList addressing for the faces,
+ const reference for the point field.
+
+ Can be used as addressing for a faceList slice.
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/uindirectPrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/uindirectPrimitivePatch.H
index 236fffcbae1..4c5ca8a6a34 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/uindirectPrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/uindirectPrimitivePatch.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,7 +28,8 @@ Typedef
Foam::uindirectPrimitivePatch
Description
- A PrimitivePatch using a UIndirectList for the faces.
+ A PrimitivePatch with UIndirectList for the faces, const reference
+ for the point field.
\*---------------------------------------------------------------------------*/
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 99da7db4530..7df285f68a0 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -36,6 +36,7 @@ License
#include "triSurface.H"
#include "SortableList.H"
#include "OFstream.H"
+#include "primitiveFacePatch.H"
#include "uindirectPrimitivePatch.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -538,11 +539,7 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
//
// Temporary primitivePatch to calculate compact points & faces.
- PrimitivePatch<face, List, const pointField&> globalPatch
- (
- bFaces,
- mesh.points()
- );
+ primitiveFacePatch globalPatch(bFaces, mesh.points());
// Store in local(compact) addressing
clearOut();
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index e2096828b5c..c7602a7e9dd 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -50,7 +50,7 @@ SourceFiles
namespace Foam
{
-// Forward declaration of classes
+// Forward Declarations
class Time;
class polyMesh;
class primitiveMesh;
@@ -61,7 +61,7 @@ class primitiveMesh;
class boundaryMesh
{
- // Static data
+ // Static Data
//- Normal along which to divide faces into categories
// (used in getNearest)
@@ -73,7 +73,7 @@ class boundaryMesh
static const scalar distanceTol_;
- // Private data
+ // Private Data
//- All boundary mesh data. Reconstructed every time faces are repatched
bMesh* meshPtr_;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H
index 4108f543007..c11f82dc3a0 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,20 +30,14 @@ License
#define AMIPatchToPatchInterpolation_H
#include "AMIInterpolation.H"
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "SubList.H"
-#include "pointField.H"
+#include "primitivePatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef AMIInterpolation
- <
- PrimitivePatch<face, SubList, const pointField&>,
- PrimitivePatch<face, SubList, const pointField&>
- > AMIPatchToPatchInterpolation;
+ typedef AMIInterpolation<primitivePatch, primitivePatch>
+ AMIPatchToPatchInterpolation;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--
GitLab