Renamed the LES wall-function back to how it was because it is more generally applicable than just to the Spalart Allmaras model.

This commit is contained in:
henry
2009-05-05 21:58:38 +01:00
parent 162f9d57d8
commit 395298292d
6 changed files with 73 additions and 73 deletions

View File

@ -14,6 +14,6 @@ SpalartAllmaras/SpalartAllmaras.C
wallFunctions=derivedFvPatchFields/wallFunctions wallFunctions=derivedFvPatchFields/wallFunctions
muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
$(muSgsWallFunctions)/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C $(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleLESModels LIB = $(FOAM_LIBBIN)/libcompressibleLESModels

View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H" #include "muSgsWallFunctionFvPatchScalarField.H"
#include "LESModel.H" #include "LESModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
@ -41,8 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -52,10 +52,10 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf, const muSgsWallFunctionFvPatchScalarField& ptf,
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
@ -65,8 +65,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
@ -77,8 +77,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
@ -89,20 +89,20 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf const muSgsWallFunctionFvPatchScalarField& tppsf
) )
: :
fixedValueFvPatchScalarField(tppsf) fixedValueFvPatchScalarField(tppsf)
{} {}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField:: muSgsWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf, const muSgsWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
@ -112,7 +112,7 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate void muSgsWallFunctionFvPatchScalarField::evaluate
( (
const Pstream::commsTypes const Pstream::commsTypes
) )
@ -193,7 +193,7 @@ void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
makePatchTypeField makePatchTypeField
( (
fvPatchScalarField, fvPatchScalarField,
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
); );
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -24,18 +24,18 @@ License
Class Class
Foam::compressible::LESModels:: Foam::compressible::LESModels::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
Description Description
Spalart Allmaas wall function boundary condition for compressible flows Spalart Allmaas wall function boundary condition for compressible flows
SourceFiles SourceFiles
muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C muSgsWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H #ifndef muSgsWallFunctionFvPatchScalarField_H
#define muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H #define muSgsWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
@ -49,10 +49,10 @@ namespace LESModels
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class muSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration Class muSgsWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class muSgsSpalartAllmarasWallFunctionFvPatchScalarField class muSgsWallFunctionFvPatchScalarField
: :
public fixedValueFvPatchScalarField public fixedValueFvPatchScalarField
{ {
@ -62,20 +62,20 @@ class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
public: public:
//- Runtime type information //- Runtime type information
TypeName("muSgsSpalartAllmarasWallFunction"); TypeName("muSgsWallFunction");
// Constructors // Constructors
//- Construct from patch and internal field //- Construct from patch and internal field
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
//- Construct from patch, internal field and Istream //- Construct from patch, internal field and Istream
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
@ -83,7 +83,7 @@ public:
); );
//- Construct from patch, internal field and dictionary //- Construct from patch, internal field and dictionary
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
@ -91,20 +91,20 @@ public:
); );
//- Construct by mapping given //- Construct by mapping given
// muSgsSpalartAllmarasWallFunctionFvPatchScalarField // muSgsWallFunctionFvPatchScalarField
// onto a new patch // onto a new patch
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&, const muSgsWallFunctionFvPatchScalarField&,
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper& const fvPatchFieldMapper&
); );
//- Construct as copy //- Construct as copy
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& const muSgsWallFunctionFvPatchScalarField&
); );
//- Construct and return a clone //- Construct and return a clone
@ -112,14 +112,14 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this) new muSgsWallFunctionFvPatchScalarField(*this)
); );
} }
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
muSgsSpalartAllmarasWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField
( (
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&, const muSgsWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
@ -131,7 +131,7 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField new muSgsWallFunctionFvPatchScalarField
( (
*this, *this,
iF iF

View File

@ -32,7 +32,7 @@ kOmegaSSTSAS/kOmegaSSTSAS.C
wallFunctions=derivedFvPatchFields/wallFunctions wallFunctions=derivedFvPatchFields/wallFunctions
nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
$(nuSgsWallFunctions)/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C $(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libincompressibleLESModels LIB = $(FOAM_LIBBIN)/libincompressibleLESModels

View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H" #include "nuSgsWallFunctionFvPatchScalarField.H"
#include "LESModel.H" #include "LESModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
@ -41,8 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -52,10 +52,10 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf, const nuSgsWallFunctionFvPatchScalarField& ptf,
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
@ -65,8 +65,8 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
@ -77,20 +77,20 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{} {}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf const nuSgsWallFunctionFvPatchScalarField& tppsf
) )
: :
fixedValueFvPatchScalarField(tppsf) fixedValueFvPatchScalarField(tppsf)
{} {}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf, const nuSgsWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
@ -100,7 +100,7 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate void nuSgsWallFunctionFvPatchScalarField::evaluate
( (
const Pstream::commsTypes const Pstream::commsTypes
) )
@ -174,7 +174,7 @@ void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
makePatchTypeField makePatchTypeField
( (
fvPatchScalarField, fvPatchScalarField,
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
); );
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -24,18 +24,18 @@ License
Class Class
Foam::incompressible::LESModels:: Foam::incompressible::LESModels::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
Description Description
Spalart Allmaras wall function boundary condition for incompressible flows Spalart Allmaras wall function boundary condition for incompressible flows
SourceFiles SourceFiles
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C nuSgsWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H #ifndef nuSgsWallFunctionFvPatchScalarField_H
#define nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H #define nuSgsWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
@ -49,10 +49,10 @@ namespace LESModels
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration Class nuSgsWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField class nuSgsWallFunctionFvPatchScalarField
: :
public fixedValueFvPatchScalarField public fixedValueFvPatchScalarField
{ {
@ -62,20 +62,20 @@ class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
public: public:
//- Runtime type information //- Runtime type information
TypeName("nuSgsSpalartAllmarasWallFunction"); TypeName("nuSgsWallFunction");
// Constructors // Constructors
//- Construct from patch and internal field //- Construct from patch and internal field
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
//- Construct from patch, internal field and dictionary //- Construct from patch, internal field and dictionary
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
@ -83,20 +83,20 @@ public:
); );
//- Construct by mapping given //- Construct by mapping given
// nuSgsSpalartAllmarasWallFunctionFvPatchScalarField // nuSgsWallFunctionFvPatchScalarField
// onto a new patch // onto a new patch
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&, const nuSgsWallFunctionFvPatchScalarField&,
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper& const fvPatchFieldMapper&
); );
//- Construct as copy //- Construct as copy
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& const nuSgsWallFunctionFvPatchScalarField&
); );
//- Construct and return a clone //- Construct and return a clone
@ -104,14 +104,14 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this) new nuSgsWallFunctionFvPatchScalarField(*this)
); );
} }
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField nuSgsWallFunctionFvPatchScalarField
( (
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&, const nuSgsWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
@ -123,7 +123,7 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField new nuSgsWallFunctionFvPatchScalarField
( (
*this, *this,
iF iF