From 7c218f7adf637efacb9f50d97da9d0cec012e520 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 4 Jan 2013 11:15:36 +0000
Subject: [PATCH] STYLE: Minor code formatting
---
src/finiteVolume/fvMesh/wallDist/wallDist.C | 4 +--
.../cellDist/patchWave/patchDataWave.H | 5 ++--
src/meshTools/cellDist/patchWave/patchWave.C | 28 ++++---------------
src/meshTools/cellDist/patchWave/patchWave.H | 7 ++---
4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist.C
index 1cfd67f1898..405fba9c82a 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,8 +62,6 @@ Foam::wallDist::~wallDist()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Correct for mesh geom/topo changes. Might be more intelligent in the
-// future (if only small topology change)
void Foam::wallDist::correct()
{
// Get patchids of walls
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index e2369f81a92..a08740222b3 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,10 +55,9 @@ namespace Foam
// Forward declaration of classes
class polyMesh;
class wallPoint;
-//template<class Type, class TrackingData> class MeshWave;
/*---------------------------------------------------------------------------*\
- Class patchDataWave Declaration
+ Class patchDataWave Declaration
\*---------------------------------------------------------------------------*/
template<class TransferType>
diff --git a/src/meshTools/cellDist/patchWave/patchWave.C b/src/meshTools/cellDist/patchWave/patchWave.C
index 92d0b5c96c7..fd05d0e7284 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.C
+++ b/src/meshTools/cellDist/patchWave/patchWave.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,6 @@ License
#include "polyMesh.H"
#include "wallPoint.H"
#include "globalMeshData.H"
-#include "SubField.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -132,7 +131,6 @@ Foam::label Foam::patchWave::getValues(const MeshWave<wallPoint>& waveInfo)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::patchWave::patchWave
(
const polyMesh& mesh,
@@ -159,28 +157,19 @@ Foam::patchWave::~patchWave()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Correct for mesh geom/topo changes. Might be more intelligent in the
-// future (if only small topology change)
void Foam::patchWave::correct()
{
- //
// Set initial changed faces: set wallPoint for wall faces to wall centre
- //
- // Count walls
- label nWalls = sumPatchSize(patchIDs_);
+ label nPatch = sumPatchSize(patchIDs_);
- List<wallPoint> faceDist(nWalls);
- labelList changedFaces(nWalls);
+ List<wallPoint> faceDist(nPatch);
+ labelList changedFaces(nPatch);
// Set to faceDist information to facecentre on walls.
setChangedFaces(patchIDs_, changedFaces, faceDist);
-
- //
// Do calculate wall distance by 'growing' from faces.
- //
-
MeshWave<wallPoint> waveInfo
(
mesh(),
@@ -189,20 +178,13 @@ void Foam::patchWave::correct()
mesh().globalData().nTotalCells()+1 // max iterations
);
-
- //
// Copy distance into return field
- //
-
nUnset_ = getValues(waveInfo);
- //
// Correct wall cells for true distance
- //
-
if (correctWalls_)
{
- Map<label> nearestFace(2 * nWalls);
+ Map<label> nearestFace(2*nPatch);
correctBoundaryFaceCells
(
diff --git a/src/meshTools/cellDist/patchWave/patchWave.H b/src/meshTools/cellDist/patchWave/patchWave.H
index 16de93356a2..72a683625bb 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.H
+++ b/src/meshTools/cellDist/patchWave/patchWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ class polyMesh;
class wallPoint;
/*---------------------------------------------------------------------------*\
- Class patchWave Declaration
+ Class patchWave Declaration
\*---------------------------------------------------------------------------*/
class patchWave
@@ -128,7 +128,7 @@ public:
return distance_;
}
- //- Non const access so we can 'transfer' contents for efficiency.
+ //- Non const access so we can 'transfer' contents for efficiency
scalarField& distance()
{
return distance_;
@@ -143,7 +143,6 @@ public:
{
return patchDistance_;
}
-
};
--
GitLab