zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into molecularDynamics

Browse Source
This commit is contained in:
graham
2008-06-17 17:03:06 +01:00
parent 29d1571274 c7a59bb25f
commit b0a2e17703
99 changed files with 681 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
View File

@ -45,7 +45,8 @@ void LESmodel::printCoeffs()
{ {
if (printCoeffs_) if (printCoeffs_)
{ {
Info<< LESmodelProperties_; Info<< type() << "Coeffs" << nl
<< LESmodelProperties_;
} }
} }

3
src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
View File

@ -43,7 +43,8 @@ void LESmodel::printCoeffs()
{ {
if (printCoeffs_) if (printCoeffs_)
{ {
Info<< LESmodelProperties_; Info<< type() << "Coeffs" << nl
<< LESmodelProperties_;
} }
} }

12
src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
View File

@ -93,12 +93,12 @@ void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
forAll(B_, celli) forAll(B_, celli)
{ {
B_[celli].component(tensor::XX) = B_[celli].component(symmTensor::XX) =
max(B_[celli].component(tensor::XX), k0().value()); max(B_[celli].component(symmTensor::XX), k0().value());
B_[celli].component(tensor::YY) = B_[celli].component(symmTensor::YY) =
max(B_[celli].component(tensor::YY), k0().value()); max(B_[celli].component(symmTensor::YY), k0().value());
B_[celli].component(tensor::ZZ) = B_[celli].component(symmTensor::ZZ) =
max(B_[celli].component(tensor::ZZ), k0().value()); max(B_[celli].component(symmTensor::ZZ), k0().value());
} }
K = 0.5*tr(B_); K = 0.5*tr(B_);

52
src/turbulenceModels/RAS/compressible/LRR/LRR.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LRR, 0); defineTypeNameAndDebug(LRR, 0);
addToRunTimeSelectionTable(turbulenceModel, LRR, dictionary); addToRunTimeSelectionTable(RASmodel, LRR, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -53,25 +53,25 @@ LRR::LRR
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)), Clrr1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)),
Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)), Clrr2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)), Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)), Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
couplingFactor_ couplingFactor_
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0) RASmodelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
), ),
alphaR(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)), alphaR(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
R_ R_
( (
@ -192,19 +192,19 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
bool LRR::read() bool LRR::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1); RASmodelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2); RASmodelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs); RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps); RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR); RASmodelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"couplingFactor", "couplingFactor",
couplingFactor_ couplingFactor_
@ -236,7 +236,7 @@ void LRR::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_)); volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
volScalarField G = 0.5*tr(P); volScalarField G = 0.5*tr(P);

4
src/turbulenceModels/RAS/compressible/LRR/LRR.H
View File

@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLRR_H #ifndef compressibleLRR_H
#define compressibleLRR_H #define compressibleLRR_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,7 +55,7 @@ namespace RAS
class LRR class LRR
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

60
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View File

@ -42,7 +42,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderGibsonRSTM, 0); defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderGibsonRSTM, dictionary); addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -55,27 +55,27 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clg1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)), Clg1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)),
Clg2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)), Clg2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)), Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)), Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)), C1Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)),
C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)), C2Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)),
couplingFactor_ couplingFactor_
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0) RASmodelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
), ),
alphaR(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)), alphaR(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
y_(mesh_), y_(mesh_),
@ -198,22 +198,22 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
bool LaunderGibsonRSTM::read() bool LaunderGibsonRSTM::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg1", Clg1); RASmodelCoeffs_.readIfPresent<scalar>("Clg1", Clg1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg2", Clg2); RASmodelCoeffs_.readIfPresent<scalar>("Clg2", Clg2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs); RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps); RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref); RASmodelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref); RASmodelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR); RASmodelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"couplingFactor", "couplingFactor",
couplingFactor_ couplingFactor_
@ -245,7 +245,7 @@ void LaunderGibsonRSTM::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef compressibleLaunderGibsonRSTM_H #ifndef compressibleLaunderGibsonRSTM_H
#define compressibleLaunderGibsonRSTM_H #define compressibleLaunderGibsonRSTM_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDistReflection.H" #include "wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,7 +55,7 @@ namespace RAS
class LaunderGibsonRSTM class LaunderGibsonRSTM
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

34
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderSharmaKE, 0); defineTypeNameAndDebug(LaunderSharmaKE, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderSharmaKE, dictionary); addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -69,18 +69,18 @@ LaunderSharmaKE::LaunderSharmaKE
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)), C3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_ k_
( (
@ -179,14 +179,14 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
bool LaunderSharmaKE::read() bool LaunderSharmaKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3); RASmodelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true; return true;
} }
@ -206,7 +206,7 @@ void LaunderSharmaKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
// Calculate parameters and coefficients for Launder-Sharma low-Reynolds // Calculate parameters and coefficients for Launder-Sharma low-Reynolds
// number model // number model

4
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
View File

@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLaunderSharmaKE_H #ifndef compressibleLaunderSharmaKE_H
#define compressibleLaunderSharmaKE_H #define compressibleLaunderSharmaKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,7 +55,7 @@ namespace RAS
class LaunderSharmaKE class LaunderSharmaKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

4
src/turbulenceModels/RAS/compressible/Make/files
View File

@ -1,5 +1,5 @@
turbulenceModel/turbulenceModel.C RASmodel/RASmodel.C
turbulenceModel/newTurbulenceModel.C RASmodel/newRASmodel.C
laminar/laminar.C laminar/laminar.C
kEpsilon/kEpsilon.C kEpsilon/kEpsilon.C
RNGkEpsilon/RNGkEpsilon.C RNGkEpsilon/RNGkEpsilon.C

