Skip to content
Snippets Groups Projects
Commit e6f81d2c authored by Andrew Heather's avatar Andrew Heather
Browse files

consistency update - nu/muSgsWallFunction to nu/muSgsSpalartAllmarasWallFunction

parent d1f908df
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 95 additions and 64 deletions
src/turbulenceModels/LES/compressible/Make/files
+ 1
− 1
View file @ e6f81d2c
......@@ -14,6 +14,6 @@ SpalartAllmaras/SpalartAllmaras.C
wallFunctions=derivedFvPatchFields/wallFunctions
muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
$(muSgsWallFunctions)/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C → src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+ 22
− 12
View file @ e6f81d2c
......@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "muSgsWallFunctionFvPatchScalarField.H"
#include "muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
......@@ -41,7 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
......@@ -51,9 +52,10 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& ptf,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
......@@ -63,7 +65,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -74,7 +77,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -85,18 +89,20 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& tppsf
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& tppsf,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
......@@ -106,7 +112,7 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void muSgsWallFunctionFvPatchScalarField::evaluate
void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
......@@ -184,7 +190,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, muSgsWallFunctionFvPatchScalarField);
makePatchTypeField
(
fvPatchScalarField,
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H → src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
+ 26
− 20
View file @ e6f81d2c
......@@ -23,18 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::compressible::LESModels::muSgsWallFunctionFvPatchScalarField
Foam::compressible::LESModels::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
Description
wall function boundary condition for compressible flows
Spalart Allmaas wall function boundary condition for compressible flows
SourceFiles
muSgsWallFunctionFvPatchScalarField.C
muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef muSgsWallFunctionFvPatchScalarField_H
#define muSgsWallFunctionFvPatchScalarField_H
#ifndef muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
......@@ -48,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class muSgsWallFunctionFvPatch Declaration
Class muSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class muSgsWallFunctionFvPatchScalarField
class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
......@@ -61,20 +62,20 @@ class muSgsWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("muSgsWallFunction");
TypeName("muSgsSpalartAllmarasWallFunction");
// Constructors
//- Construct from patch and internal field
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and Istream
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
......@@ -82,27 +83,28 @@ public:
);
//- Construct from patch, internal field and dictionary
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
//- Construct by mapping given muSgsWallFunctionFvPatchScalarField
//- Construct by mapping given
// muSgsSpalartAllmarasWallFunctionFvPatchScalarField
// onto a new patch
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
......@@ -110,14 +112,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsWallFunctionFvPatchScalarField(*this)
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
......@@ -129,7 +131,11 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsWallFunctionFvPatchScalarField(*this, iF)
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
*this,
iF
)
);
}
......
src/turbulenceModels/LES/incompressible/Make/files
+ 1
− 1
View file @ e6f81d2c
......@@ -29,7 +29,7 @@ dynMixedSmagorinsky/dynMixedSmagorinsky.C
wallFunctions=derivedFvPatchFields/wallFunctions
nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
$(nuSgsWallFunctions)/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libincompressibleLESModels
src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C → src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+ 20
− 11
View file @ e6f81d2c
......@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nuSgsWallFunctionFvPatchScalarField.H"
#include "nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
......@@ -41,7 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
......@@ -51,9 +52,10 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& ptf,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
......@@ -63,7 +65,8 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -74,18 +77,20 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& tppsf
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& tppsf,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
......@@ -95,7 +100,7 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void nuSgsWallFunctionFvPatchScalarField::evaluate
void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
......@@ -166,7 +171,11 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField);
makePatchTypeField
(
fvPatchScalarField,
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H → src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
+ 25
− 19
View file @ e6f81d2c
......@@ -23,18 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::incompressible::LESModels::nuSgsWallFunctionFvPatchScalarField
Foam::incompressible::LESModels::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
Description
wall function boundary condition for incompressible flows
Spalart Allmaras wall function boundary condition for incompressible flows
SourceFiles
nuSgsWallFunctionFvPatchScalarField.C
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef nuSgsWallFunctionFvPatchScalarField_H
#define nuSgsWallFunctionFvPatchScalarField_H
#ifndef nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
......@@ -48,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class nuSgsWallFunctionFvPatch Declaration
Class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class nuSgsWallFunctionFvPatchScalarField
class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
......@@ -61,40 +62,41 @@ class nuSgsWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("nuSgsWallFunction");
TypeName("nuSgsSpalartAllmarasWallFunction");
// Constructors
//- Construct from patch and internal field
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
//- Construct by mapping given nuSgsWallFunctionFvPatchScalarField
//- Construct by mapping given
// nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
// onto a new patch
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
......@@ -102,14 +104,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsWallFunctionFvPatchScalarField(*this)
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
......@@ -121,7 +123,11 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsWallFunctionFvPatchScalarField(*this, iF)
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
*this,
iF
)
);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment