Skip to content

GitLab

Commit f290006a authored by Andrew Heather's avatar Andrew Heather
Browse files

consistency update - turbulenceModel -> RASmodel

parent e46a010a
Hide whitespace changes
Inline Side-by-side
src/turbulenceModels/RAS/compressible/LRR/LRR.C
View file @ f290006a
......@@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LRR, 0);
addToRunTimeSelectionTable(turbulenceModel, LRR, dictionary);
addToRunTimeSelectionTable(RASmodel, LRR, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
......@@ -53,25 +53,25 @@ LRR::LRR
basicThermo& thermophysicalModel
)
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)),
Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clrr1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)),
Clrr2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)),
C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
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
(
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_
(
......@@ -192,19 +192,19 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
bool LRR::read()
{
if (turbulenceModel::read())
if (RASmodel::read())
{
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>
RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
RASmodelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1);
RASmodelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2);
RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
RASmodelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
RASmodelCoeffs_.readIfPresent<scalar>
(
"couplingFactor",
couplingFactor_
......@@ -236,7 +236,7 @@ void LRR::correct()
return;
}
turbulenceModel::correct();
RASmodel::correct();
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
volScalarField G = 0.5*tr(P);
......
src/turbulenceModels/RAS/compressible/LRR/LRR.H
View file @ f290006a
......@@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLRR_H
#define compressibleLRR_H
#include "turbulenceModel.H"
#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -55,7 +55,7 @@ namespace RAS
class LRR
:
public turbulenceModel
public RASmodel
{
// Private data
......
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file @ f290006a
......@@ -42,7 +42,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderGibsonRSTM, dictionary);
addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
......@@ -55,27 +55,27 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
basicThermo& thermophysicalModel
)
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clg1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)),
Clg2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)),
C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)),
RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clg1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)),
Clg2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)),
C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
C1Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)),
C2Ref(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)),
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
(
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_),
......@@ -198,22 +198,22 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
bool LaunderGibsonRSTM::read()
{
if (turbulenceModel::read())
if (RASmodel::read())
{
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg1", Clg1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg2", Clg2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>
RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
RASmodelCoeffs_.readIfPresent<scalar>("Clg1", Clg1);
RASmodelCoeffs_.readIfPresent<scalar>("Clg2", Clg2);
RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
RASmodelCoeffs_.readIfPresent<scalar>("Cs", Cs);
RASmodelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
RASmodelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref);
RASmodelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref);
RASmodelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
RASmodelCoeffs_.readIfPresent<scalar>
(
"couplingFactor",
couplingFactor_
......@@ -245,7 +245,7 @@ void LaunderGibsonRSTM::correct()
return;
}
turbulenceModel::correct();
RASmodel::correct();
if (mesh_.changing())
{
......
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View file @ f290006a
......@@ -37,7 +37,7 @@ SourceFiles
#ifndef compressibleLaunderGibsonRSTM_H
#define compressibleLaunderGibsonRSTM_H
#include "turbulenceModel.H"
#include "RASmodel.H"
#include "wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -55,7 +55,7 @@ namespace RAS
class LaunderGibsonRSTM
:
public turbulenceModel
public RASmodel
{
// Private data
......
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
View file @ f290006a
......@@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LaunderSharmaKE, 0);
addToRunTimeSelectionTable(turbulenceModel, LaunderSharmaKE, dictionary);
addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
......@@ -69,18 +69,18 @@ LaunderSharmaKE::LaunderSharmaKE
basicThermo& thermophysicalModel
)
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
C3(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
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_
(
......@@ -179,14 +179,14 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
bool LaunderSharmaKE::read()
{
if (turbulenceModel::read())
if (RASmodel::read())
{
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
RASmodelCoeffs_.readIfPresent<scalar>("C3", C3);
RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true;
}
......@@ -206,7 +206,7 @@ void LaunderSharmaKE::correct()
return;
}
turbulenceModel::correct();
RASmodel::correct();
// Calculate parameters and coefficients for Launder-Sharma low-Reynolds
// number model
......
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
View file @ f290006a
......@@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLaunderSharmaKE_H
#define compressibleLaunderSharmaKE_H
#include "turbulenceModel.H"
#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -55,7 +55,7 @@ namespace RAS
class LaunderSharmaKE
:
public turbulenceModel
public RASmodel
{
// Private data
......
src/turbulenceModels/RAS/compressible/Make/files
View file @ f290006a
turbulenceModel/turbulenceModel.C
turbulenceModel/newTurbulenceModel.C
RASmodel/RASmodel.C
RASmodel/newRASmodel.C
laminar/laminar.C
kEpsilon/kEpsilon.C
RNGkEpsilon/RNGkEpsilon.C
......
src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C → src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
View file @ f290006a
......@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "turbulenceModel.H"
#include "RASmodel.H"
#include "wallDist.H"
#include "wallFvPatch.H"
#include "fixedValueFvPatchFields.H"
......@@ -38,24 +38,24 @@ namespace compressible
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(turbulenceModel, 0);
defineRunTimeSelectionTable(turbulenceModel, dictionary);
defineTypeNameAndDebug(RASmodel, 0);
defineRunTimeSelectionTable(RASmodel, dictionary);
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void turbulenceModel::printCoeffs()
void RASmodel::printCoeffs()
{
if (printCoeffs_)
{
Info<< type() << "Coeffs" << nl
<< turbulenceModelCoeffs_;
<< RASmodelCoeffs_;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulenceModel::turbulenceModel
RASmodel::RASmodel
(
const word& type,
const volScalarField& rho,
......@@ -86,7 +86,7 @@ turbulenceModel::turbulenceModel
turbulence_(lookup("turbulence")),
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
turbulenceModelCoeffs_(subDict(type + "Coeffs")),
RASmodelCoeffs_(subDict(type + "Coeffs")),
kappa_
(
......@@ -109,7 +109,7 @@ turbulenceModel::turbulenceModel
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E)
scalar RASmodel::yPlusLam(const scalar kappa, const scalar E)
{
scalar ypl = 11.0;
......@@ -122,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];
......@@ -131,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch))
{
scalar Cmu(readScalar(turbulenceModelCoeffs_.lookup("Cmu")));
scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu")));
Yp = pow(Cmu, 0.25)
*y_[patchNo]
......@@ -145,7 +145,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
{
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"
<< endl;
......@@ -156,7 +156,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
}
void turbulenceModel::correct()
void RASmodel::correct()
{
if (mesh_.changing())
{
......@@ -165,12 +165,12 @@ void turbulenceModel::correct()
}
bool turbulenceModel::read()
bool RASmodel::read()
{
if (regIOobject::read())
{
lookup("turbulence") >> turbulence_;
turbulenceModelCoeffs_ = subDict(type() + "Coeffs");
RASmodelCoeffs_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
subDict("wallFunctionCoeffs").lookup("E") >> E_;
......
src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H → src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H
View file @ f290006a
......@@ -30,20 +30,20 @@ Description
Class
Foam::compressible::turbulenceModel
Foam::compressible::RASmodel
Description
Abstract base class for turbulence models for compressible and combusting
flows.
SourceFiles
turbulenceModel.C
RASmodel.C
newTurbulenceModel.C
\*---------------------------------------------------------------------------*/
#ifndef compressibleTurbulenceModel_H
#define compressibleTurbulenceModel_H
#ifndef compressibleRASModel_H
#define compressibleRASModel_H
#include "volFields.H"
#include "surfaceFields.H"
......@@ -66,10 +66,10 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
Class turbulenceModel Declaration
Class RASmodel Declaration
\*---------------------------------------------------------------------------*/
class turbulenceModel
class RASmodel
:
public IOdictionary
{
......@@ -89,7 +89,7 @@ protected:
Switch turbulence_;
Switch printCoeffs_;
dictionary turbulenceModelCoeffs_;
dictionary RASmodelCoeffs_;
scalar kappa_;
scalar E_;
......@@ -121,16 +121,16 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
turbulenceModel(const turbulenceModel&);
RASmodel(const RASmodel&);
//- Disallow default bitwise assignment
void operator=(const turbulenceModel&);
void operator=(const RASmodel&);
public:
//- Runtime type information
TypeName("turbulenceModel");
TypeName("RASmodel");
// Declare run-time constructor selection table
......@@ -138,7 +138,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
turbulenceModel,
RASmodel,
dictionary,
(
const volScalarField& rho,
......@@ -153,7 +153,7 @@ public:
// Constructors
//- Construct from components
turbulenceModel
RASmodel
(
const word& type,
const volScalarField& rho,
......@@ -166,7 +166,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
static autoPtr<turbulenceModel> New
static autoPtr<RASmodel> New
(
const volScalarField& rho,
const volVectorField& U,
......@@ -177,7 +177,7 @@ public:
// Destructor
virtual ~turbulenceModel()
virtual ~RASmodel()
{}
......
src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C → src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C
View file @ f290006a
......@@ -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 volVectorField& U,
......@@ -43,10 +43,10 @@ autoPtr<turbulenceModel> turbulenceModel::New
basicThermo& thermophysicalModel
)
{
word turbulenceModelTypeName;
word RASmodelTypeName;
// 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
{
IOdictionary turbulencePropertiesDict
......@@ -61,30 +61,30 @@ autoPtr<turbulenceModel> turbulenceModel::New
)
);
turbulencePropertiesDict.lookup("turbulenceModel")
>> turbulenceModelTypeName;
turbulencePropertiesDict.lookup("RASmodel")
>> RASmodelTypeName;
}
Info<< "Selecting turbulence model " << turbulenceModelTypeName << endl;
Info<< "Selecting turbulence model " << RASmodelTypeName << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(turbulenceModelTypeName);
dictionaryConstructorTablePtr_->find(RASmodelTypeName);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"turbulenceModel::New(const volScalarField& rho, "
"RASmodel::New(const volScalarField& rho, "
"const volVectorField& U, const surfaceScalarField& phi, "
"basicThermo&)"
) << "Unknown turbulenceModel type " << turbulenceModelTypeName
) << "Unknown RASmodel type " << RASmodelTypeName
<< endl << endl
<< "Valid turbulenceModel types are :" << endl
<< "Valid RASmodel types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< exit(FatalError);
}
return autoPtr<turbulenceModel>
return autoPtr<RASmodel>
(