40
src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C → src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
@ -38,23 +38,24 @@ namespace compressible
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(turbulenceModel, 0); defineTypeNameAndDebug(RASmodel, 0);
defineRunTimeSelectionTable(turbulenceModel, dictionary); defineRunTimeSelectionTable(RASmodel, dictionary);
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void turbulenceModel::printCoeffs() void RASmodel::printCoeffs()
{ {
if (printCoeffs_) if (printCoeffs_)
{ {
Info<< turbulenceModelCoeffs_; Info<< type() << "Coeffs" << nl
<< RASmodelCoeffs_;
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulenceModel::turbulenceModel RASmodel::RASmodel
( (
const word& type, const word& type,
const volScalarField& rho, const volScalarField& rho,
@ -85,10 +86,17 @@ turbulenceModel::turbulenceModel
turbulence_(lookup("turbulence")), turbulence_(lookup("turbulence")),
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)), printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
turbulenceModelCoeffs_(subDict(type + "Coeffs")), RASmodelCoeffs_(subDict(type + "Coeffs")),
kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))), kappa_
E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))), (
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>
(
"kappa",
0.4187
)
),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)),
yPlusLam_(yPlusLam(kappa_, E_)), yPlusLam_(yPlusLam(kappa_, E_)),
k0_("k0", dimVelocity*dimVelocity, SMALL), k0_("k0", dimVelocity*dimVelocity, SMALL),
@ -101,7 +109,7 @@ turbulenceModel::turbulenceModel
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E) scalar RASmodel::yPlusLam(const scalar kappa, const scalar E)
{ {
scalar ypl = 11.0; scalar ypl = 11.0;
@ -114,7 +122,7 @@ scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E)
} }
tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const tmp<scalarField> RASmodel::yPlus(const label patchNo) const
{ {
const fvPatch& curPatch = mesh_.boundary()[patchNo]; const fvPatch& curPatch = mesh_.boundary()[patchNo];
@ -123,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch)) if (typeid(curPatch) == typeid(wallFvPatch))
{ {
scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu")); scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu")));
Yp = pow(Cmu, 0.25) Yp = pow(Cmu, 0.25)
*y_[patchNo] *y_[patchNo]
@ -137,7 +145,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
{ {
WarningIn WarningIn
( (
"tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const" "tmp<scalarField> RASmodel::yPlus(const label patchNo) const"
) << "Patch " << patchNo << " is not a wall. Returning blank field" ) << "Patch " << patchNo << " is not a wall. Returning blank field"
<< endl; << endl;
@ -148,7 +156,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
} }
void turbulenceModel::correct() void RASmodel::correct()
{ {
if (mesh_.changing()) if (mesh_.changing())
{ {
@ -157,12 +165,12 @@ void turbulenceModel::correct()
} }
bool turbulenceModel::read() bool RASmodel::read()
{ {
if (regIOobject::read()) if (regIOobject::read())
{ {
lookup("turbulence") >> turbulence_; lookup("turbulence") >> turbulence_;
turbulenceModelCoeffs_ = subDict(type() + "Coeffs"); RASmodelCoeffs_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_; subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
subDict("wallFunctionCoeffs").lookup("E") >> E_; subDict("wallFunctionCoeffs").lookup("E") >> E_;

28
src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H → src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H
View File

@ -30,20 +30,20 @@ Description
Class Class
Foam::compressible::turbulenceModel Foam::compressible::RASmodel
Description Description
Abstract base class for turbulence models for compressible and combusting Abstract base class for turbulence models for compressible and combusting
flows. flows.
SourceFiles SourceFiles
turbulenceModel.C RASmodel.C
newTurbulenceModel.C newTurbulenceModel.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef compressibleTurbulenceModel_H #ifndef compressibleRASModel_H
#define compressibleTurbulenceModel_H #define compressibleRASModel_H
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H" #include "surfaceFields.H"
@ -66,10 +66,10 @@ namespace compressible
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class turbulenceModel Declaration Class RASmodel Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class turbulenceModel class RASmodel
: :
public IOdictionary public IOdictionary
{ {
@ -89,7 +89,7 @@ protected:
Switch turbulence_; Switch turbulence_;
Switch printCoeffs_; Switch printCoeffs_;
dictionary turbulenceModelCoeffs_; dictionary RASmodelCoeffs_;
scalar kappa_; scalar kappa_;
scalar E_; scalar E_;
@ -121,16 +121,16 @@ private:
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
turbulenceModel(const turbulenceModel&); RASmodel(const RASmodel&);
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const turbulenceModel&); void operator=(const RASmodel&);
public: public:
//- Runtime type information //- Runtime type information
TypeName("turbulenceModel"); TypeName("RASmodel");
// Declare run-time constructor selection table // Declare run-time constructor selection table
@ -138,7 +138,7 @@ public:
declareRunTimeSelectionTable declareRunTimeSelectionTable
( (
autoPtr, autoPtr,
turbulenceModel, RASmodel,
dictionary, dictionary,
( (
const volScalarField& rho, const volScalarField& rho,
@ -153,7 +153,7 @@ public:
// Constructors // Constructors
//- Construct from components //- Construct from components
turbulenceModel RASmodel
( (
const word& type, const word& type,
const volScalarField& rho, const volScalarField& rho,
@ -166,7 +166,7 @@ public:
// Selectors // Selectors
//- Return a reference to the selected turbulence model //- Return a reference to the selected turbulence model
static autoPtr<turbulenceModel> New static autoPtr<RASmodel> New
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -177,7 +177,7 @@ public:
// Destructor // Destructor
virtual ~turbulenceModel() virtual ~RASmodel()
{} {}

24
src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C → src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -35,7 +35,7 @@ namespace compressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
autoPtr<turbulenceModel> turbulenceModel::New autoPtr<RASmodel> RASmodel::New
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -43,10 +43,10 @@ autoPtr<turbulenceModel> turbulenceModel::New
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
{ {
word turbulenceModelTypeName; word RASmodelTypeName;
// Enclose the creation of the turbulencePropertiesDict to ensure it is // Enclose the creation of the turbulencePropertiesDict to ensure it is
// deleted before the turbulenceModel is created otherwise the dictionary // deleted before the RASmodel is created otherwise the dictionary
// is entered in the database twice // is entered in the database twice
{ {
IOdictionary turbulencePropertiesDict IOdictionary turbulencePropertiesDict
@ -61,30 +61,30 @@ autoPtr<turbulenceModel> turbulenceModel::New
) )
); );
turbulencePropertiesDict.lookup("turbulenceModel") turbulencePropertiesDict.lookup("RASmodel")
>> turbulenceModelTypeName; >> RASmodelTypeName;
} }
Info<< "Selecting turbulence model " << turbulenceModelTypeName << endl; Info<< "Selecting turbulence model " << RASmodelTypeName << endl;
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(turbulenceModelTypeName); dictionaryConstructorTablePtr_->find(RASmodelTypeName);
if (cstrIter == dictionaryConstructorTablePtr_->end()) if (cstrIter == dictionaryConstructorTablePtr_->end())
{ {
FatalErrorIn FatalErrorIn
( (
"turbulenceModel::New(const volScalarField& rho, " "RASmodel::New(const volScalarField& rho, "
"const volVectorField& U, const surfaceScalarField& phi, " "const volVectorField& U, const surfaceScalarField& phi, "
"basicThermo&)" "basicThermo&)"
) << "Unknown turbulenceModel type " << turbulenceModelTypeName ) << "Unknown RASmodel type " << RASmodelTypeName
<< endl << endl << endl << endl
<< "Valid turbulenceModel types are :" << endl << "Valid RASmodel types are :" << endl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()
<< exit(FatalError); << exit(FatalError);
} }
return autoPtr<turbulenceModel> return autoPtr<RASmodel>
( (
cstrIter()(rho, U, phi, thermophysicalModel) cstrIter()(rho, U, phi, thermophysicalModel)
); );

44
src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(RNGkEpsilon, 0); defineTypeNameAndDebug(RNGkEpsilon, 0);
addToRunTimeSelectionTable(turbulenceModel, RNGkEpsilon, dictionary); addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -53,20 +53,20 @@ RNGkEpsilon::RNGkEpsilon
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.0845)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.0845)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.42)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.42)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.68)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.68)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)), C3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.39)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.39)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 1.39) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 1.39)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
eta0(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("eta0", 4.38)), eta0(RASmodelCoeffs_.lookupOrAddDefault<scalar>("eta0", 4.38)),
beta(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta", 0.012)), beta(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta", 0.012)),
k_ k_
( (
@ -167,17 +167,17 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
bool RNGkEpsilon::read() bool RNGkEpsilon::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3); RASmodelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>("eta0", eta0); RASmodelCoeffs_.readIfPresent<scalar>("eta0", eta0);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta", beta); RASmodelCoeffs_.readIfPresent<scalar>("beta", beta);
return true; return true;
} }
@ -197,7 +197,7 @@ void RNGkEpsilon::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));

4
src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef compressibleRNGkEpsilon_H #ifndef compressibleRNGkEpsilon_H
#define compressibleRNGkEpsilon_H #define compressibleRNGkEpsilon_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class RNGkEpsilon class RNGkEpsilon
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

40
src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(SpalartAllmaras, 0); defineTypeNameAndDebug(SpalartAllmaras, 0);
addToRunTimeSelectionTable(turbulenceModel, SpalartAllmaras, dictionary); addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -113,21 +113,21 @@ SpalartAllmaras::SpalartAllmaras
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
alphaNut alphaNut
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaNut", 1.5) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaNut", 1.5)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
Cb1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb1", 0.1355)), Cb1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cb1", 0.1355)),
Cb2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb2", 0.622)), Cb2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cb2", 0.622)),
Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)), Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)),
Cw2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw2", 0.3)), Cw2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cw2", 0.3)),
Cw3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw3", 2.0)), Cw3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cw3", 2.0)),
Cv1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv1", 7.1)), Cv1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cv1", 7.1)),
Cv2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv2", 5.0)), Cv2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cv2", 5.0)),
nuTilda_ nuTilda_
( (
@ -217,18 +217,18 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
bool SpalartAllmaras::read() bool SpalartAllmaras::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaNut", alphaNut); RASmodelCoeffs_.readIfPresent<scalar>("alphaNut", alphaNut);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb1", Cb1); RASmodelCoeffs_.readIfPresent<scalar>("Cb1", Cb1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb2", Cb2); RASmodelCoeffs_.readIfPresent<scalar>("Cb2", Cb2);
Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2); Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cw2", Cw2); RASmodelCoeffs_.readIfPresent<scalar>("Cw2", Cw2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cw3", Cw3); RASmodelCoeffs_.readIfPresent<scalar>("Cw3", Cw3);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cv1", Cv1); RASmodelCoeffs_.readIfPresent<scalar>("Cv1", Cv1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cv2", Cv2); RASmodelCoeffs_.readIfPresent<scalar>("Cv2", Cv2);
return true; return true;
} }
@ -248,7 +248,7 @@ void SpalartAllmaras::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
View File

