Refactoring of nut wall function BCs
- names updated to reflect what they are based on, e.g. either k or U
This commit is contained in:
andy
parent
827f834a93
commit
d320fab4ab
@ -21,11 +21,11 @@ LamBremhorstKE/LamBremhorstKE.C
|
||||
wallFunctions = derivedFvPatchFields/wallFunctions
|
||||
|
||||
nutWallFunctions = $(wallFunctions)/nutWallFunctions
|
||||
$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
|
||||
$(nutWallFunctions)/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
|
||||
|
||||
epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
|
||||
$(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "backwardsCompatibilityWallFunctions.H"
|
||||
|
||||
#include "calculatedFvPatchField.H"
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
#include "epsilonWallFunctionFvPatchScalarField.H"
|
||||
#include "kqRWallFunctionFvPatchField.H"
|
||||
#include "omegaWallFunctionFvPatchScalarField.H"
|
||||
@ -75,7 +75,7 @@ tmp<volScalarField> autoCreateNut
|
||||
if (isType<wallFvPatch>(bm[patchI]))
|
||||
{
|
||||
nutBoundaryTypes[patchI] =
|
||||
RASModels::nutWallFunctionFvPatchScalarField::typeName;
|
||||
RASModels::nutkWallFunctionFvPatchScalarField::typeName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
|
||||
#include "nutURoughWallFunctionFvPatchScalarField.H"
|
||||
#include "RASModel.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
@ -41,8 +41,7 @@ namespace RASModels
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -73,8 +72,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
|
||||
tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
|
||||
(
|
||||
const scalarField& magUp
|
||||
) const
|
||||
@ -120,8 +118,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
|
||||
dKsPlusdYPlus = 1;
|
||||
}
|
||||
|
||||
// Additional tuning parameter (fudge factor) - nominally = 1
|
||||
dKsPlusdYPlus *= roughnessFudgeFactor_;
|
||||
// Additional tuning parameter - nominally = 1
|
||||
dKsPlusdYPlus *= roughnessFactor_;
|
||||
|
||||
do
|
||||
{
|
||||
@ -200,82 +198,76 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF),
|
||||
nutkWallFunctionFvPatchScalarField(p, iF),
|
||||
roughnessHeight_(pTraits<scalar>::zero),
|
||||
roughnessConstant_(pTraits<scalar>::zero),
|
||||
roughnessFudgeFactor_(pTraits<scalar>::zero)
|
||||
roughnessFactor_(pTraits<scalar>::zero)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf,
|
||||
const nutURoughWallFunctionFvPatchScalarField& ptf,
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const fvPatchFieldMapper& mapper
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
|
||||
nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
|
||||
roughnessHeight_(ptf.roughnessHeight_),
|
||||
roughnessConstant_(ptf.roughnessConstant_),
|
||||
roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
|
||||
roughnessFactor_(ptf.roughnessFactor_)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF, dict),
|
||||
nutkWallFunctionFvPatchScalarField(p, iF, dict),
|
||||
roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
|
||||
roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
|
||||
roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
|
||||
roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
|
||||
const nutURoughWallFunctionFvPatchScalarField& rwfpsf
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(rwfpsf),
|
||||
nutkWallFunctionFvPatchScalarField(rwfpsf),
|
||||
roughnessHeight_(rwfpsf.roughnessHeight_),
|
||||
roughnessConstant_(rwfpsf.roughnessConstant_),
|
||||
roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
|
||||
roughnessFactor_(rwfpsf.roughnessFactor_)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
|
||||
const nutURoughWallFunctionFvPatchScalarField& rwfpsf,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(rwfpsf, iF),
|
||||
nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
|
||||
roughnessHeight_(rwfpsf.roughnessHeight_),
|
||||
roughnessConstant_(rwfpsf.roughnessConstant_),
|
||||
roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
|
||||
roughnessFactor_(rwfpsf.roughnessFactor_)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
|
||||
tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::yPlus() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -287,10 +279,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
|
||||
}
|
||||
|
||||
|
||||
void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
|
||||
(
|
||||
Ostream& os
|
||||
) const
|
||||
void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
{
|
||||
fvPatchField<scalar>::write(os);
|
||||
writeLocalEntries(os);
|
||||
@ -298,8 +287,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
|
||||
<< roughnessHeight_ << token::END_STATEMENT << nl;
|
||||
os.writeKeyword("roughnessConstant")
|
||||
<< roughnessConstant_ << token::END_STATEMENT << nl;
|
||||
os.writeKeyword("roughnessFudgeFactor")
|
||||
<< roughnessFudgeFactor_ << token::END_STATEMENT << nl;
|
||||
os.writeKeyword("roughnessFactor")
|
||||
<< roughnessFactor_ << token::END_STATEMENT << nl;
|
||||
writeEntry("value", os);
|
||||
}
|
||||
|
||||
@ -309,7 +298,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
|
||||
makePatchTypeField
|
||||
(
|
||||
fvPatchScalarField,
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -23,21 +23,20 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::incompressible::RASModels::
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
Foam::incompressible::RASModels::nutURoughWallFunctionFvPatchScalarField
|
||||
|
||||
Description
|
||||
Wall function boundary condition for rough walls
|
||||
Wall function boundary condition for rough walls, based on velocity.
|
||||
|
||||
SourceFiles
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
|
||||
#define nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
|
||||
#ifndef nutURoughWallFunctionFvPatchScalarField_H
|
||||
#define nutURoughWallFunctionFvPatchScalarField_H
|
||||
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -49,12 +48,12 @@ namespace RASModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration
|
||||
Class nutURoughWallFunctionFvPatchScalarField Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
class nutURoughWallFunctionFvPatchScalarField
|
||||
:
|
||||
public nutWallFunctionFvPatchScalarField
|
||||
public nutkWallFunctionFvPatchScalarField
|
||||
{
|
||||
// Private data
|
||||
|
||||
@ -67,7 +66,7 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
scalar roughnessConstant_;
|
||||
|
||||
//- Scale factor
|
||||
scalar roughnessFudgeFactor_;
|
||||
scalar roughnessFactor_;
|
||||
|
||||
|
||||
// Protected member functions
|
||||
@ -82,20 +81,20 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("nutSpalartAllmarasStandardRoughWallFunction");
|
||||
TypeName("nutURoughWallFunction");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from patch and internal field
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
//- Construct from patch, internal field and dictionary
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
@ -103,20 +102,20 @@ public:
|
||||
);
|
||||
|
||||
//- Construct by mapping given
|
||||
// nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
// nutURoughWallFunctionFvPatchScalarField
|
||||
// onto a new patch
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
|
||||
const nutURoughWallFunctionFvPatchScalarField&,
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
const fvPatchFieldMapper&
|
||||
);
|
||||
|
||||
//- Construct as copy
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&
|
||||
const nutURoughWallFunctionFvPatchScalarField&
|
||||
);
|
||||
|
||||
//- Construct and return a clone
|
||||
@ -124,17 +123,14 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
*this
|
||||
)
|
||||
new nutURoughWallFunctionFvPatchScalarField(*this)
|
||||
);
|
||||
}
|
||||
|
||||
//- Construct as copy setting internal field reference
|
||||
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
nutURoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
|
||||
const nutURoughWallFunctionFvPatchScalarField&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
@ -146,11 +142,7 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
*this,
|
||||
iF
|
||||
)
|
||||
new nutURoughWallFunctionFvPatchScalarField(*this, iF)
|
||||
);
|
||||
}
|
||||
|
||||
@ -185,16 +177,16 @@ public:
|
||||
}
|
||||
|
||||
//- Return the roughness scale factor
|
||||
const scalar& roughnessFudgeFactor() const
|
||||
const scalar& roughnessFactor() const
|
||||
{
|
||||
return roughnessFudgeFactor_;
|
||||
return roughnessFactor_;
|
||||
}
|
||||
|
||||
//- Return reference to the roughness scale factor to allow
|
||||
// adjustment
|
||||
scalar& roughnessFudgeFactor()
|
||||
scalar& roughnessFactor()
|
||||
{
|
||||
return roughnessFudgeFactor_;
|
||||
return roughnessFactor_;
|
||||
}
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H"
|
||||
#include "nutUSpaldingWallFunctionFvPatchScalarField.H"
|
||||
#include "RASModel.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
@ -41,8 +41,7 @@ namespace RASModels
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const
|
||||
tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -55,7 +54,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
|
||||
tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcUTau
|
||||
(
|
||||
const scalarField& magGradU
|
||||
) const
|
||||
@ -114,67 +113,66 @@ tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField::
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF)
|
||||
nutkWallFunctionFvPatchScalarField(p, iF)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField::
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField& ptf,
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const fvPatchFieldMapper& mapper
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
|
||||
nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField::
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF, dict)
|
||||
nutkWallFunctionFvPatchScalarField(p, iF, dict)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField::
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(wfpsf)
|
||||
nutkWallFunctionFvPatchScalarField(wfpsf)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField::
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(wfpsf, iF)
|
||||
nutkWallFunctionFvPatchScalarField(wfpsf, iF)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
|
||||
tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -187,10 +185,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
|
||||
}
|
||||
|
||||
|
||||
void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
|
||||
(
|
||||
Ostream& os
|
||||
) const
|
||||
void nutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
{
|
||||
fvPatchField<scalar>::write(os);
|
||||
writeLocalEntries(os);
|
||||
@ -203,7 +198,7 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
|
||||
makePatchTypeField
|
||||
(
|
||||
fvPatchScalarField,
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -23,21 +23,21 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::incompressible::RASModels::
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
Foam::incompressible::RASModels::nutUSpaldingWallFunctionFvPatchScalarField
|
||||
|
||||
Description
|
||||
Wall function boundary condition for walls
|
||||
Wall function boundary condition for walls, based on velocity, using
|
||||
Spaldings law to give a continuous nut profile to the wall (y+ = 0)
|
||||
|
||||
SourceFiles
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField.C
|
||||
nutUSpaldingWallFunctionFvPatchScalarField.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef nutSpalartAllmarasWallFunctionFvPatchScalarField_H
|
||||
#define nutSpalartAllmarasWallFunctionFvPatchScalarField_H
|
||||
#ifndef nutUSpaldingWallFunctionFvPatchScalarField_H
|
||||
#define nutUSpaldingWallFunctionFvPatchScalarField_H
|
||||
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -49,12 +49,12 @@ namespace RASModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class nutSpalartAllmarasWallFunctionFvPatch Declaration
|
||||
Class nutUSpaldingWallFunctionFvPatch Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
class nutUSpaldingWallFunctionFvPatchScalarField
|
||||
:
|
||||
public nutWallFunctionFvPatchScalarField
|
||||
public nutkWallFunctionFvPatchScalarField
|
||||
{
|
||||
protected:
|
||||
|
||||
@ -70,20 +70,20 @@ protected:
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("nutSpalartAllmarasWallFunction");
|
||||
TypeName("nutUSpaldingWallFunction");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from patch and internal field
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
//- Construct from patch, internal field and dictionary
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
@ -91,20 +91,20 @@ public:
|
||||
);
|
||||
|
||||
//- Construct by mapping given
|
||||
// nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
// nutUSpaldingWallFunctionFvPatchScalarField
|
||||
// onto a new patch
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField&,
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
const fvPatchFieldMapper&
|
||||
);
|
||||
|
||||
//- Construct as copy
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField&
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField&
|
||||
);
|
||||
|
||||
//- Construct and return a clone
|
||||
@ -112,14 +112,14 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this)
|
||||
new nutUSpaldingWallFunctionFvPatchScalarField(*this)
|
||||
);
|
||||
}
|
||||
|
||||
//- Construct as copy setting internal field reference
|
||||
nutSpalartAllmarasWallFunctionFvPatchScalarField
|
||||
nutUSpaldingWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
|
||||
const nutUSpaldingWallFunctionFvPatchScalarField&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
@ -131,7 +131,7 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF)
|
||||
new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
|
||||
);
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H"
|
||||
#include "nutUWallFunctionFvPatchScalarField.H"
|
||||
#include "RASModel.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
@ -41,8 +41,7 @@ namespace RASModels
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const
|
||||
tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -70,8 +69,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
|
||||
tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
|
||||
(
|
||||
const scalarField& magUp
|
||||
) const
|
||||
@ -111,67 +109,61 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF)
|
||||
nutkWallFunctionFvPatchScalarField(p, iF)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf,
|
||||
const nutUWallFunctionFvPatchScalarField& ptf,
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const fvPatchFieldMapper& mapper
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
|
||||
nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF, dict)
|
||||
nutkWallFunctionFvPatchScalarField(p, iF, dict)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
|
||||
const nutUWallFunctionFvPatchScalarField& sawfpsf
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(sawfpsf)
|
||||
nutkWallFunctionFvPatchScalarField(sawfpsf)
|
||||
{}
|
||||
|
||||
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
|
||||
const nutUWallFunctionFvPatchScalarField& sawfpsf,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(sawfpsf, iF)
|
||||
nutkWallFunctionFvPatchScalarField(sawfpsf, iF)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
tmp<scalarField>
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
|
||||
tmp<scalarField> nutUWallFunctionFvPatchScalarField::yPlus() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
|
||||
@ -182,10 +174,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
|
||||
}
|
||||
|
||||
|
||||
void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
|
||||
(
|
||||
Ostream& os
|
||||
) const
|
||||
void nutUWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
{
|
||||
fvPatchField<scalar>::write(os);
|
||||
writeLocalEntries(os);
|
||||
@ -198,7 +187,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
|
||||
makePatchTypeField
|
||||
(
|
||||
fvPatchScalarField,
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -23,21 +23,20 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::incompressible::RASModels::
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
Foam::incompressible::RASModels::nutUWallFunctionFvPatchScalarField
|
||||
|
||||
Description
|
||||
Wall function boundary condition for walls
|
||||
Wall function boundary condition for walls, based on velocity.
|
||||
|
||||
SourceFiles
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
|
||||
nutUWallFunctionFvPatchScalarField.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
|
||||
#define nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
|
||||
#ifndef nutUWallFunctionFvPatchScalarField_H
|
||||
#define nutUWallFunctionFvPatchScalarField_H
|
||||
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -49,12 +48,12 @@ namespace RASModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration
|
||||
Class nutUWallFunctionFvPatchScalarField Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
class nutUWallFunctionFvPatchScalarField
|
||||
:
|
||||
public nutWallFunctionFvPatchScalarField
|
||||
public nutkWallFunctionFvPatchScalarField
|
||||
{
|
||||
protected:
|
||||
|
||||
@ -70,20 +69,20 @@ protected:
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("nutSpalartAllmarasStandardWallFunction");
|
||||
TypeName("nutUWallFunction");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from patch and internal field
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
//- Construct from patch, internal field and dictionary
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
@ -91,20 +90,20 @@ public:
|
||||
);
|
||||
|
||||
//- Construct by mapping given
|
||||
// nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
// nutUWallFunctionFvPatchScalarField
|
||||
// onto a new patch
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
|
||||
const nutUWallFunctionFvPatchScalarField&,
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
const fvPatchFieldMapper&
|
||||
);
|
||||
|
||||
//- Construct as copy
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&
|
||||
const nutUWallFunctionFvPatchScalarField&
|
||||
);
|
||||
|
||||
//- Construct and return a clone
|
||||
@ -112,17 +111,14 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
(
|
||||
*this
|
||||
)
|
||||
new nutUWallFunctionFvPatchScalarField(*this)
|
||||
);
|
||||
}
|
||||
|
||||
//- Construct as copy setting internal field reference
|
||||
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
nutUWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
|
||||
const nutUWallFunctionFvPatchScalarField&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
@ -134,11 +130,7 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
|
||||
(
|
||||
*this,
|
||||
iF
|
||||
)
|
||||
new nutUWallFunctionFvPatchScalarField(*this, iF)
|
||||
);
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "nutRoughWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkRoughWallFunctionFvPatchScalarField.H"
|
||||
#include "RASModel.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
@ -41,7 +41,7 @@ namespace RASModels
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
scalar nutRoughWallFunctionFvPatchScalarField::fnRough
|
||||
scalar nutkRoughWallFunctionFvPatchScalarField::fnRough
|
||||
(
|
||||
const scalar KsPlus,
|
||||
const scalar Cs
|
||||
@ -64,7 +64,7 @@ scalar nutRoughWallFunctionFvPatchScalarField::fnRough
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField> nutRoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -128,63 +128,63 @@ tmp<scalarField> nutRoughWallFunctionFvPatchScalarField::calcNut() const
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF),
|
||||
nutkWallFunctionFvPatchScalarField(p, iF),
|
||||
Ks_(p.size(), 0.0),
|
||||
Cs_(p.size(), 0.0)
|
||||
{}
|
||||
|
||||
|
||||
nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField& ptf,
|
||||
const nutkRoughWallFunctionFvPatchScalarField& ptf,
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const fvPatchFieldMapper& mapper
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
|
||||
nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
|
||||
Ks_(ptf.Ks_, mapper),
|
||||
Cs_(ptf.Cs_, mapper)
|
||||
{}
|
||||
|
||||
|
||||
nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(p, iF, dict),
|
||||
nutkWallFunctionFvPatchScalarField(p, iF, dict),
|
||||
Ks_("Ks", dict, p.size()),
|
||||
Cs_("Cs", dict, p.size())
|
||||
{}
|
||||
|
||||
|
||||
nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField& rwfpsf
|
||||
const nutkRoughWallFunctionFvPatchScalarField& rwfpsf
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(rwfpsf),
|
||||
nutkWallFunctionFvPatchScalarField(rwfpsf),
|
||||
Ks_(rwfpsf.Ks_),
|
||||
Cs_(rwfpsf.Cs_)
|
||||
{}
|
||||
|
||||
|
||||
nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField& rwfpsf,
|
||||
const nutkRoughWallFunctionFvPatchScalarField& rwfpsf,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
nutWallFunctionFvPatchScalarField(rwfpsf, iF),
|
||||
nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
|
||||
Ks_(rwfpsf.Ks_),
|
||||
Cs_(rwfpsf.Cs_)
|
||||
{}
|
||||
@ -192,34 +192,34 @@ nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
void nutRoughWallFunctionFvPatchScalarField::autoMap
|
||||
void nutkRoughWallFunctionFvPatchScalarField::autoMap
|
||||
(
|
||||
const fvPatchFieldMapper& m
|
||||
)
|
||||
{
|
||||
nutWallFunctionFvPatchScalarField::autoMap(m);
|
||||
nutkWallFunctionFvPatchScalarField::autoMap(m);
|
||||
Ks_.autoMap(m);
|
||||
Cs_.autoMap(m);
|
||||
}
|
||||
|
||||
|
||||
void nutRoughWallFunctionFvPatchScalarField::rmap
|
||||
void nutkRoughWallFunctionFvPatchScalarField::rmap
|
||||
(
|
||||
const fvPatchScalarField& ptf,
|
||||
const labelList& addr
|
||||
)
|
||||
{
|
||||
nutWallFunctionFvPatchScalarField::rmap(ptf, addr);
|
||||
nutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
|
||||
|
||||
const nutRoughWallFunctionFvPatchScalarField& nrwfpsf =
|
||||
refCast<const nutRoughWallFunctionFvPatchScalarField>(ptf);
|
||||
const nutkRoughWallFunctionFvPatchScalarField& nrwfpsf =
|
||||
refCast<const nutkRoughWallFunctionFvPatchScalarField>(ptf);
|
||||
|
||||
Ks_.rmap(nrwfpsf.Ks_, addr);
|
||||
Cs_.rmap(nrwfpsf.Cs_, addr);
|
||||
}
|
||||
|
||||
|
||||
void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
void nutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
{
|
||||
fvPatchField<scalar>::write(os);
|
||||
writeLocalEntries(os);
|
||||
@ -231,7 +231,11 @@ void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
makePatchTypeField(fvPatchScalarField, nutRoughWallFunctionFvPatchScalarField);
|
||||
makePatchTypeField
|
||||
(
|
||||
fvPatchScalarField,
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -23,11 +23,11 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::incompressible::RASModels::nutRoughWallFunctionFvPatchScalarField
|
||||
Foam::incompressible::RASModels::nutkRoughWallFunctionFvPatchScalarField
|
||||
|
||||
Description
|
||||
Boundary condition for turbulent (kinematic) viscosity when using wall
|
||||
functions for rough walls.
|
||||
functions for rough walls, based on turbulence kinetic energy.
|
||||
|
||||
Manipulates the E parameter to account for roughness effects, based on
|
||||
KsPlus.
|
||||
@ -36,14 +36,14 @@ Description
|
||||
- roughness constant = 0.5-1.0 (0.5 default)
|
||||
|
||||
SourceFiles
|
||||
nutRoughWallFunctionFvPatchScalarField.C
|
||||
nutkRoughWallFunctionFvPatchScalarField.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef nutRoughWallFunctionFvPatchScalarField_H
|
||||
#define nutRoughWallFunctionFvPatchScalarField_H
|
||||
#ifndef nutkRoughWallFunctionFvPatchScalarField_H
|
||||
#define nutkRoughWallFunctionFvPatchScalarField_H
|
||||
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -55,12 +55,12 @@ namespace RASModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class nutRoughWallFunctionFvPatchScalarField Declaration
|
||||
Class nutkRoughWallFunctionFvPatchScalarField Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class nutRoughWallFunctionFvPatchScalarField
|
||||
class nutkRoughWallFunctionFvPatchScalarField
|
||||
:
|
||||
public nutWallFunctionFvPatchScalarField
|
||||
public nutkWallFunctionFvPatchScalarField
|
||||
{
|
||||
protected:
|
||||
|
||||
@ -85,20 +85,20 @@ protected:
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("nutRoughWallFunction");
|
||||
TypeName("nutkRoughWallFunction");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from patch and internal field
|
||||
nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
//- Construct from patch, internal field and dictionary
|
||||
nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
@ -106,20 +106,20 @@ public:
|
||||
);
|
||||
|
||||
//- Construct by mapping given
|
||||
// nutRoughWallFunctionFvPatchScalarField
|
||||
// nutkRoughWallFunctionFvPatchScalarField
|
||||
// onto a new patch
|
||||
nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField&,
|
||||
const nutkRoughWallFunctionFvPatchScalarField&,
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
const fvPatchFieldMapper&
|
||||
);
|
||||
|
||||
//- Construct as copy
|
||||
nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField&
|
||||
const nutkRoughWallFunctionFvPatchScalarField&
|
||||
);
|
||||
|
||||
//- Construct and return a clone
|
||||
@ -127,14 +127,14 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutRoughWallFunctionFvPatchScalarField(*this)
|
||||
new nutkRoughWallFunctionFvPatchScalarField(*this)
|
||||
);
|
||||
}
|
||||
|
||||
//- Construct as copy setting internal field reference
|
||||
nutRoughWallFunctionFvPatchScalarField
|
||||
nutkRoughWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutRoughWallFunctionFvPatchScalarField&,
|
||||
const nutkRoughWallFunctionFvPatchScalarField&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
@ -146,7 +146,7 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutRoughWallFunctionFvPatchScalarField(*this, iF)
|
||||
new nutkRoughWallFunctionFvPatchScalarField(*this, iF)
|
||||
);
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "nutWallFunctionFvPatchScalarField.H"
|
||||
#include "nutkWallFunctionFvPatchScalarField.H"
|
||||
#include "RASModel.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
@ -42,11 +42,11 @@ namespace RASModels
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
void nutWallFunctionFvPatchScalarField::checkType()
|
||||
void nutkWallFunctionFvPatchScalarField::checkType()
|
||||
{
|
||||
if (!isA<wallFvPatch>(patch()))
|
||||
{
|
||||
FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
|
||||
FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()")
|
||||
<< "Invalid wall function specification" << nl
|
||||
<< " Patch type for patch " << patch().name()
|
||||
<< " must be wall" << nl
|
||||
@ -56,7 +56,7 @@ void nutWallFunctionFvPatchScalarField::checkType()
|
||||
}
|
||||
|
||||
|
||||
scalar nutWallFunctionFvPatchScalarField::calcYPlusLam
|
||||
scalar nutkWallFunctionFvPatchScalarField::calcYPlusLam
|
||||
(
|
||||
const scalar kappa,
|
||||
const scalar E
|
||||
@ -73,7 +73,7 @@ scalar nutWallFunctionFvPatchScalarField::calcYPlusLam
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
|
||||
tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -104,7 +104,7 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
|
||||
}
|
||||
|
||||
|
||||
void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
|
||||
void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
|
||||
{
|
||||
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
|
||||
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
|
||||
@ -114,7 +114,7 @@ void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
@ -130,9 +130,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
}
|
||||
|
||||
|
||||
nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField& ptf,
|
||||
const nutkWallFunctionFvPatchScalarField& ptf,
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
const fvPatchFieldMapper& mapper
|
||||
@ -148,7 +148,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
}
|
||||
|
||||
|
||||
nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch& p,
|
||||
const DimensionedField<scalar, volMesh>& iF,
|
||||
@ -165,9 +165,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
}
|
||||
|
||||
|
||||
nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField& wfpsf
|
||||
const nutkWallFunctionFvPatchScalarField& wfpsf
|
||||
)
|
||||
:
|
||||
fixedValueFvPatchScalarField(wfpsf),
|
||||
@ -180,9 +180,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
}
|
||||
|
||||
|
||||
nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField& wfpsf,
|
||||
const nutkWallFunctionFvPatchScalarField& wfpsf,
|
||||
const DimensionedField<scalar, volMesh>& iF
|
||||
)
|
||||
:
|
||||
@ -198,7 +198,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
void nutWallFunctionFvPatchScalarField::updateCoeffs()
|
||||
void nutkWallFunctionFvPatchScalarField::updateCoeffs()
|
||||
{
|
||||
operator==(calcNut());
|
||||
|
||||
@ -206,7 +206,7 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs()
|
||||
}
|
||||
|
||||
|
||||
tmp<scalarField> nutWallFunctionFvPatchScalarField::yPlus() const
|
||||
tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
|
||||
{
|
||||
const label patchI = patch().index();
|
||||
|
||||
@ -222,7 +222,7 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::yPlus() const
|
||||
}
|
||||
|
||||
|
||||
void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
void nutkWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
{
|
||||
fvPatchField<scalar>::write(os);
|
||||
writeLocalEntries(os);
|
||||
@ -232,7 +232,7 @@ void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
|
||||
makePatchTypeField(fvPatchScalarField, nutkWallFunctionFvPatchScalarField);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -23,20 +23,20 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField
|
||||
Foam::incompressible::RASModels::nutkWallFunctionFvPatchScalarField
|
||||
|
||||
Description
|
||||
Boundary condition for turbulent (kinematic) viscosity when using wall
|
||||
functions
|
||||
functions, based on turbulence kinetic energy.
|
||||
- replicates OpenFOAM v1.5 (and earlier) behaviour
|
||||
|
||||
SourceFiles
|
||||
nutWallFunctionFvPatchScalarField.C
|
||||
nutkWallFunctionFvPatchScalarField.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef nutWallFunctionFvPatchScalarField_H
|
||||
#define nutWallFunctionFvPatchScalarField_H
|
||||
#ifndef nutkWallFunctionFvPatchScalarField_H
|
||||
#define nutkWallFunctionFvPatchScalarField_H
|
||||
|
||||
#include "fixedValueFvPatchFields.H"
|
||||
|
||||
@ -50,10 +50,10 @@ namespace RASModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class nutWallFunctionFvPatchScalarField Declaration
|
||||
Class nutkWallFunctionFvPatchScalarField Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class nutWallFunctionFvPatchScalarField
|
||||
class nutkWallFunctionFvPatchScalarField
|
||||
:
|
||||
public fixedValueFvPatchScalarField
|
||||
{
|
||||
@ -92,20 +92,20 @@ protected:
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("nutWallFunction");
|
||||
TypeName("nutkWallFunction");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from patch and internal field
|
||||
nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
//- Construct from patch, internal field and dictionary
|
||||
nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
@ -113,20 +113,20 @@ public:
|
||||
);
|
||||
|
||||
//- Construct by mapping given
|
||||
// nutWallFunctionFvPatchScalarField
|
||||
// nutkWallFunctionFvPatchScalarField
|
||||
// onto a new patch
|
||||
nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField&,
|
||||
const nutkWallFunctionFvPatchScalarField&,
|
||||
const fvPatch&,
|
||||
const DimensionedField<scalar, volMesh>&,
|
||||
const fvPatchFieldMapper&
|
||||
);
|
||||
|
||||
//- Construct as copy
|
||||
nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField&
|
||||
const nutkWallFunctionFvPatchScalarField&
|
||||
);
|
||||
|
||||
//- Construct and return a clone
|
||||
@ -134,14 +134,14 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutWallFunctionFvPatchScalarField(*this)
|
||||
new nutkWallFunctionFvPatchScalarField(*this)
|
||||
);
|
||||
}
|
||||
|
||||
//- Construct as copy setting internal field reference
|
||||
nutWallFunctionFvPatchScalarField
|
||||
nutkWallFunctionFvPatchScalarField
|
||||
(
|
||||
const nutWallFunctionFvPatchScalarField&,
|
||||
const nutkWallFunctionFvPatchScalarField&,
|
||||
const DimensionedField<scalar, volMesh>&
|
||||
);
|
||||
|
||||
@ -153,7 +153,7 @@ public:
|
||||
{
|
||||
return tmp<fvPatchScalarField>
|
||||
(
|
||||
new nutWallFunctionFvPatchScalarField(*this, iF)
|
||||
new nutkWallFunctionFvPatchScalarField(*this, iF)
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user