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

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

View file

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

View file

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

View file

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

View file

@ -27,7 +27,6 @@ License
#include "nearWallDist.H"
#include "fvMesh.H"
#include "cellDistFuncs.H"
#include "wallFvPatch.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -65,8 +64,6 @@ void Foam::nearWallDist::doAll()
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())
{
const polyPatch& pPatch = patch.patch();

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/
#include "RASModel.H"
#include "wallFvPatch.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()));
scalarField& Yp = tYp();
if (isA<wallFvPatch>(curPatch))
if (curPatch.isWall())
{
Yp = pow(Cmu, 0.25)
*y_[patchNo]

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/
#include "RASModel.H"
#include "wallFvPatch.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()));
scalarField& Yp = tYp();
if (isA<wallFvPatch>(curPatch))
if (curPatch.isWall())
{
Yp = pow(Cmu, 0.25)
*y_[patchNo]

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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