Commit 635fd464 authored by Mark Olesen's avatar Mark Olesen
Browse files

BUG/STYLE: cleanup turbulence models

- eg, pure virtual correct() and read() methods declarations but
  real implementations.

- unused yPlusLam_ member
parent 6e159756
......@@ -82,7 +82,7 @@ class SpalartAllmaras
volScalarField alphaSgs_;
// Private member functions
// Private Member Functions
//- Update sub-grid scale fields
void updateSubGridScaleFields();
......
......@@ -74,7 +74,7 @@ class alphaSgsJayatillekeWallFunctionFvPatchScalarField
static label maxIters_;
// Private member functions
// Private Member Functions
//- Check the type of the patch
void checkType();
......
......@@ -61,7 +61,7 @@ class alphaSgsWallFunctionFvPatchScalarField
scalar Prt_;
// Private member functions
// Private Member Functions
//- Check the type of the patch
void checkType();
......
......@@ -48,7 +48,6 @@ Description
SourceFiles
LRR.C
LRRcorrect.C
\*---------------------------------------------------------------------------*/
......
......@@ -50,7 +50,6 @@ Description
SourceFiles
LaunderGibsonRSTM.C
LaunderGibsonRSTMcorrect.C
\*---------------------------------------------------------------------------*/
......
......@@ -44,7 +44,6 @@ Description
SourceFiles
LaunderSharmaKE.C
LaunderSharmaKECorrect.C
\*---------------------------------------------------------------------------*/
......@@ -91,7 +90,7 @@ class LaunderSharmaKE
volScalarField alphat_;
// Private member functions
// Private Member Functions
tmp<volScalarField> fMu() const;
tmp<volScalarField> f2() const;
......
......@@ -37,7 +37,6 @@ Description
SourceFiles
RASModel.C
newTurbulenceModel.C
\*---------------------------------------------------------------------------*/
......@@ -88,9 +87,6 @@ protected:
//- Model coefficients dictionary
dictionary coeffDict_;
//- Value of y+ at the edge of the laminar sublayer
scalar yPlusLam_;
//- Lower limit of k
dimensionedScalar kMin_;
......@@ -159,7 +155,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
//- Return a reference to the selected RAS model
static autoPtr<RASModel> New
(
const volScalarField& rho,
......
......@@ -45,7 +45,6 @@ Description
SourceFiles
RNGkEpsilon.C
RNGkEpsilonCorrect.C
\*---------------------------------------------------------------------------*/
......
......@@ -61,7 +61,6 @@ Description
SourceFiles
SpalartAllmaras.C
SpalartAllmarasCorrect.C
\*---------------------------------------------------------------------------*/
......@@ -116,7 +115,7 @@ class SpalartAllmaras
wallDist d_;
// Private member functions
// Private Member Functions
tmp<volScalarField> chi() const;
tmp<volScalarField> fv1(const volScalarField& chi) const;
......
......@@ -77,7 +77,7 @@ class alphatJayatillekeWallFunctionFvPatchScalarField
static label maxIters_;
// Private member functions
// Private Member Functions
//- Check the type of the patch
void checkType();
......
......@@ -57,7 +57,7 @@ class kqRWallFunctionFvPatchField
public zeroGradientFvPatchField<Type>
{
// Private member functions
// Private Member Functions
//- Check the type of the patch
void checkType();
......
......@@ -59,7 +59,7 @@ class mutLowReWallFunctionFvPatchScalarField
{
protected:
// Private member functions
// Private Member Functions
//- Calculate the turbulence viscosity
virtual tmp<scalarField> calcMut() const;
......
......@@ -72,7 +72,7 @@ protected:
scalarField Cs_;
// Private member functions
// Private Member Functions
//- Compute the roughness function
virtual scalar fnRough(const scalar KsPlus, const scalar Cs) const;
......
......@@ -43,7 +43,6 @@ Description
SourceFiles
kEpsilon.C
kEpsilonCorrect.C
\*---------------------------------------------------------------------------*/
......
......@@ -72,9 +72,6 @@ Description
SourceFiles
kOmegaSST.C
kOmegaWallFunctionsI.H
kOmegaWallViscosityI.H
wallOmegaI.H
\*---------------------------------------------------------------------------*/
......@@ -137,7 +134,7 @@ class kOmegaSST
volScalarField alphat_;
// Private member functions
// Private Member Functions
tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
tmp<volScalarField> F2() const;
......
......@@ -98,7 +98,7 @@ class realizableKE
volScalarField alphat_;
// Private member functions
// Private Member Functions
tmp<volScalarField> rCmu
(
......
......@@ -215,15 +215,15 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
}
bool laminar::read()
void laminar::correct()
{
return true;
turbulenceModel::correct();
}
void laminar::correct()
bool laminar::read()
{
turbulenceModel::correct();
return true;
}
......
......@@ -218,7 +218,7 @@ public:
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;
//- Read turbulenceProperties dictionary
//- Read LESProperties or RASProperties dictionary
virtual bool read() = 0;
};
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -92,9 +92,6 @@ public:
// Member Functions
//- Return SGS kinetic energy
virtual tmp<volScalarField> k() const = 0;
//- Return sub-grid disipation rate
virtual tmp<volScalarField> epsilon() const
{
......
......@@ -87,7 +87,7 @@ protected:
autoPtr<LESdelta> delta_;
// Protected member functions
// Protected Member Functions
//- Print model coefficients
virtual void printCoeffs();
......@@ -156,38 +156,34 @@ public:
// Member Functions
//- Const access to the coefficients dictionary,
// which provides info. about choice of models,
// and all related data (particularly model coefficients).
inline const dictionary& coeffDict() const
{
return coeffDict_;
}
//- Access function to filter width
inline const volScalarField& delta() const
{
return delta_();
}
// Access
//- Return the lower allowable limit for k (default: SMALL)
const dimensionedScalar& kMin() const
{
return kMin_;
}
//- Const access to the coefficients dictionary,
// which provides info. about choice of models,
// and all related data (particularly model coefficients).
inline const dictionary& coeffDict() const
{
return coeffDict_;
}
//- Allow kMin to be changed
dimensionedScalar& kMin()
{
return kMin_;
}
//- Return the lower allowable limit for k (default: SMALL)
const dimensionedScalar& kMin() const
{
return kMin_;
}
//- Allow kMin to be changed
dimensionedScalar& kMin()
{
return kMin_;
}
//- Return the SGS turbulent kinetic energy.
virtual tmp<volScalarField> k() const = 0;
//- Access function to filter width
inline const volScalarField& delta() const
{
return delta_();
}
//- Return the SGS turbulent dissipation.
virtual tmp<volScalarField> epsilon() const = 0;
//- Return the SGS viscosity.
virtual tmp<volScalarField> nuSgs() const = 0;
......@@ -243,13 +239,13 @@ public:
//- Correct Eddy-Viscosity and related properties.
// This calls correct(const tmp<volTensorField>& gradU) by supplying
// gradU calculated locally.
void correct();
virtual void correct();
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);
//- Read LESProperties dictionary
virtual bool read() = 0;
virtual bool read();
};
......
Supports Markdown
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