exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed isA<wallPolyPatch> & isA<wallFvPatch> almost everywhere

Browse source
This commit is contained in:
Henrik Rusche 2011-01-14 15:47:57 +01:00
parent 0c45c49599
commit 04f39480cb
41 changed files with 51 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
View file

@ -35,7 +35,6 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "hCombustionThermo.H" #include "hCombustionThermo.H"
#include "RASModel.H" #include "RASModel.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -64,7 +63,7 @@ int main(int argc, char *argv[])
Info<< "\nWall heat fluxes [W]" << endl; Info<< "\nWall heat fluxes [W]" << endl;
forAll(patchHeatFlux, patchi) forAll(patchHeatFlux, patchi)
{ {
if (isA<wallFvPatch>(mesh.boundary()[patchi])) if (mesh.boundary()[patchi].isWall())
{ {
Info<< mesh.boundary()[patchi].name() Info<< mesh.boundary()[patchi].name()
<< " " << " "

2
applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
View file

@ -109,7 +109,7 @@ int main(int argc, char *argv[])
{ {
const fvPatch& currPatch = patches[patchi]; const fvPatch& currPatch = patches[patchi];
if (isA<wallFvPatch>(currPatch)) if (currPatch.isWall())
{ {
yPlus.boundaryField()[patchi] = yPlus.boundaryField()[patchi] =
d[patchi] d[patchi]

4
applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
View file

@ -39,8 +39,6 @@ Description
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H" #include "surfaceFields.H"
#include "wallPolyPatch.H"
#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H" #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H"
#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H" #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H"
#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H" #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H"
@ -203,7 +201,7 @@ void replaceBoundaryType
dictionary& boundaryDict = dict.subDict("boundaryField"); dictionary& boundaryDict = dict.subDict("boundaryField");
forAll(bMesh, patchI) forAll(bMesh, patchI)
{ {
if (isA<wallPolyPatch>(bMesh[patchI])) if (bMesh[patchI].isWall())
{ {
word patchName = bMesh[patchI].name(); word patchName = bMesh[patchI].name();
dictionary& oldPatch = boundaryDict.subDict(patchName); dictionary& oldPatch = boundaryDict.subDict(patchName);

3
src/finiteVolume/fvMesh/wallDist/nearWallDist.C
View file

@ -27,7 +27,6 @@ License
#include "nearWallDist.H" #include "nearWallDist.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "cellDistFuncs.H" #include "cellDistFuncs.H"
#include "wallFvPatch.H"
#include "surfaceFields.H" #include "surfaceFields.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -65,8 +64,6 @@ void Foam::nearWallDist::doAll()
const fvPatch& patch = mesh_.boundary()[patchI]; const fvPatch& patch = mesh_.boundary()[patchI];
// AJ: Allow other patch types to be seen as a wall type
// if (isA<wallFvPatch>(patch))
if (patch.isWall()) if (patch.isWall())
{ {
const polyPatch& pPatch = patch.patch(); const polyPatch& pPatch = patch.patch();

3
src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
View file

@ -27,7 +27,6 @@ License
#include "nearWallDistNoSearch.H" #include "nearWallDistNoSearch.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "wallPoint.H" #include "wallPoint.H"
#include "wallFvPatch.H"
#include "surfaceFields.H" #include "surfaceFields.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -41,7 +40,7 @@ void Foam::nearWallDistNoSearch::doAll()
{ {
fvPatchScalarField& ypatch = operator[](patchI); fvPatchScalarField& ypatch = operator[](patchI);
if (isA<wallFvPatch>(patches[patchI])) if (patches[patchI].isWall())
{ {
const unallocLabelList& faceCells = patches[patchI].faceCells(); const unallocLabelList& faceCells = patches[patchI].faceCells();

3
src/finiteVolume/fvMesh/wallDist/reflectionVectors.C
View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "reflectionVectors.H" #include "reflectionVectors.H"
#include "wallFvPatch.H"
#include "surfaceFields.H" #include "surfaceFields.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -60,7 +59,7 @@ void Foam::reflectionVectors::correct()
forAll(patches, patchi) forAll(patches, patchi)
{ {
// find the nearest face for every cell // find the nearest face for every cell
if (isA<wallFvPatch>(patches[patchi])) if (patches[patchi].isWall())
{ {
n_.boundaryField()[patchi] = n_.boundaryField()[patchi] =
mesh.Sf().boundaryField()[patchi] mesh.Sf().boundaryField()[patchi]

3
src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellPointWeightWallModified.H" #include "cellPointWeightWallModified.H"
#include "wallPolyPatch.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "polyBoundaryMesh.H" #include "polyBoundaryMesh.H"
@ -51,7 +50,7 @@ Foam::cellPointWeightWallModified::cellPointWeightWallModified
label patchI = bm.whichPatch(faceIndex); label patchI = bm.whichPatch(faceIndex);
if (patchI != -1) if (patchI != -1)
{ {
if (isA<wallPolyPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
// Apply cell centre value wall faces // Apply cell centre value wall faces
weights_[0] = 0.0; weights_[0] = 0.0;

2
src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
View file

@ -1,4 +1,4 @@
if (isA<wallPolyPatch>(pbMesh[patch(face())])) if (pbMesh[patch(face())].isWall())
{ {
keepParcel = sDB.wall().wallTreatment(*this, face()); keepParcel = sDB.wall().wallTreatment(*this, face());

3
src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
View file

@ -26,7 +26,6 @@ License
#include "reflectParcel.H" #include "reflectParcel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -82,7 +81,7 @@ bool reflectParcel::wallTreatment
const polyMesh& mesh = spray_.mesh(); const polyMesh& mesh = spray_.mesh();
if (isA<wallPolyPatch>(mesh_.boundaryMesh()[patchi])) if (mesh_.boundaryMesh()[patchi].isWall())
{ {
// wallNormal defined to point outwards of domain // wallNormal defined to point outwards of domain
vector Sf = mesh_.Sf().boundaryField()[patchi][facei]; vector Sf = mesh_.Sf().boundaryField()[patchi][facei];

2
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
View file

@ -81,7 +81,7 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
{ {
if if
( (
isA<wallPolyPatch>(bMesh[patchI]) bMesh[patchI].isWall()
&& applyToPatch(bMesh[patchI].index()) < 0 && applyToPatch(bMesh[patchI].index()) < 0
) )
{ {

2
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
View file

@ -102,7 +102,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
vector& U vector& U
) const ) const
{ {
if (isA<wallPolyPatch>(pp)) if (pp.isWall())
{ {
switch (interactionType_) switch (interactionType_)
{ {

2
src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
View file

@ -220,7 +220,7 @@ void Foam::dsmcFields::write()
{ {
const polyPatch& patch = mesh.boundaryMesh()[i]; const polyPatch& patch = mesh.boundaryMesh()[i];
if (isA<wallPolyPatch>(patch)) if (patch.isWall())
{ {
p.boundaryField()[i] = p.boundaryField()[i] =
fDMean.boundaryField()[i] fDMean.boundaryField()[i]

3
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,7 +49,7 @@ label alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10;
void alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType() void alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn FatalErrorIn
( (

3
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace LESModels
void alphaSgsWallFunctionFvPatchScalarField::checkType() void alphaSgsWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn FatalErrorIn
( (

3
src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
View file

@ -26,7 +26,6 @@ License
#include "vanDriestDelta.H" #include "vanDriestDelta.H"
#include "LESModel.H" #include "LESModel.H"
#include "wallFvPatch.H"
#include "wallDistData.H" #include "wallDistData.H"
#include "wallPointYPlus.H" #include "wallPointYPlus.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -71,7 +70,7 @@ void vanDriestDelta::calcDelta()
const fvPatchList& patches = mesh_.boundary(); const fvPatchList& patches = mesh_.boundary();
forAll(patches, patchi) forAll(patches, patchi)
{ {
if (isA<wallFvPatch>(patches[patchi])) if (patches[patchi].isWall())
{ {
const fvPatchVectorField& Uw = U.boundaryField()[patchi]; const fvPatchVectorField& Uw = U.boundaryField()[patchi];
const scalarField& rhow = rho.boundaryField()[patchi]; const scalarField& rhow = rho.boundaryField()[patchi];

5
src/turbulenceModels/compressible/RAS/LRR/LRR.C
View file

@ -26,7 +26,6 @@ License
#include "LRR.H" #include "LRR.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H" #include "backwardsCompatibilityWallFunctions.H"
@ -370,7 +369,7 @@ void LRR::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -432,7 +431,7 @@ void LRR::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
symmTensorField& Rw = R_.boundaryField()[patchi]; symmTensorField& Rw = R_.boundaryField()[patchi];

5
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file

@ -26,7 +26,6 @@ License
#include "LaunderGibsonRSTM.H" #include "LaunderGibsonRSTM.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H" #include "backwardsCompatibilityWallFunctions.H"
@ -408,7 +407,7 @@ void LaunderGibsonRSTM::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -478,7 +477,7 @@ void LaunderGibsonRSTM::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
symmTensorField& Rw = R_.boundaryField()[patchi]; symmTensorField& Rw = R_.boundaryField()[patchi];

3
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "RASModel.H" #include "RASModel.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -174,7 +173,7 @@ tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
tmp<scalarField> tYp(new scalarField(curPatch.size())); tmp<scalarField> tYp(new scalarField(curPatch.size()));
scalarField& Yp = tYp(); scalarField& Yp = tYp();
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
Yp = pow(Cmu, 0.25) Yp = pow(Cmu, 0.25)
*y_[patchNo] *y_[patchNo]

6
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View file

@ -74,7 +74,7 @@ tmp<volScalarField> autoCreateAlphat
forAll(bm, patchI) forAll(bm, patchI)
{ {
if (isA<wallFvPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
alphatBoundaryTypes[patchI] = alphatBoundaryTypes[patchI] =
RASModels::alphatWallFunctionFvPatchScalarField::typeName; RASModels::alphatWallFunctionFvPatchScalarField::typeName;
@ -144,7 +144,7 @@ tmp<volScalarField> autoCreateMut
forAll(bm, patchI) forAll(bm, patchI)
{ {
if (isA<wallFvPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
mutBoundaryTypes[patchI] = mutBoundaryTypes[patchI] =
RASModels::mutWallFunctionFvPatchScalarField::typeName; RASModels::mutWallFunctionFvPatchScalarField::typeName;
@ -214,7 +214,7 @@ tmp<volScalarField> autoCreateLowReMut
forAll(bm, patchI) forAll(bm, patchI)
{ {
if (isA<wallFvPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
mutBoundaryTypes[patchI] = mutBoundaryTypes[patchI] =
RASModels::mutLowReWallFunctionFvPatchScalarField::typeName; RASModels::mutLowReWallFunctionFvPatchScalarField::typeName;

4
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
View file

@ -28,8 +28,6 @@ License
#include "Time.H" #include "Time.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -111,7 +109,7 @@ autoCreateWallFunctionField
forAll(newPatchFields, patchI) forAll(newPatchFields, patchI)
{ {
if (isA<wallFvPatch>(mesh.boundary()[patchI])) if (mesh.boundary()[patchI].isWall())
{ {
newPatchFields.set newPatchFields.set
( (

3
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void epsilonWallFunctionFvPatchScalarField::checkType() void epsilonWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

2
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
View file

@ -43,7 +43,7 @@ namespace RASModels
template<class Type> template<class Type>
void kqRWallFunctionFvPatchField<Type>::checkType() void kqRWallFunctionFvPatchField<Type>::checkType()
{ {
if (!isA<wallFvPatch>(this->patch())) if (!this->patch().isWall())
{ {
FatalErrorIn("kqRWallFunctionFvPatchField::checkType()") FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
View file

@ -28,7 +28,6 @@ License
#include "RASModel.H" #include "RASModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void mutWallFunctionFvPatchScalarField::checkType() void mutWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
View file

@ -28,7 +28,6 @@ License
#include "RASModel.H" #include "RASModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void mutkWallFunctionFvPatchScalarField::checkType() void mutkWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void omegaWallFunctionFvPatchScalarField::checkType() void omegaWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
View file

@ -26,7 +26,6 @@ License
#include "vanDriestDelta.H" #include "vanDriestDelta.H"
#include "LESModel.H" #include "LESModel.H"
#include "wallFvPatch.H"
#include "wallDistData.H" #include "wallDistData.H"
#include "wallPointYPlus.H" #include "wallPointYPlus.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -70,7 +69,7 @@ void vanDriestDelta::calcDelta()
const fvPatchList& patches = mesh_.boundary(); const fvPatchList& patches = mesh_.boundary();
forAll(patches, patchi) forAll(patches, patchi)
{ {
if (isA<wallFvPatch>(patches[patchi])) if (patches[patchi].isWall())
{ {
const fvPatchVectorField& Uw = U.boundaryField()[patchi]; const fvPatchVectorField& Uw = U.boundaryField()[patchi];
const scalarField& nuw = nu.boundaryField()[patchi]; const scalarField& nuw = nu.boundaryField()[patchi];

5
src/turbulenceModels/incompressible/RAS/LRR/LRR.C
View file

@ -26,7 +26,6 @@ License
#include "LRR.H" #include "LRR.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H" #include "backwardsCompatibilityWallFunctions.H"
@ -331,7 +330,7 @@ void LRR::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -390,7 +389,7 @@ void LRR::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
symmTensorField& Rw = R_.boundaryField()[patchi]; symmTensorField& Rw = R_.boundaryField()[patchi];

5
src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file

@ -26,7 +26,6 @@ License
#include "LaunderGibsonRSTM.H" #include "LaunderGibsonRSTM.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H" #include "backwardsCompatibilityWallFunctions.H"
@ -372,7 +371,7 @@ void LaunderGibsonRSTM::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -440,7 +439,7 @@ void LaunderGibsonRSTM::correct()
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
symmTensorField& Rw = R_.boundaryField()[patchi]; symmTensorField& Rw = R_.boundaryField()[patchi];

6
src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
View file

@ -14,7 +14,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -29,7 +29,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -58,7 +58,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {

6
src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
View file

@ -14,7 +14,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -29,7 +29,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -58,7 +58,7 @@
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {

3
src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "RASModel.H" #include "RASModel.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -169,7 +168,7 @@ tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
tmp<scalarField> tYp(new scalarField(curPatch.size())); tmp<scalarField> tYp(new scalarField(curPatch.size()));
scalarField& Yp = tYp(); scalarField& Yp = tYp();
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
Yp = pow(Cmu, 0.25) Yp = pow(Cmu, 0.25)
*y_[patchNo] *y_[patchNo]

4
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View file

@ -73,7 +73,7 @@ tmp<volScalarField> autoCreateNut
forAll(bm, patchI) forAll(bm, patchI)
{ {
if (isA<wallFvPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
nutBoundaryTypes[patchI] = nutBoundaryTypes[patchI] =
RASModels::nutWallFunctionFvPatchScalarField::typeName; RASModels::nutWallFunctionFvPatchScalarField::typeName;
@ -143,7 +143,7 @@ tmp<volScalarField> autoCreateLowReNut
forAll(bm, patchI) forAll(bm, patchI)
{ {
if (isA<wallFvPatch>(bm[patchI])) if (bm[patchI].isWall())
{ {
nutBoundaryTypes[patchI] = nutBoundaryTypes[patchI] =
RASModels::nutLowReWallFunctionFvPatchScalarField::typeName; RASModels::nutLowReWallFunctionFvPatchScalarField::typeName;

4
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
View file

@ -28,8 +28,6 @@ License
#include "Time.H" #include "Time.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -111,7 +109,7 @@ autoCreateWallFunctionField
forAll(newPatchFields, patchI) forAll(newPatchFields, patchI)
{ {
if (isA<wallFvPatch>(mesh.boundary()[patchI])) if (mesh.boundary()[patchI].isWall())
{ {
newPatchFields.set newPatchFields.set
( (

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,8 +43,6 @@ namespace RASModels
void epsilonWallFunctionFvPatchScalarField::checkType() void epsilonWallFunctionFvPatchScalarField::checkType()
{ {
// AJ: Allow other patch types to be seen as wall type
// if (!isA<wallFvPatch>(patch()))
if (!this->patch().isWall()) if (!this->patch().isWall())
{ {
FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")

4
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
View file

@ -28,8 +28,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
#include "regionCoupleFvPatch.H"
#include "movingWallVelocityFvPatchVectorField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -45,8 +43,6 @@ namespace RASModels
template<class Type> template<class Type>
void kqRWallFunctionFvPatchField<Type>::checkType() void kqRWallFunctionFvPatchField<Type>::checkType()
{ {
// AJ: Allow other patch types to be seemovingWalln as wall type
// if (!isA<wallFvPatch>(this->patch()))
if (!this->patch().isWall()) if (!this->patch().isWall())
{ {
FatalErrorIn("kqRWallFunctionFvPatchField::checkType()") FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
View file

@ -28,7 +28,6 @@ License
#include "RASModel.H" #include "RASModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void nutWallFunctionFvPatchScalarField::checkType() void nutWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
View file

@ -28,7 +28,6 @@ License
#include "RASModel.H" #include "RASModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void nutkWallFunctionFvPatchScalarField::checkType() void nutkWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View file

@ -29,7 +29,6 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +43,7 @@ namespace RASModels
void omegaWallFunctionFvPatchScalarField::checkType() void omegaWallFunctionFvPatchScalarField::checkType()
{ {
if (!isA<wallFvPatch>(patch())) if (!patch().isWall())
{ {
FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()") FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
<< "Invalid wall function specification" << nl << "Invalid wall function specification" << nl

6
src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
View file

@ -43,7 +43,7 @@ Description
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {
@ -61,7 +61,7 @@ Description
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
#include "checkPatchFieldTypes.H" #include "checkPatchFieldTypes.H"
@ -112,7 +112,7 @@ Description
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
forAll(curPatch, facei) forAll(curPatch, facei)
{ {

2
src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
View file

@ -37,7 +37,7 @@ Description
{ {
const fvPatch& p = patches[patchi]; const fvPatch& p = patches[patchi];
if (isA<wallFvPatch>(p)) if (p.isWall())
{ {
epsEqn().setValues epsEqn().setValues
( (

2
src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
View file

@ -39,7 +39,7 @@ Description
{ {
const fvPatch& curPatch = patches[patchi]; const fvPatch& curPatch = patches[patchi];
if (isA<wallFvPatch>(curPatch)) if (curPatch.isWall())
{ {
const scalarField& nuw = nu().boundaryField()[patchi]; const scalarField& nuw = nu().boundaryField()[patchi];
scalarField& nutw = nut_.boundaryField()[patchi]; scalarField& nutw = nut_.boundaryField()[patchi];