@ -53,7 +53,7 @@ SourceFiles
#ifndef compressibleSpalartAllmaras_H #ifndef compressibleSpalartAllmaras_H
#define combressibleSpalartAllmaras_H #define combressibleSpalartAllmaras_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -71,7 +71,7 @@ namespace RAS
class SpalartAllmaras class SpalartAllmaras
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

36
src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(kEpsilon, 0); defineTypeNameAndDebug(kEpsilon, 0);
addToRunTimeSelectionTable(turbulenceModel, kEpsilon, dictionary); addToRunTimeSelectionTable(RASmodel, kEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,18 +52,18 @@ kEpsilon::kEpsilon
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)), C3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_ k_
( (
@ -165,15 +165,15 @@ tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
bool kEpsilon::read() bool kEpsilon::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3); RASmodelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true; return true;
} }
@ -194,7 +194,7 @@ void kEpsilon::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));

4
src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef compressiblekEpsilon_H #ifndef compressiblekEpsilon_H
#define compressiblekEpsilon_H #define compressiblekEpsilon_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class kEpsilon class kEpsilon
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

60
src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(kOmegaSST, 0); defineTypeNameAndDebug(kOmegaSST, 0);
addToRunTimeSelectionTable(turbulenceModel, kOmegaSST, dictionary); addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -95,34 +95,34 @@ kOmegaSST::kOmegaSST
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
alphaK1 alphaK1
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaK1", 0.85034) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaK1", 0.85034)
), ),
alphaK2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaK2", 1.0)), alphaK2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaK2", 1.0)),
alphaOmega1 alphaOmega1
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega1", 0.5) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega1", 0.5)
), ),
alphaOmega2 alphaOmega2
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega2", 0.85616) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega2", 0.85616)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
gamma1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("gamma1", 0.5532)), gamma1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("gamma1", 0.5532)),
gamma2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("gamma2", 0.4403)), gamma2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("gamma2", 0.4403)),
beta1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta1", 0.075)), beta1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta1", 0.075)),
beta2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta2", 0.0828)), beta2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta2", 0.0828)),
betaStar(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("betaStar", 0.09)), betaStar(RASmodelCoeffs_.lookupOrAddDefault<scalar>("betaStar", 0.09)),
a1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("a1", 0.31)), a1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("a1", 0.31)),
c1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("c1", 10.0)), c1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("c1", 10.0)),
omega0_("omega0", dimless/dimTime, SMALL), omega0_("omega0", dimless/dimTime, SMALL),
omegaSmall_("omegaSmall", dimless/dimTime, SMALL), omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
y_(mesh_), y_(mesh_),
@ -225,29 +225,29 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
bool kOmegaSST::read() bool kOmegaSST::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaK1", alphaK1); RASmodelCoeffs_.readIfPresent<scalar>("alphaK1", alphaK1);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaK2", alphaK2); RASmodelCoeffs_.readIfPresent<scalar>("alphaK2", alphaK2);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"alphaOmega1", "alphaOmega1",
alphaOmega1 alphaOmega1
); );
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"alphaOmega2", "alphaOmega2",
alphaOmega2 alphaOmega2
); );
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>("gamma1", gamma1); RASmodelCoeffs_.readIfPresent<scalar>("gamma1", gamma1);
turbulenceModelCoeffs_.readIfPresent<scalar>("gamma2", gamma2); RASmodelCoeffs_.readIfPresent<scalar>("gamma2", gamma2);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta1", beta1); RASmodelCoeffs_.readIfPresent<scalar>("beta1", beta1);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta2", beta2); RASmodelCoeffs_.readIfPresent<scalar>("beta2", beta2);
turbulenceModelCoeffs_.readIfPresent<scalar>("betaStar", betaStar); RASmodelCoeffs_.readIfPresent<scalar>("betaStar", betaStar);
turbulenceModelCoeffs_.readIfPresent<scalar>("a1", a1); RASmodelCoeffs_.readIfPresent<scalar>("a1", a1);
turbulenceModelCoeffs_.readIfPresent<scalar>("c1", c1); RASmodelCoeffs_.readIfPresent<scalar>("c1", c1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
return true; return true;
} }
@ -269,7 +269,7 @@ void kOmegaSST::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));

4
src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
View File

@ -63,7 +63,7 @@ SourceFiles
#ifndef compressiblekOmegaSST_H #ifndef compressiblekOmegaSST_H
#define compressiblekOmegaSST_H #define compressiblekOmegaSST_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -81,7 +81,7 @@ namespace RAS
class kOmegaSST class kOmegaSST
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

6
src/turbulenceModels/RAS/compressible/laminar/laminar.C
View File

@ -39,7 +39,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(laminar, 0); defineTypeNameAndDebug(laminar, 0);
addToRunTimeSelectionTable(turbulenceModel, laminar, dictionary); addToRunTimeSelectionTable(RASmodel, laminar, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -51,7 +51,7 @@ laminar::laminar
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel) RASmodel(typeName, rho, U, phi, thermophysicalModel)
{} {}
@ -178,7 +178,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
bool laminar::read() bool laminar::read()
{ {
return turbulenceModel::read(); return RASmodel::read();
} }

4
src/turbulenceModels/RAS/compressible/laminar/laminar.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef compressibleLaminar_H #ifndef compressibleLaminar_H
#define compressibleLaminar_H #define compressibleLaminar_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class laminar class laminar
: :
public turbulenceModel public RASmodel
{ {
public: public:

32
src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(realizableKE, 0); defineTypeNameAndDebug(realizableKE, 0);
addToRunTimeSelectionTable(turbulenceModel, realizableKE, dictionary); addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -93,17 +93,17 @@ realizableKE::realizableKE
basicThermo& thermophysicalModel basicThermo& thermophysicalModel
) )
: :
turbulenceModel(typeName, rho, U, phi, thermophysicalModel), RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
A0(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A0", 4.0)), A0(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A0", 4.0)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.9)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.9)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.833333) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.833333)
), ),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)), alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_ k_
( (
@ -206,14 +206,14 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
bool realizableKE::read() bool realizableKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("A0", A0); RASmodelCoeffs_.readIfPresent<scalar>("A0", A0);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah); RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true; return true;
} }
@ -233,7 +233,7 @@ void realizableKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));

4
src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
View File

@ -47,7 +47,7 @@ SourceFiles
#ifndef realizableKE_H #ifndef realizableKE_H
#define realizableKE_H #define realizableKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -64,7 +64,7 @@ namespace RAS
class realizableKE class realizableKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

