Completed rename kappat->alphat for incompressible heat transfer

This commit is contained in:
Henry
2013-04-06 16:29:43 +01:00
parent 0d1dde0dea
commit 2c4d3a79c9
8 changed files with 62 additions and 146 deletions

View File

@ -49,8 +49,8 @@ kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
$(kqRWallFunctions)/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
kappatWallFunctions = $(wallFunctions)/kappatWallFunctions
$(kappatWallFunctions)/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C
alphatWallFunctions = $(wallFunctions)/alphatWallFunctions
$(alphatWallFunctions)/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
v2WallFunctions = $(wallFunctions)/v2WallFunctions
$(v2WallFunctions)/v2WallFunction/v2WallFunctionFvPatchScalarField.C

View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "kappatJayatillekeWallFunctionFvPatchScalarField.H"
#include "alphatJayatillekeWallFunctionFvPatchScalarField.H"
#include "incompressible/turbulenceModel/turbulenceModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@ -39,18 +39,18 @@ namespace incompressible
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
scalar kappatJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01;
label kappatJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10;
scalar alphatJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01;
label alphatJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10;
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void kappatJayatillekeWallFunctionFvPatchScalarField::checkType()
void alphatJayatillekeWallFunctionFvPatchScalarField::checkType()
{
if (!isA<wallFvPatch>(patch()))
{
FatalErrorIn
(
"kappatJayatillekeWallFunctionFvPatchScalarField::checkType()"
"alphatJayatillekeWallFunctionFvPatchScalarField::checkType()"
) << "Invalid wall function specification" << nl
<< " Patch type for patch " << patch().name()
<< " must be wall" << nl
@ -60,7 +60,7 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::checkType()
}
scalar kappatJayatillekeWallFunctionFvPatchScalarField::Psmooth
scalar alphatJayatillekeWallFunctionFvPatchScalarField::Psmooth
(
const scalar Prat
) const
@ -69,7 +69,7 @@ scalar kappatJayatillekeWallFunctionFvPatchScalarField::Psmooth
}
scalar kappatJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
scalar alphatJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
(
const scalar P,
const scalar Prat
@ -103,8 +103,8 @@ scalar kappatJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
kappatJayatillekeWallFunctionFvPatchScalarField::
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField::
alphatJayatillekeWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -120,10 +120,10 @@ kappatJayatillekeWallFunctionFvPatchScalarField
}
kappatJayatillekeWallFunctionFvPatchScalarField::
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField::
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField& ptf,
const alphatJayatillekeWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -139,8 +139,8 @@ kappatJayatillekeWallFunctionFvPatchScalarField
}
kappatJayatillekeWallFunctionFvPatchScalarField::
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField::
alphatJayatillekeWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -157,10 +157,10 @@ kappatJayatillekeWallFunctionFvPatchScalarField
}
kappatJayatillekeWallFunctionFvPatchScalarField::
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField::
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField& wfpsf
const alphatJayatillekeWallFunctionFvPatchScalarField& wfpsf
)
:
fixedValueFvPatchScalarField(wfpsf),
@ -173,10 +173,10 @@ kappatJayatillekeWallFunctionFvPatchScalarField
}
kappatJayatillekeWallFunctionFvPatchScalarField::
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField::
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField& wfpsf,
const alphatJayatillekeWallFunctionFvPatchScalarField& wfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -192,7 +192,7 @@ kappatJayatillekeWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
{
if (updated())
{
@ -217,8 +217,8 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
Pr(dimensionedScalar(turbModel.transport().lookup("Pr")).value());
// Populate boundary values
scalarField& kappatw = *this;
forAll(kappatw, faceI)
scalarField& alphatw = *this;
forAll(alphatw, faceI)
{
label faceCellI = patch().faceCells()[faceI];
@ -237,11 +237,11 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
{
scalar nu = nuw[faceI];
scalar kt = nu*(yPlus/(Prt_*(log(E_*yPlus)/kappa_ + P)) - 1/Pr);
kappatw[faceI] = max(0.0, kt);
alphatw[faceI] = max(0.0, kt);
}
else
{
kappatw[faceI] = 0.0;
alphatw[faceI] = 0.0;
}
}
@ -249,7 +249,7 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
}
void kappatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
@ -265,7 +265,7 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
makePatchTypeField
(
fvPatchScalarField,
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::incompressible::kappatJayatillekeWallFunctionFvPatchScalarField
Foam::incompressible::alphatJayatillekeWallFunctionFvPatchScalarField
Group
grpIcoWallFunctions
@ -45,7 +45,7 @@ Description
\verbatim
myPatch
{
type kappatJayatillekeWallFunction;
type alphatJayatillekeWallFunction;
}
\endverbatim
@ -56,12 +56,12 @@ SeeAlso
Foam::fixedValueFvPatchField
SourceFiles
kappatJayatillekeWallFunctionFvPatchScalarField.C
alphatJayatillekeWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef kappatJayatillekeWallFunctionFvPatchScalarField_H
#define kappatJayatillekeWallFunctionFvPatchScalarField_H
#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
#define alphatJayatillekeWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@ -73,10 +73,10 @@ namespace incompressible
{
/*---------------------------------------------------------------------------*\
Class kappatJayatillekeWallFunctionFvPatchScalarField Declaration
Class alphatJayatillekeWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class kappatJayatillekeWallFunctionFvPatchScalarField
class alphatJayatillekeWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -122,20 +122,20 @@ protected:
public:
//- Runtime type information
TypeName("kappatJayatillekeWallFunction");
TypeName("alphatJayatillekeWallFunction");
// Constructors
//- Construct from patch and internal field
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -143,20 +143,20 @@ public:
);
//- Construct by mapping given
// kappatJayatillekeWallFunctionFvPatchScalarField
// alphatJayatillekeWallFunctionFvPatchScalarField
// onto a new patch
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField&,
const alphatJayatillekeWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField&
const alphatJayatillekeWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
@ -164,14 +164,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new kappatJayatillekeWallFunctionFvPatchScalarField(*this)
new alphatJayatillekeWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
kappatJayatillekeWallFunctionFvPatchScalarField
alphatJayatillekeWallFunctionFvPatchScalarField
(
const kappatJayatillekeWallFunctionFvPatchScalarField&,
const alphatJayatillekeWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -183,7 +183,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new kappatJayatillekeWallFunctionFvPatchScalarField(*this, iF)
new alphatJayatillekeWallFunctionFvPatchScalarField(*this, iF)
);
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
@ -23,17 +23,20 @@ boundaryField
{
floor
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}

View File

@ -1,45 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
floor
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}
// ************************************************************************* //

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
@ -23,17 +23,20 @@ boundaryField
{
floor
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}

View File

@ -1,45 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
floor
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}
// ************************************************************************* //