STYLE: Minor code formatting

This commit is contained in:
andy
2013-01-04 11:15:36 +00:00
parent 5d6e00233f
commit 7c218f7adf
4 changed files with 11 additions and 33 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,8 +62,6 @@ Foam::wallDist::~wallDist()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Correct for mesh geom/topo changes. Might be more intelligent in the
// future (if only small topology change)
void Foam::wallDist::correct() void Foam::wallDist::correct()
{ {
// Get patchids of walls // Get patchids of walls

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -55,10 +55,9 @@ namespace Foam
// Forward declaration of classes // Forward declaration of classes
class polyMesh; class polyMesh;
class wallPoint; class wallPoint;
//template<class Type, class TrackingData> class MeshWave;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class patchDataWave Declaration Class patchDataWave Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class TransferType> template<class TransferType>

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,7 +27,6 @@ License
#include "polyMesh.H" #include "polyMesh.H"
#include "wallPoint.H" #include "wallPoint.H"
#include "globalMeshData.H" #include "globalMeshData.H"
#include "SubField.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -132,7 +131,6 @@ Foam::label Foam::patchWave::getValues(const MeshWave<wallPoint>& waveInfo)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::patchWave::patchWave Foam::patchWave::patchWave
( (
const polyMesh& mesh, const polyMesh& mesh,
@ -159,28 +157,19 @@ Foam::patchWave::~patchWave()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Correct for mesh geom/topo changes. Might be more intelligent in the
// future (if only small topology change)
void Foam::patchWave::correct() void Foam::patchWave::correct()
{ {
//
// Set initial changed faces: set wallPoint for wall faces to wall centre // Set initial changed faces: set wallPoint for wall faces to wall centre
//
// Count walls label nPatch = sumPatchSize(patchIDs_);
label nWalls = sumPatchSize(patchIDs_);
List<wallPoint> faceDist(nWalls); List<wallPoint> faceDist(nPatch);
labelList changedFaces(nWalls); labelList changedFaces(nPatch);
// Set to faceDist information to facecentre on walls. // Set to faceDist information to facecentre on walls.
setChangedFaces(patchIDs_, changedFaces, faceDist); setChangedFaces(patchIDs_, changedFaces, faceDist);
//
// Do calculate wall distance by 'growing' from faces. // Do calculate wall distance by 'growing' from faces.
//
MeshWave<wallPoint> waveInfo MeshWave<wallPoint> waveInfo
( (
mesh(), mesh(),
@ -189,20 +178,13 @@ void Foam::patchWave::correct()
mesh().globalData().nTotalCells()+1 // max iterations mesh().globalData().nTotalCells()+1 // max iterations
); );
//
// Copy distance into return field // Copy distance into return field
//
nUnset_ = getValues(waveInfo); nUnset_ = getValues(waveInfo);
//
// Correct wall cells for true distance // Correct wall cells for true distance
//
if (correctWalls_) if (correctWalls_)
{ {
Map<label> nearestFace(2 * nWalls); Map<label> nearestFace(2*nPatch);
correctBoundaryFaceCells correctBoundaryFaceCells
( (

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,7 +51,7 @@ class polyMesh;
class wallPoint; class wallPoint;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class patchWave Declaration Class patchWave Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class patchWave class patchWave
@ -128,7 +128,7 @@ public:
return distance_; return distance_;
} }
//- Non const access so we can 'transfer' contents for efficiency. //- Non const access so we can 'transfer' contents for efficiency
scalarField& distance() scalarField& distance()
{ {
return distance_; return distance_;
@ -143,7 +143,6 @@ public:
{ {
return patchDistance_; return patchDistance_;
} }
}; };