6
src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "mutStandardRoughWallFunctionFvPatchScalarField.H" #include "mutStandardRoughWallFunctionFvPatchScalarField.H"
#include "turbulenceModel.H" #include "RASmodel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -120,8 +120,8 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes const Pstream::commsTypes
) )
{ {
const turbulenceModel& rasModel const RASmodel& rasModel
= db().lookupObject<turbulenceModel>("turbulenceProperties"); = db().lookupObject<RASmodel>("turbulenceProperties");
const scalar kappa = rasModel.kappa(); const scalar kappa = rasModel.kappa();
const scalar E = rasModel.E(); const scalar E = rasModel.E();

6
src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
View File

@ -78,7 +78,7 @@ Description
label faceCelli = curPatch.faceCells()[facei]; label faceCelli = curPatch.faceCells()[facei];
scalar yPlus = scalar yPlus =
Cmu25*turbulenceModel::y_[patchi][facei] Cmu25*RASmodel::y_[patchi][facei]
*sqrt(k_[faceCelli]) *sqrt(k_[faceCelli])
/(muw[facei]/rhow[facei]); /(muw[facei]/rhow[facei]);
@ -90,7 +90,7 @@ Description
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_*turbulenceModel::y_[patchi][facei]); /(kappa_*RASmodel::y_[patchi][facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -98,7 +98,7 @@ Description
(mutw[facei] + muw[facei]) (mutw[facei] + muw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*turbulenceModel::y_[patchi][facei]); /(kappa_*RASmodel::y_[patchi][facei]);
} }
} }
} }

2
src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
View File

@ -51,7 +51,7 @@ Description
label faceCelli = curPatch.faceCells()[facei]; label faceCelli = curPatch.faceCells()[facei];
scalar yPlus = scalar yPlus =
Cmu25*turbulenceModel::y_[patchi][facei] Cmu25*RASmodel::y_[patchi][facei]
*sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]); *sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)

44
src/turbulenceModels/RAS/incompressible/LRR/LRR.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LRR, 0); defineTypeNameAndDebug(LRR, 0);
addToRunTimeSelectionTable(turbulenceModel, LRR, dictionary); addToRunTimeSelectionTable(RASmodel, LRR, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,22 +52,22 @@ LRR::LRR
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)), Clrr1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)),
Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)), Clrr2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)), Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)), Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
couplingFactor_ couplingFactor_
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0) RASmodelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
), ),
R_ R_
@ -176,18 +176,18 @@ tmp<fvVectorMatrix> LRR::divDevReff(volVectorField& U) const
bool LRR::read() bool LRR::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1); RASmodelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2); RASmodelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs); RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps); RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"couplingFactor", "couplingFactor",
couplingFactor_ couplingFactor_
@ -219,7 +219,7 @@ void LRR::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_)); volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
volScalarField G = 0.5*tr(P); volScalarField G = 0.5*tr(P);

4
src/turbulenceModels/RAS/incompressible/LRR/LRR.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef LRR_H #ifndef LRR_H
#define LRR_H #define LRR_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class LRR class LRR
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

24
src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
View File

@ -39,7 +39,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LamBremhorstKE, 0); defineTypeNameAndDebug(LamBremhorstKE, 0);
addToRunTimeSelectionTable(turbulenceModel, LamBremhorstKE, dictionary); addToRunTimeSelectionTable(RASmodel, LamBremhorstKE, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -51,14 +51,14 @@ LamBremhorstKE::LamBremhorstKE
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
k_ k_
@ -158,12 +158,12 @@ tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
bool LamBremhorstKE::read() bool LamBremhorstKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
return true; return true;
} }
@ -183,7 +183,7 @@ void LamBremhorstKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef LamBremhorstKE_H #ifndef LamBremhorstKE_H
#define LamBremhorstKE_H #define LamBremhorstKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,7 +55,7 @@ namespace RAS
class LamBremhorstKE class LamBremhorstKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

56
src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderGibsonRSTM, 0); defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderGibsonRSTM, dictionary); addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,25 +52,25 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clg1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)), Clg1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)),
Clg2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)), Clg2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)), Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)), Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
alphaR(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)), alphaR(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)), C1Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)),
C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)), C2Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)),
couplingFactor_ couplingFactor_
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0) RASmodelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
), ),
yr_(mesh_), yr_(mesh_),
@ -181,21 +181,21 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevReff(volVectorField& U) const
bool LaunderGibsonRSTM::read() bool LaunderGibsonRSTM::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg1", Clg1); RASmodelCoeffs_.readIfPresent<scalar>("Clg1", Clg1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg2", Clg2); RASmodelCoeffs_.readIfPresent<scalar>("Clg2", Clg2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs); RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps); RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR); RASmodelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref); RASmodelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref); RASmodelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"couplingFactor", "couplingFactor",
couplingFactor_ couplingFactor_
@ -227,7 +227,7 @@ void LaunderGibsonRSTM::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef LaunderGibsonRSTM_H #ifndef LaunderGibsonRSTM_H
#define LaunderGibsonRSTM_H #define LaunderGibsonRSTM_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDistReflection.H" #include "wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class LaunderGibsonRSTM class LaunderGibsonRSTM
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

24
src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -39,7 +39,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderSharmaKE, 0); defineTypeNameAndDebug(LaunderSharmaKE, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderSharmaKE, dictionary); addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -66,14 +66,14 @@ LaunderSharmaKE::LaunderSharmaKE
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
k_ k_
@ -163,12 +163,12 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
bool LaunderSharmaKE::read() bool LaunderSharmaKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
return true; return true;
} }
@ -188,7 +188,7 @@ void LaunderSharmaKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));

4
src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef LaunderSharmaKE_H #ifndef LaunderSharmaKE_H
#define LaunderSharmaKE_H #define LaunderSharmaKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class LaunderSharmaKE class LaunderSharmaKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

48
src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LienCubicKE, 0); defineTypeNameAndDebug(LienCubicKE, 0);
addToRunTimeSelectionTable(turbulenceModel, LienCubicKE, dictionary); addToRunTimeSelectionTable(RASmodel, LienCubicKE, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,21 +52,21 @@ LienCubicKE::LienCubicKE
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
A1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)), A1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)),
A2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)), A2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)),
Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)), Ctau1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)),
Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)), Ctau2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)),
Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)), Ctau3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)),
alphaKsi(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9)), alphaKsi(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9)),
k_ k_
( (
@ -200,18 +200,18 @@ tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
bool LienCubicKE::read() bool LienCubicKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("A1", A1); RASmodelCoeffs_.readIfPresent<scalar>("A1", A1);
turbulenceModelCoeffs_.readIfPresent<scalar>("A2", A2); RASmodelCoeffs_.readIfPresent<scalar>("A2", A2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1); RASmodelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2); RASmodelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3); RASmodelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi); RASmodelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi);
return true; return true;
} }
@ -231,7 +231,7 @@ void LienCubicKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
gradU = fvc::grad(U_); gradU = fvc::grad(U_);

4
src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef LienCubicKE_H #ifndef LienCubicKE_H
#define LienCubicKE_H #define LienCubicKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -53,7 +53,7 @@ namespace RAS
class LienCubicKE class LienCubicKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

64
src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LienCubicKELowRe, 0); defineTypeNameAndDebug(LienCubicKELowRe, 0);
addToRunTimeSelectionTable(turbulenceModel, LienCubicKELowRe, dictionary); addToRunTimeSelectionTable(RASmodel, LienCubicKELowRe, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,28 +52,28 @@ LienCubicKELowRe::LienCubicKELowRe
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
A1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)), A1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)),
A2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)), A2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)),
Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)), Ctau1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)),
Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)), Ctau2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)),
Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)), Ctau3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)),
alphaKsi(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9)), alphaKsi(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9)),
CmuWall(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), CmuWall(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Am(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Am", 0.016)), Am(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Am", 0.016)),
Aepsilon Aepsilon
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Aepsilon", 0.263) RASmodelCoeffs_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
), ),
Amu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Amu", 0.00222)), Amu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
k_ k_
( (
@ -228,22 +228,22 @@ tmp<fvVectorMatrix> LienCubicKELowRe::divDevReff(volVectorField& U) const
bool LienCubicKELowRe::read() bool LienCubicKELowRe::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("A1", A1); RASmodelCoeffs_.readIfPresent<scalar>("A1", A1);
turbulenceModelCoeffs_.readIfPresent<scalar>("A2", A2); RASmodelCoeffs_.readIfPresent<scalar>("A2", A2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1); RASmodelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2); RASmodelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3); RASmodelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi); RASmodelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", CmuWall); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", CmuWall);
turbulenceModelCoeffs_.readIfPresent<scalar>("Am", Am); RASmodelCoeffs_.readIfPresent<scalar>("Am", Am);
turbulenceModelCoeffs_.readIfPresent<scalar>("Aepsilon", Aepsilon); RASmodelCoeffs_.readIfPresent<scalar>("Aepsilon", Aepsilon);
turbulenceModelCoeffs_.readIfPresent<scalar>("Amu", Amu); RASmodelCoeffs_.readIfPresent<scalar>("Amu", Amu);
return true; return true;
} }
@ -263,7 +263,7 @@ void LienCubicKELowRe::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
View File

