From a9a592df55b236c266ba748b7558597150f3b02d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 7 Jan 2013 11:29:22 +0000
Subject: [PATCH] ENH: Updated patch/wall distance calculation
---
src/finiteVolume/fvMesh/wallDist/patchDist.C | 3 +--
src/finiteVolume/fvMesh/wallDist/patchDist.H | 4 +---
src/finiteVolume/fvMesh/wallDist/wallDist.C | 7 ++++++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDist.C b/src/finiteVolume/fvMesh/wallDist/patchDist.C
index 846cc901c2c..6855f5a1709 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDist.C
@@ -48,7 +48,6 @@ Foam::patchDist::patchDist
mesh,
dimensionedScalar("y", dimLength, GREAT)
),
- cellDistFuncs(mesh),
patchIDs_(patchIDs),
correctWalls_(correctWalls),
nUnset_(0)
@@ -68,7 +67,7 @@ Foam::patchDist::~patchDist()
void Foam::patchDist::correct()
{
// Calculate distance starting from patch faces
- patchWave wave(cellDistFuncs::mesh(), patchIDs_, correctWalls_);
+ patchWave wave(mesh(), patchIDs_, correctWalls_);
// Transfer cell values from wave into *this
transfer(wave.distance());
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDist.H b/src/finiteVolume/fvMesh/wallDist/patchDist.H
index 1cb596a538f..8c631cfe139 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDist.H
@@ -62,7 +62,6 @@ SourceFiles
#define patchDist_H
#include "volFields.H"
-#include "cellDistFuncs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -77,8 +76,7 @@ class fvMesh;
class patchDist
:
- public volScalarField,
- public cellDistFuncs
+ public volScalarField
{
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist.C
index 2f857de2fce..e089985d4d6 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.C
@@ -35,7 +35,12 @@ Foam::wallDist::wallDist
const bool correctWalls
)
:
- patchDist(mesh, getPatchIDs<wallPolyPatch>(), correctWalls)
+ patchDist
+ (
+ mesh,
+ mesh.boundaryMesh().findPatchIDs<wallPolyPatch>(),
+ correctWalls
+ )
{}
--
GitLab