@ -51,7 +51,7 @@ SourceFiles
#ifndef LienCubicKELowRe_H #ifndef LienCubicKELowRe_H
#define LienCubicKELowRe_H #define LienCubicKELowRe_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -69,7 +69,7 @@ namespace RAS
class LienCubicKELowRe class LienCubicKELowRe
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

40
src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LienLeschzinerLowRe, 0); defineTypeNameAndDebug(LienLeschzinerLowRe, 0);
addToRunTimeSelectionTable(turbulenceModel, LienLeschzinerLowRe, dictionary); addToRunTimeSelectionTable(RASmodel, LienLeschzinerLowRe, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,22 +52,22 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Am(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Am", 0.016)), Am(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Am", 0.016)),
Aepsilon Aepsilon
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Aepsilon", 0.263) RASmodelCoeffs_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
), ),
Amu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Amu", 0.00222)), Amu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
k_ k_
( (
@ -168,16 +168,16 @@ tmp<fvVectorMatrix> LienLeschzinerLowRe::divDevReff(volVectorField& U) const
bool LienLeschzinerLowRe::read() bool LienLeschzinerLowRe::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Am", Am); RASmodelCoeffs_.readIfPresent<scalar>("Am", Am);
turbulenceModelCoeffs_.readIfPresent<scalar>("Aepsilon", Aepsilon); RASmodelCoeffs_.readIfPresent<scalar>("Aepsilon", Aepsilon);
turbulenceModelCoeffs_.readIfPresent<scalar>("Amu", Amu); RASmodelCoeffs_.readIfPresent<scalar>("Amu", Amu);
return true; return true;
} }
@ -197,7 +197,7 @@ void LienLeschzinerLowRe::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef LienLeschzinerLowRe_H #ifndef LienLeschzinerLowRe_H
#define LienLeschzinerLowRe_H #define LienLeschzinerLowRe_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,7 +55,7 @@ namespace RAS
class LienLeschzinerLowRe class LienLeschzinerLowRe
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

4
src/turbulenceModels/RAS/incompressible/Make/files
View File

@ -1,5 +1,5 @@
turbulenceModel/turbulenceModel.C RASmodel/RASmodel.C
turbulenceModel/newTurbulenceModel.C RASmodel/newRASmodel.C
laminar/laminar.C laminar/laminar.C
kEpsilon/kEpsilon.C kEpsilon/kEpsilon.C
RNGkEpsilon/RNGkEpsilon.C RNGkEpsilon/RNGkEpsilon.C

48
src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(NonlinearKEShih, 0); defineTypeNameAndDebug(NonlinearKEShih, 0);
addToRunTimeSelectionTable(turbulenceModel, NonlinearKEShih, dictionary); addToRunTimeSelectionTable(RASmodel, NonlinearKEShih, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,23 +52,23 @@ NonlinearKEShih::NonlinearKEShih
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
A1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)), A1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A1", 1.25)),
A2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)), A2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A2", 1000.0)),
Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)), Ctau1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau1", -4.0)),
Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)), Ctau2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau2", 13.0)),
Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)), Ctau3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ctau3", -2.0)),
alphaKsi alphaKsi
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaKsi", 0.9)
), ),
k_ k_
@ -187,18 +187,18 @@ tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
bool NonlinearKEShih::read() bool NonlinearKEShih::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("A1", A1); RASmodelCoeffs_.readIfPresent<scalar>("A1", A1);
turbulenceModelCoeffs_.readIfPresent<scalar>("A2", A2); RASmodelCoeffs_.readIfPresent<scalar>("A2", A2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1); RASmodelCoeffs_.readIfPresent<scalar>("Ctau1", Ctau1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2); RASmodelCoeffs_.readIfPresent<scalar>("Ctau2", Ctau2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3); RASmodelCoeffs_.readIfPresent<scalar>("Ctau3", Ctau3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi); RASmodelCoeffs_.readIfPresent<scalar>("alphaKsi", alphaKsi);
return true; return true;
} }
@ -218,7 +218,7 @@ void NonlinearKEShih::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
gradU = fvc::grad(U_); gradU = fvc::grad(U_);

4
src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef NonlinearKEShih_H #ifndef NonlinearKEShih_H
#define NonlinearKEShih_H #define NonlinearKEShih_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class NonlinearKEShih class NonlinearKEShih
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

28
src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
View File

@ -39,7 +39,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(QZeta, 0); defineTypeNameAndDebug(QZeta, 0);
addToRunTimeSelectionTable(turbulenceModel, QZeta, dictionary); addToRunTimeSelectionTable(RASmodel, QZeta, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -77,18 +77,18 @@ QZeta::QZeta
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphaZeta alphaZeta
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaZeta", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaZeta", 0.76923)
), ),
Anisotropic Anisotropic
( (
turbulenceModelCoeffs_.lookupOrAddDefault<Switch>("anisotropic", false) RASmodelCoeffs_.lookupOrAddDefault<Switch>("anisotropic", false)
), ),
k_ k_
@ -206,13 +206,13 @@ tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
bool QZeta::read() bool QZeta::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaZeta", alphaZeta); RASmodelCoeffs_.readIfPresent<scalar>("alphaZeta", alphaZeta);
turbulenceModelCoeffs_.readIfPresent<Switch> RASmodelCoeffs_.readIfPresent<Switch>
( (
"anisotropic", "anisotropic",
Anisotropic Anisotropic
@ -236,7 +236,7 @@ void QZeta::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));

4
src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef QZeta_H #ifndef QZeta_H
#define QZeta_H #define QZeta_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace RAS
class QZeta class QZeta
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

42
src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C → src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -36,23 +36,24 @@ namespace incompressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defineTypeNameAndDebug(turbulenceModel, 0); defineTypeNameAndDebug(RASmodel, 0);
defineRunTimeSelectionTable(turbulenceModel, dictionary); defineRunTimeSelectionTable(RASmodel, dictionary);
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void turbulenceModel::printCoeffs() void RASmodel::printCoeffs()
{ {
if (printCoeffs_) if (printCoeffs_)
{ {
Info<< turbulenceModelCoeffs_; Info<< type() << "Coeffs" << nl
<< RASmodelCoeffs_;
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulenceModel::turbulenceModel RASmodel::RASmodel
( (
const word& type, const word& type,
const volVectorField& U, const volVectorField& U,
@ -81,10 +82,17 @@ turbulenceModel::turbulenceModel
turbulence_(lookup("turbulence")), turbulence_(lookup("turbulence")),
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)), printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
turbulenceModelCoeffs_(subDict(type + "Coeffs")), RASmodelCoeffs_(subDict(type + "Coeffs")),
kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))), kappa_
E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))), (
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>
(
"kappa",
0.4187
)
),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)),
yPlusLam_(yPlusLam(kappa_, E_)), yPlusLam_(yPlusLam(kappa_, E_)),
k0_("k0", dimVelocity*dimVelocity, SMALL), k0_("k0", dimVelocity*dimVelocity, SMALL),
@ -95,13 +103,13 @@ turbulenceModel::turbulenceModel
{} {}
turbulenceModel::~turbulenceModel() RASmodel::~RASmodel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E) scalar RASmodel::yPlusLam(const scalar kappa, const scalar E)
{ {
scalar ypl = 11.0; scalar ypl = 11.0;
@ -114,7 +122,7 @@ scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E)
} }
tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const tmp<scalarField> RASmodel::yPlus(const label patchNo) const
{ {
const fvPatch& curPatch = mesh_.boundary()[patchNo]; const fvPatch& curPatch = mesh_.boundary()[patchNo];
@ -123,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch)) if (typeid(curPatch) == typeid(wallFvPatch))
{ {
scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu")); scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu")));
Yp = pow(Cmu, 0.25)*y_[patchNo] Yp = pow(Cmu, 0.25)*y_[patchNo]
*sqrt(k()().boundaryField()[patchNo].patchInternalField()) *sqrt(k()().boundaryField()[patchNo].patchInternalField())
@ -133,7 +141,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
{ {
WarningIn WarningIn
( (
"tmp<scalarField> turbulenceModel::yPlus(const label patchNo)" "tmp<scalarField> RASmodel::yPlus(const label patchNo)"
) << "const : " << endl ) << "const : " << endl
<< "Patch " << patchNo << " is not a wall. Returning blank field" << "Patch " << patchNo << " is not a wall. Returning blank field"
<< endl; << endl;
@ -145,7 +153,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
} }
void turbulenceModel::correct() void RASmodel::correct()
{ {
if (mesh_.changing()) if (mesh_.changing())
{ {
@ -154,12 +162,12 @@ void turbulenceModel::correct()
} }
bool turbulenceModel::read() bool RASmodel::read()
{ {
if (regIOobject::read()) if (regIOobject::read())
{ {
lookup("turbulence") >> turbulence_; lookup("turbulence") >> turbulence_;
turbulenceModelCoeffs_ = subDict(type() + "Coeffs"); RASmodelCoeffs_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_; subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
subDict("wallFunctionCoeffs").lookup("E") >> E_; subDict("wallFunctionCoeffs").lookup("E") >> E_;

28
src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H → src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H
View File

@ -29,19 +29,19 @@ Description
Namespace for incompressible RAS turbulence models. Namespace for incompressible RAS turbulence models.
Class Class
Foam::incompressible::turbulenceModel Foam::incompressible::RASmodel
Description Description
Abstract base class for incompressible turbulence models. Abstract base class for incompressible turbulence models.
SourceFiles SourceFiles
turbulenceModel.C RASmodel.C
newTurbulenceModel.C newTurbulenceModel.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef turbulenceModel_H #ifndef RASmodel_H
#define turbulenceModel_H #define RASmodel_H
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H" #include "surfaceFields.H"
@ -64,10 +64,10 @@ namespace incompressible
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class turbulenceModel Declaration Class RASmodel Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class turbulenceModel class RASmodel
: :
public IOdictionary public IOdictionary
{ {
@ -86,7 +86,7 @@ protected:
Switch turbulence_; Switch turbulence_;
Switch printCoeffs_; Switch printCoeffs_;
dictionary turbulenceModelCoeffs_; dictionary RASmodelCoeffs_;
scalar kappa_; scalar kappa_;
scalar E_; scalar E_;
@ -112,16 +112,16 @@ private:
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
turbulenceModel(const turbulenceModel&); RASmodel(const RASmodel&);
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const turbulenceModel&); void operator=(const RASmodel&);
public: public:
//- Runtime type information //- Runtime type information
TypeName("turbulenceModel"); TypeName("RASmodel");
// Declare run-time constructor selection table // Declare run-time constructor selection table
@ -129,7 +129,7 @@ public:
declareRunTimeSelectionTable declareRunTimeSelectionTable
( (
autoPtr, autoPtr,
turbulenceModel, RASmodel,
dictionary, dictionary,
( (
const volVectorField& U, const volVectorField& U,
@ -143,7 +143,7 @@ public:
// Constructors // Constructors
//- Construct from components //- Construct from components
turbulenceModel RASmodel
( (
const word& type, const word& type,
const volVectorField& U, const volVectorField& U,
@ -155,7 +155,7 @@ public:
// Selectors // Selectors
//- Return a reference to the selected turbulence model //- Return a reference to the selected turbulence model
static autoPtr<turbulenceModel> New static autoPtr<RASmodel> New
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
@ -165,7 +165,7 @@ public:
// Destructor // Destructor
virtual ~turbulenceModel(); virtual ~RASmodel();
// Member Functions // Member Functions

0
src/turbulenceModels/RAS/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C → src/turbulenceModels/RAS/incompressible/RASmodel/checkIncompressibleTurbulenceModelsLock.C
View File

24
src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C → src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C
View File

@ -26,7 +26,7 @@ License
#include "error.H" #include "error.H"
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -37,17 +37,17 @@ namespace incompressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
autoPtr<turbulenceModel> turbulenceModel::New autoPtr<RASmodel> RASmodel::New
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
transportModel& transport transportModel& transport
) )
{ {
word turbulenceModelTypeName; word RASmodelTypeName;
// Enclose the creation of the turbulencePropertiesDict to ensure it is // Enclose the creation of the turbulencePropertiesDict to ensure it is
// deleted before the turbulenceModel is created otherwise the dictionary // deleted before the RASmodel is created otherwise the dictionary
// is entered in the database twice // is entered in the database twice
{ {
IOdictionary turbulencePropertiesDict IOdictionary turbulencePropertiesDict
@ -62,29 +62,29 @@ autoPtr<turbulenceModel> turbulenceModel::New
) )
); );
turbulencePropertiesDict.lookup("turbulenceModel") turbulencePropertiesDict.lookup("RASmodel")
>> turbulenceModelTypeName; >> RASmodelTypeName;
} }
Info<< "Selecting turbulence model " << turbulenceModelTypeName << endl; Info<< "Selecting turbulence model " << RASmodelTypeName << endl;
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(turbulenceModelTypeName); dictionaryConstructorTablePtr_->find(RASmodelTypeName);
if (cstrIter == dictionaryConstructorTablePtr_->end()) if (cstrIter == dictionaryConstructorTablePtr_->end())
{ {
FatalErrorIn FatalErrorIn
( (
"turbulenceModel::New(const volVectorField&, " "RASmodel::New(const volVectorField&, "
"const surfaceScalarField&, transportModel&)" "const surfaceScalarField&, transportModel&)"
) << "Unknown turbulenceModel type " << turbulenceModelTypeName ) << "Unknown RASmodel type " << RASmodelTypeName
<< endl << endl << endl << endl
<< "Valid turbulenceModel types are :" << endl << "Valid RASmodel types are :" << endl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()
<< exit(FatalError); << exit(FatalError);
} }
return autoPtr<turbulenceModel>(cstrIter()(U, phi, transport)); return autoPtr<RASmodel>(cstrIter()(U, phi, transport));
} }

36
src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(RNGkEpsilon, 0); defineTypeNameAndDebug(RNGkEpsilon, 0);
addToRunTimeSelectionTable(turbulenceModel, RNGkEpsilon, dictionary); addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -51,18 +51,18 @@ RNGkEpsilon::RNGkEpsilon
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.0845)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.0845)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.42)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.42)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.68)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.68)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.39)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.39)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 1.39) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 1.39)
), ),
eta0(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("eta0", 4.38)), eta0(RASmodelCoeffs_.lookupOrAddDefault<scalar>("eta0", 4.38)),
beta(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta", 0.012)), beta(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta", 0.012)),
k_ k_
( (
@ -154,15 +154,15 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
bool RNGkEpsilon::read() bool RNGkEpsilon::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("eta0", eta0); RASmodelCoeffs_.readIfPresent<scalar>("eta0", eta0);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta", beta); RASmodelCoeffs_.readIfPresent<scalar>("beta", beta);
return true; return true;
} }
@ -182,7 +182,7 @@ void RNGkEpsilon::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));

4
src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef RNGkEpsilon_H #ifndef RNGkEpsilon_H
#define RNGkEpsilon_H #define RNGkEpsilon_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -53,7 +53,7 @@ namespace RAS
class RNGkEpsilon class RNGkEpsilon
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

36
src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(SpalartAllmaras, 0); defineTypeNameAndDebug(SpalartAllmaras, 0);
addToRunTimeSelectionTable(turbulenceModel, SpalartAllmaras, dictionary); addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -112,17 +112,17 @@ SpalartAllmaras::SpalartAllmaras
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
alphaNut(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaNut", 1.5)), alphaNut(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaNut", 1.5)),
Cb1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb1", 0.1355)), Cb1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cb1", 0.1355)),
Cb2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb2", 0.622)), Cb2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cb2", 0.622)),
Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)), Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)),
Cw2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw2", 0.3)), Cw2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cw2", 0.3)),
Cw3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw3", 2.0)), Cw3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cw3", 2.0)),
Cv1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv1", 7.1)), Cv1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cv1", 7.1)),
Cv2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv2", 5.0)), Cv2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cv2", 5.0)),
nuTilda_ nuTilda_
( (
@ -259,17 +259,17 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
bool SpalartAllmaras::read() bool SpalartAllmaras::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaNut", alphaNut); RASmodelCoeffs_.readIfPresent<scalar>("alphaNut", alphaNut);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb1", Cb1); RASmodelCoeffs_.readIfPresent<scalar>("Cb1", Cb1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb2", Cb2); RASmodelCoeffs_.readIfPresent<scalar>("Cb2", Cb2);
Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2); Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cw2", Cw2); RASmodelCoeffs_.readIfPresent<scalar>("Cw2", Cw2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cw3", Cw3); RASmodelCoeffs_.readIfPresent<scalar>("Cw3", Cw3);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cv1", Cv1); RASmodelCoeffs_.readIfPresent<scalar>("Cv1", Cv1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cv2", Cv2); RASmodelCoeffs_.readIfPresent<scalar>("Cv2", Cv2);
return true; return true;
} }
@ -289,7 +289,7 @@ void SpalartAllmaras::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
View File

@ -52,7 +52,7 @@ SourceFiles
#ifndef SpalartAllmaras_H #ifndef SpalartAllmaras_H
#define SpalartAllmaras_H #define SpalartAllmaras_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -70,7 +70,7 @@ namespace RAS
class SpalartAllmaras class SpalartAllmaras
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

24
src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(kEpsilon, 0); defineTypeNameAndDebug(kEpsilon, 0);
addToRunTimeSelectionTable(turbulenceModel, kEpsilon, dictionary); addToRunTimeSelectionTable(RASmodel, kEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -52,14 +52,14 @@ kEpsilon::kEpsilon
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)), C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
), ),
k_ k_
@ -151,12 +151,12 @@ tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
bool kEpsilon::read() bool kEpsilon::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1); RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
return true; return true;
} }
@ -176,7 +176,7 @@ void kEpsilon::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_))); volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_)));

4
src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef kEpsilon_H #ifndef kEpsilon_H
#define kEpsilon_H #define kEpsilon_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -53,7 +53,7 @@ namespace RAS
class kEpsilon class kEpsilon
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

56
src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(kOmegaSST, 0); defineTypeNameAndDebug(kOmegaSST, 0);
addToRunTimeSelectionTable(turbulenceModel, kOmegaSST, dictionary); addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -94,36 +94,36 @@ kOmegaSST::kOmegaSST
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
alphaK1 alphaK1
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaK1", 0.85034) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaK1", 0.85034)
), ),
alphaK2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaK2", 1.0)), alphaK2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaK2", 1.0)),
alphaOmega1 alphaOmega1
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega1", 0.5) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega1", 0.5)
), ),
alphaOmega2 alphaOmega2
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega2", 0.85616) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaOmega2", 0.85616)
), ),
gamma1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("gamma1", 0.5532)), gamma1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("gamma1", 0.5532)),
gamma2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("gamma2", 0.4403)), gamma2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("gamma2", 0.4403)),
beta1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta1", 0.075)), beta1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta1", 0.075)),
beta2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta2", 0.0828)), beta2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("beta2", 0.0828)),
betaStar betaStar
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("betaStar", 0.09) RASmodelCoeffs_.lookupOrAddDefault<scalar>("betaStar", 0.09)
), ),
a1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("a1", 0.31)), a1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("a1", 0.31)),
c1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("c1", 10.0)), c1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("c1", 10.0)),
omega0_("omega0", dimless/dimTime, SMALL), omega0_("omega0", dimless/dimTime, SMALL),
omegaSmall_("omegaSmall", dimless/dimTime, SMALL), omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
y_(mesh_), y_(mesh_),
@ -216,28 +216,28 @@ tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
bool kOmegaSST::read() bool kOmegaSST::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaK1", alphaK1); RASmodelCoeffs_.readIfPresent<scalar>("alphaK1", alphaK1);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaK2", alphaK2); RASmodelCoeffs_.readIfPresent<scalar>("alphaK2", alphaK2);
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"alphaOmega1", "alphaOmega1",
alphaOmega1 alphaOmega1
); );
turbulenceModelCoeffs_.readIfPresent<scalar> RASmodelCoeffs_.readIfPresent<scalar>
( (
"alphaOmega2", "alphaOmega2",
alphaOmega2 alphaOmega2
); );
turbulenceModelCoeffs_.readIfPresent<scalar>("gamma1", gamma1); RASmodelCoeffs_.readIfPresent<scalar>("gamma1", gamma1);
turbulenceModelCoeffs_.readIfPresent<scalar>("gamma2", gamma2); RASmodelCoeffs_.readIfPresent<scalar>("gamma2", gamma2);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta1", beta1); RASmodelCoeffs_.readIfPresent<scalar>("beta1", beta1);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta2", beta2); RASmodelCoeffs_.readIfPresent<scalar>("beta2", beta2);
turbulenceModelCoeffs_.readIfPresent<scalar>("betaStar", betaStar); RASmodelCoeffs_.readIfPresent<scalar>("betaStar", betaStar);
turbulenceModelCoeffs_.readIfPresent<scalar>("a1", a1); RASmodelCoeffs_.readIfPresent<scalar>("a1", a1);
turbulenceModelCoeffs_.readIfPresent<scalar>("c1", c1); RASmodelCoeffs_.readIfPresent<scalar>("c1", c1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
return true; return true;
} }
@ -257,7 +257,7 @@ void kOmegaSST::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
if (mesh_.changing()) if (mesh_.changing())
{ {

4
src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
View File

@ -64,7 +64,7 @@ SourceFiles
#ifndef kOmegaSST_H #ifndef kOmegaSST_H
#define kOmegaSST_H #define kOmegaSST_H
#include "turbulenceModel.H" #include "RASmodel.H"
#include "wallDist.H" #include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -82,7 +82,7 @@ namespace RAS
class kOmegaSST class kOmegaSST
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

6
src/turbulenceModels/RAS/incompressible/laminar/laminar.C
View File

@ -39,7 +39,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(laminar, 0); defineTypeNameAndDebug(laminar, 0);
addToRunTimeSelectionTable(turbulenceModel, laminar, dictionary); addToRunTimeSelectionTable(RASmodel, laminar, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -50,7 +50,7 @@ laminar::laminar
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel) RASmodel(typeName, U, phi, lamTransportModel)
{} {}
@ -184,7 +184,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
bool laminar::read() bool laminar::read()
{ {
return turbulenceModel::read(); return RASmodel::read();
} }

4
src/turbulenceModels/RAS/incompressible/laminar/laminar.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef laminar_H #ifndef laminar_H
#define laminar_H #define laminar_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -53,7 +53,7 @@ namespace RAS
class laminar class laminar
: :
public turbulenceModel public RASmodel
{ {
public: public:

28
src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
View File

@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(realizableKE, 0); defineTypeNameAndDebug(realizableKE, 0);
addToRunTimeSelectionTable(turbulenceModel, realizableKE, dictionary); addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@ -92,16 +92,16 @@ realizableKE::realizableKE
transportModel& lamTransportModel transportModel& lamTransportModel
) )
: :
turbulenceModel(typeName, U, phi, lamTransportModel), RASmodel(typeName, U, phi, lamTransportModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)), Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
A0(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("A0", 4.0)), A0(RASmodelCoeffs_.lookupOrAddDefault<scalar>("A0", 4.0)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.9)), C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.9)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)), alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps alphaEps
( (
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.833333) RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.833333)
), ),
k_ k_
@ -195,13 +195,13 @@ tmp<fvVectorMatrix> realizableKE::divDevReff(volVectorField& U) const
bool realizableKE::read() bool realizableKE::read()
{ {
if (turbulenceModel::read()) if (RASmodel::read())
{ {
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu); RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("A0", A0); RASmodelCoeffs_.readIfPresent<scalar>("A0", A0);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2); RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak); RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps); RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
return true; return true;
} }
@ -221,7 +221,7 @@ void realizableKE::correct()
return; return;
} }
turbulenceModel::correct(); RASmodel::correct();
volTensorField gradU = fvc::grad(U_); volTensorField gradU = fvc::grad(U_);
volScalarField S2 = 2*magSqr(dev(symm(gradU))); volScalarField S2 = 2*magSqr(dev(symm(gradU)));

4
src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
View File

@ -48,7 +48,7 @@ SourceFiles
#ifndef realizableKE_H #ifndef realizableKE_H
#define realizableKE_H #define realizableKE_H
#include "turbulenceModel.H" #include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -65,7 +65,7 @@ namespace RAS
class realizableKE class realizableKE
: :
public turbulenceModel public RASmodel
{ {
// Private data // Private data

6
src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nutStandardRoughWallFunctionFvPatchScalarField.H" #include "nutStandardRoughWallFunctionFvPatchScalarField.H"
#include "turbulenceModel.H" #include "RASmodel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -120,8 +120,8 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes const Pstream::commsTypes
) )
{ {
const turbulenceModel& rasModel const RASmodel& rasModel
= db().lookupObject<turbulenceModel>("turbulenceProperties"); = db().lookupObject<RASmodel>("turbulenceProperties");
const scalar kappa = rasModel.kappa(); const scalar kappa = rasModel.kappa();
const scalar E = rasModel.E(); const scalar E = rasModel.E();

6
src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nutStandardWallFunctionFvPatchScalarField.H" #include "nutStandardWallFunctionFvPatchScalarField.H"
#include "turbulenceModel.H" #include "RASmodel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -105,8 +105,8 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes const Pstream::commsTypes
) )
{ {
const turbulenceModel& rasModel const RASmodel& rasModel
= db().lookupObject<turbulenceModel>("turbulenceProperties"); = db().lookupObject<RASmodel>("turbulenceProperties");
scalar kappa = rasModel.kappa(); scalar kappa = rasModel.kappa();
scalar E = rasModel.E(); scalar E = rasModel.E();

6
src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nutWallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H"
#include "turbulenceModel.H" #include "RASmodel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -97,8 +97,8 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes) void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
{ {
const turbulenceModel& rasModel const RASmodel& rasModel
= db().lookupObject<turbulenceModel>("turbulenceProperties"); = db().lookupObject<RASmodel>("turbulenceProperties");
scalar kappa = rasModel.kappa(); scalar kappa = rasModel.kappa();
scalar E = rasModel.E(); scalar E = rasModel.E();

6
src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
View File

@ -76,7 +76,7 @@ Description
label faceCelli = curPatch.faceCells()[facei]; label faceCelli = curPatch.faceCells()[facei];
scalar yPlus = scalar yPlus =
Cmu25*turbulenceModel::y_[patchi][facei] Cmu25*RASmodel::y_[patchi][facei]
*sqrt(k_[faceCelli]) *sqrt(k_[faceCelli])
/nuw[facei]; /nuw[facei];
@ -88,7 +88,7 @@ Description
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_*turbulenceModel::y_[patchi][facei]); /(kappa_*RASmodel::y_[patchi][facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -96,7 +96,7 @@ Description
(nutw[facei] + nuw[facei]) (nutw[facei] + nuw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*turbulenceModel::y_[patchi][facei]); /(kappa_*RASmodel::y_[patchi][facei]);
} }
} }
} }

2
tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
View File

@ -33,7 +33,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/turbulenceModel/turbulenceModel.H" #include "incompressible/RASmodel/RASmodel.H"
#include "MRFZones.H" #include "MRFZones.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
View File

@ -36,9 +36,9 @@
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::turbulenceModel> turbulence autoPtr<incompressible::RASmodel> turbulence
( (
incompressible::turbulenceModel::New(U, phi, laminarTransport) incompressible::RASmodel::New(U, phi, laminarTransport)
); );

2
tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel LaunderSharmaKE; RASmodel LaunderSharmaKE;
turbulence on; turbulence on;

2
tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel LaunderSharmaKE; RASmodel LaunderSharmaKE;
turbulence on; turbulence on;

2
tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
View File

@ -24,7 +24,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection // Turbulence model selection
turbulenceModel kEpsilon; RASmodel kEpsilon;
// Do you wish to calculate turbulence? // Do you wish to calculate turbulence?
turbulence on; turbulence on;

2
tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel laminar; RASmodel laminar;
turbulence off; turbulence off;

2
tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/engineFoam/kivaTest/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

4
tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
View File

@ -22,8 +22,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// turbulenceModel kEpsilon; // RASmodel kEpsilon;
turbulenceModel laminar; RASmodel laminar;
turbulence off; turbulence off;

2
tutorials/rasInterFoam/damBreak/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;
laminarCoeffs laminarCoeffs

2
tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;
laminarCoeffs laminarCoeffs

2
tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties
View File

@ -24,7 +24,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection // Turbulence model selection
turbulenceModel kOmegaSST; //kEpsilon; RASmodel kOmegaSST; //kEpsilon;
// Do you wish to calculate turbulence? // Do you wish to calculate turbulence?
turbulence on; turbulence on;

4
tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
View File

@ -41,9 +41,9 @@
Info<< "Creating turbulence model\n" << endl; Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::turbulenceModel> turbulence autoPtr<compressible::RASmodel> turbulence
( (
compressible::turbulenceModel::New compressible::RASmodel::New
( (
rho, rho,
U, U,

2
tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
View File

@ -32,7 +32,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "basicThermo.H" #include "basicThermo.H"
#include "compressible/turbulenceModel/turbulenceModel.H" #include "compressible/RASmodel/RASmodel.H"
#include "basicThermoCloud.H" #include "basicThermoCloud.H"
#include "basicKinematicCloud.H" #include "basicKinematicCloud.H"

2
tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties
View File

@ -24,7 +24,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection // Turbulence model selection
turbulenceModel kEpsilon; RASmodel kEpsilon;
// Do you wish to calculate turbulence? // Do you wish to calculate turbulence?
turbulence on; turbulence on;

2
tutorials/settlingFoam/dahl/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/settlingFoam/tank3D/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kOmegaSST; RASmodel kOmegaSST;
turbulence on; turbulence on;

4
tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
View File

@ -46,9 +46,9 @@
singlePhaseTransportModel laminarTransport(Urel, phi); singlePhaseTransportModel laminarTransport(Urel, phi);
autoPtr<incompressible::turbulenceModel> turbulence autoPtr<incompressible::RASmodel> turbulence
( (
incompressible::turbulenceModel::New(Urel, phi, laminarTransport) incompressible::RASmodel::New(Urel, phi, laminarTransport)
); );
Info<< "Creating SRF model\n" << endl; Info<< "Creating SRF model\n" << endl;

2
tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
View File

@ -33,7 +33,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/turbulenceModel/turbulenceModel.H" #include "incompressible/RASmodel/RASmodel.H"
#include "SRFModel.H" #include "SRFModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel LaunderSharmaKE; RASmodel LaunderSharmaKE;
turbulence on; turbulence on;

2
tutorials/sonicTurbFoam/prism/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/turbFoam/cavity/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence on; turbulence on;

2
tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties
View File

@ -22,7 +22,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
turbulenceModel kEpsilon; RASmodel kEpsilon;
turbulence off; turbulence off;