diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C index 8e3c6a488a..7a95ea699d 100644 --- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C +++ b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C @@ -45,7 +45,8 @@ void LESmodel::printCoeffs() { if (printCoeffs_) { - Info<< LESmodelProperties_; + Info<< type() << "Coeffs" << nl + << LESmodelProperties_; } } diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C index 75690169d0..5d045df287 100644 --- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C +++ b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C @@ -43,7 +43,8 @@ void LESmodel::printCoeffs() { if (printCoeffs_) { - Info<< LESmodelProperties_; + Info<< type() << "Coeffs" << nl + << LESmodelProperties_; } } diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C index 544727b8ac..c7ef99d910 100644 --- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C +++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C @@ -93,12 +93,12 @@ void LRRDiffStress::correct(const tmp& tgradU) forAll(B_, celli) { - B_[celli].component(tensor::XX) = - max(B_[celli].component(tensor::XX), k0().value()); - B_[celli].component(tensor::YY) = - max(B_[celli].component(tensor::YY), k0().value()); - B_[celli].component(tensor::ZZ) = - max(B_[celli].component(tensor::ZZ), k0().value()); + B_[celli].component(symmTensor::XX) = + max(B_[celli].component(symmTensor::XX), k0().value()); + B_[celli].component(symmTensor::YY) = + max(B_[celli].component(symmTensor::YY), k0().value()); + B_[celli].component(symmTensor::ZZ) = + max(B_[celli].component(symmTensor::ZZ), k0().value()); } K = 0.5*tr(B_); diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.C b/src/turbulenceModels/RAS/compressible/LRR/LRR.C index 6127a63e3f..d2953fd33e 100644 --- a/src/turbulenceModels/RAS/compressible/LRR/LRR.C +++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.C @@ -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), + RASmodel(typeName, rho, U, phi, thermophysicalModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault("Clrr1", 1.8)), - Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault("Clrr2", 0.6)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - Cs(turbulenceModelCoeffs_.lookupOrAddDefault("Cs", 0.25)), - Ceps(turbulenceModelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Clrr1(RASmodelCoeffs_.lookupOrAddDefault("Clrr1", 1.8)), + Clrr2(RASmodelCoeffs_.lookupOrAddDefault("Clrr2", 0.6)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cs(RASmodelCoeffs_.lookupOrAddDefault("Cs", 0.25)), + Ceps(RASmodelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), couplingFactor_ ( - turbulenceModelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) + RASmodelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) ), - alphaR(turbulenceModelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), + alphaR(RASmodelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), R_ ( @@ -192,19 +192,19 @@ tmp LRR::divDevRhoReff(volVectorField& U) const bool LRR::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("Clrr1", Clrr1); - turbulenceModelCoeffs_.readIfPresent("Clrr2", Clrr2); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("Cs", Cs); - turbulenceModelCoeffs_.readIfPresent("Ceps", Ceps); - turbulenceModelCoeffs_.readIfPresent("alphaR", alphaR); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("Clrr1", Clrr1); + RASmodelCoeffs_.readIfPresent("Clrr2", Clrr2); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("Cs", Cs); + RASmodelCoeffs_.readIfPresent("Ceps", Ceps); + RASmodelCoeffs_.readIfPresent("alphaR", alphaR); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent ( "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); diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.H b/src/turbulenceModels/RAS/compressible/LRR/LRR.H index 3ac8c47a00..1c6dcf4888 100644 --- a/src/turbulenceModels/RAS/compressible/LRR/LRR.H +++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.H @@ -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 diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C index d7bac108de..cfc478e966 100644 --- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -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), + RASmodel(typeName, rho, U, phi, thermophysicalModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Clg1(turbulenceModelCoeffs_.lookupOrAddDefault("Clg1", 1.8)), - Clg2(turbulenceModelCoeffs_.lookupOrAddDefault("Clg2", 0.6)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - Cs(turbulenceModelCoeffs_.lookupOrAddDefault("Cs", 0.25)), - Ceps(turbulenceModelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), - C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault("C1Ref", 0.5)), - C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault("C2Ref", 0.3)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Clg1(RASmodelCoeffs_.lookupOrAddDefault("Clg1", 1.8)), + Clg2(RASmodelCoeffs_.lookupOrAddDefault("Clg2", 0.6)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cs(RASmodelCoeffs_.lookupOrAddDefault("Cs", 0.25)), + Ceps(RASmodelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), + C1Ref(RASmodelCoeffs_.lookupOrAddDefault("C1Ref", 0.5)), + C2Ref(RASmodelCoeffs_.lookupOrAddDefault("C2Ref", 0.3)), couplingFactor_ ( - turbulenceModelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) + RASmodelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) ), - alphaR(turbulenceModelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), + alphaR(RASmodelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), y_(mesh_), @@ -198,22 +198,22 @@ tmp LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const bool LaunderGibsonRSTM::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("Clg1", Clg1); - turbulenceModelCoeffs_.readIfPresent("Clg2", Clg2); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("Cs", Cs); - turbulenceModelCoeffs_.readIfPresent("Ceps", Ceps); - turbulenceModelCoeffs_.readIfPresent("C1Ref", C1Ref); - turbulenceModelCoeffs_.readIfPresent("C2Ref", C2Ref); - turbulenceModelCoeffs_.readIfPresent("alphaR", alphaR); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("Clg1", Clg1); + RASmodelCoeffs_.readIfPresent("Clg2", Clg2); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("Cs", Cs); + RASmodelCoeffs_.readIfPresent("Ceps", Ceps); + RASmodelCoeffs_.readIfPresent("C1Ref", C1Ref); + RASmodelCoeffs_.readIfPresent("C2Ref", C2Ref); + RASmodelCoeffs_.readIfPresent("alphaR", alphaR); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("alphah", alphah); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent ( "couplingFactor", couplingFactor_ @@ -245,7 +245,7 @@ void LaunderGibsonRSTM::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H index c6e9128711..3942243c9d 100644 --- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -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 diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C index 90ff2b01c2..d4a4f80f58 100644 --- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C @@ -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("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - C3(turbulenceModelCoeffs_.lookupOrAddDefault("C3", -0.33)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + C3(RASmodelCoeffs_.lookupOrAddDefault("C3", -0.33)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), k_ ( @@ -179,14 +179,14 @@ tmp LaunderSharmaKE::divDevRhoReff(volVectorField& U) const bool LaunderSharmaKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("C3", C3); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("C3", C3); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("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 diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H index 07eda8047b..0ff1754957 100644 --- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H @@ -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 diff --git a/src/turbulenceModels/RAS/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files index 7463160939..03430510a0 100644 --- a/src/turbulenceModels/RAS/compressible/Make/files +++ b/src/turbulenceModels/RAS/compressible/Make/files @@ -1,5 +1,5 @@ -turbulenceModel/turbulenceModel.C -turbulenceModel/newTurbulenceModel.C +RASmodel/RASmodel.C +RASmodel/newRASmodel.C laminar/laminar.C kEpsilon/kEpsilon.C RNGkEpsilon/RNGkEpsilon.C diff --git a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C similarity index 82% rename from src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C rename to src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C index b4c41aaf80..ca5bc76411 100644 --- a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" #include "wallFvPatch.H" #include "fixedValueFvPatchFields.H" @@ -38,23 +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<< turbulenceModelCoeffs_; + Info<< type() << "Coeffs" << nl + << RASmodelCoeffs_; } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -turbulenceModel::turbulenceModel +RASmodel::RASmodel ( const word& type, const volScalarField& rho, @@ -85,10 +86,17 @@ turbulenceModel::turbulenceModel turbulence_(lookup("turbulence")), printCoeffs_(lookupOrDefault("printCoeffs", false)), - turbulenceModelCoeffs_(subDict(type + "Coeffs")), + RASmodelCoeffs_(subDict(type + "Coeffs")), - kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))), - E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))), + kappa_ + ( + subDict("wallFunctionCoeffs").lookupOrAddDefault + ( + "kappa", + 0.4187 + ) + ), + E_(subDict("wallFunctionCoeffs").lookupOrAddDefault("E", 9.0)), yPlusLam_(yPlusLam(kappa_, E_)), k0_("k0", dimVelocity*dimVelocity, SMALL), @@ -101,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; @@ -114,7 +122,7 @@ scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E) } -tmp turbulenceModel::yPlus(const label patchNo) const +tmp RASmodel::yPlus(const label patchNo) const { const fvPatch& curPatch = mesh_.boundary()[patchNo]; @@ -123,7 +131,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const if (typeid(curPatch) == typeid(wallFvPatch)) { - scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu")); + scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu"))); Yp = pow(Cmu, 0.25) *y_[patchNo] @@ -137,7 +145,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const { WarningIn ( - "tmp turbulenceModel::yPlus(const label patchNo) const" + "tmp RASmodel::yPlus(const label patchNo) const" ) << "Patch " << patchNo << " is not a wall. Returning blank field" << endl; @@ -148,7 +156,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const } -void turbulenceModel::correct() +void RASmodel::correct() { if (mesh_.changing()) { @@ -157,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_; diff --git a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H similarity index 93% rename from src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H rename to src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H index d0a3b2ae1a..42a5f432a5 100644 --- a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H @@ -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 New + static autoPtr New ( const volScalarField& rho, const volVectorField& U, @@ -177,7 +177,7 @@ public: // Destructor - virtual ~turbulenceModel() + virtual ~RASmodel() {} diff --git a/src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C b/src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C similarity index 79% rename from src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C rename to src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C index a688aaeca9..ca151329ab 100644 --- a/src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C +++ b/src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,7 +35,7 @@ namespace compressible // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -autoPtr turbulenceModel::New +autoPtr RASmodel::New ( const volScalarField& rho, const volVectorField& U, @@ -43,10 +43,10 @@ autoPtr 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::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 + return autoPtr ( cstrIter()(rho, U, phi, thermophysicalModel) ); diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C index 072e8d65e3..2865c989bf 100644 --- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(RNGkEpsilon, 0); -addToRunTimeSelectionTable(turbulenceModel, RNGkEpsilon, dictionary); +addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -53,20 +53,20 @@ RNGkEpsilon::RNGkEpsilon basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel), + RASmodel(typeName, rho, U, phi, thermophysicalModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.0845)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.42)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.68)), - C3(turbulenceModelCoeffs_.lookupOrAddDefault("C3", -0.33)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.39)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.0845)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.42)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.68)), + C3(RASmodelCoeffs_.lookupOrAddDefault("C3", -0.33)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.39)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 1.39) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 1.39) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), - eta0(turbulenceModelCoeffs_.lookupOrAddDefault("eta0", 4.38)), - beta(turbulenceModelCoeffs_.lookupOrAddDefault("beta", 0.012)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + eta0(RASmodelCoeffs_.lookupOrAddDefault("eta0", 4.38)), + beta(RASmodelCoeffs_.lookupOrAddDefault("beta", 0.012)), k_ ( @@ -167,17 +167,17 @@ tmp RNGkEpsilon::divDevRhoReff(volVectorField& U) const bool RNGkEpsilon::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("C3", C3); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); - turbulenceModelCoeffs_.readIfPresent("eta0", eta0); - turbulenceModelCoeffs_.readIfPresent("beta", beta); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("C3", C3); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("eta0", eta0); + RASmodelCoeffs_.readIfPresent("beta", beta); return true; } @@ -197,7 +197,7 @@ void RNGkEpsilon::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H index 3d70f721a5..2168a37504 100644 --- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H @@ -37,7 +37,7 @@ SourceFiles #ifndef compressibleRNGkEpsilon_H #define compressibleRNGkEpsilon_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class RNGkEpsilon : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C index d6bd52b61a..a14780e0c6 100644 --- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(SpalartAllmaras, 0); -addToRunTimeSelectionTable(turbulenceModel, SpalartAllmaras, dictionary); +addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -113,21 +113,21 @@ SpalartAllmaras::SpalartAllmaras basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel), + RASmodel(typeName, rho, U, phi, thermophysicalModel), alphaNut ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaNut", 1.5) + RASmodelCoeffs_.lookupOrAddDefault("alphaNut", 1.5) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), - Cb1(turbulenceModelCoeffs_.lookupOrAddDefault("Cb1", 0.1355)), - Cb2(turbulenceModelCoeffs_.lookupOrAddDefault("Cb2", 0.622)), + Cb1(RASmodelCoeffs_.lookupOrAddDefault("Cb1", 0.1355)), + Cb2(RASmodelCoeffs_.lookupOrAddDefault("Cb2", 0.622)), Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)), - Cw2(turbulenceModelCoeffs_.lookupOrAddDefault("Cw2", 0.3)), - Cw3(turbulenceModelCoeffs_.lookupOrAddDefault("Cw3", 2.0)), - Cv1(turbulenceModelCoeffs_.lookupOrAddDefault("Cv1", 7.1)), - Cv2(turbulenceModelCoeffs_.lookupOrAddDefault("Cv2", 5.0)), + Cw2(RASmodelCoeffs_.lookupOrAddDefault("Cw2", 0.3)), + Cw3(RASmodelCoeffs_.lookupOrAddDefault("Cw3", 2.0)), + Cv1(RASmodelCoeffs_.lookupOrAddDefault("Cv1", 7.1)), + Cv2(RASmodelCoeffs_.lookupOrAddDefault("Cv2", 5.0)), nuTilda_ ( @@ -217,18 +217,18 @@ tmp SpalartAllmaras::divDevRhoReff(volVectorField& U) const bool SpalartAllmaras::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("alphaNut", alphaNut); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("alphaNut", alphaNut); + RASmodelCoeffs_.readIfPresent("alphah", alphah); - turbulenceModelCoeffs_.readIfPresent("Cb1", Cb1); - turbulenceModelCoeffs_.readIfPresent("Cb2", Cb2); + RASmodelCoeffs_.readIfPresent("Cb1", Cb1); + RASmodelCoeffs_.readIfPresent("Cb2", Cb2); Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2); - turbulenceModelCoeffs_.readIfPresent("Cw2", Cw2); - turbulenceModelCoeffs_.readIfPresent("Cw3", Cw3); - turbulenceModelCoeffs_.readIfPresent("Cv1", Cv1); - turbulenceModelCoeffs_.readIfPresent("Cv2", Cv2); + RASmodelCoeffs_.readIfPresent("Cw2", Cw2); + RASmodelCoeffs_.readIfPresent("Cw3", Cw3); + RASmodelCoeffs_.readIfPresent("Cv1", Cv1); + RASmodelCoeffs_.readIfPresent("Cv2", Cv2); return true; } @@ -248,7 +248,7 @@ void SpalartAllmaras::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H index 08b41ddb11..4a70f0cb79 100644 --- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H @@ -53,7 +53,7 @@ SourceFiles #ifndef compressibleSpalartAllmaras_H #define combressibleSpalartAllmaras_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,7 +71,7 @@ namespace RAS class SpalartAllmaras : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C index 6545b763d9..072b477b77 100644 --- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(kEpsilon, 0); -addToRunTimeSelectionTable(turbulenceModel, kEpsilon, dictionary); +addToRunTimeSelectionTable(RASmodel, kEpsilon, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,18 +52,18 @@ kEpsilon::kEpsilon basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel), + RASmodel(typeName, rho, U, phi, thermophysicalModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - C3(turbulenceModelCoeffs_.lookupOrAddDefault("C3", -0.33)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + C3(RASmodelCoeffs_.lookupOrAddDefault("C3", -0.33)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), k_ ( @@ -165,15 +165,15 @@ tmp kEpsilon::divDevRhoReff(volVectorField& U) const bool kEpsilon::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("C3", C3); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("C3", C3); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("alphah", alphah); return true; } @@ -194,7 +194,7 @@ void kEpsilon::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H index 3a58da60b3..35daac84c4 100644 --- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H @@ -37,7 +37,7 @@ SourceFiles #ifndef compressiblekEpsilon_H #define compressiblekEpsilon_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class kEpsilon : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C index 3369960b4f..390f47c9dc 100644 --- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(kOmegaSST, 0); -addToRunTimeSelectionTable(turbulenceModel, kOmegaSST, dictionary); +addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -95,34 +95,34 @@ kOmegaSST::kOmegaSST basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel), + RASmodel(typeName, rho, U, phi, thermophysicalModel), alphaK1 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaK1", 0.85034) + RASmodelCoeffs_.lookupOrAddDefault("alphaK1", 0.85034) ), - alphaK2(turbulenceModelCoeffs_.lookupOrAddDefault("alphaK2", 1.0)), + alphaK2(RASmodelCoeffs_.lookupOrAddDefault("alphaK2", 1.0)), alphaOmega1 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaOmega1", 0.5) + RASmodelCoeffs_.lookupOrAddDefault("alphaOmega1", 0.5) ), alphaOmega2 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaOmega2", 0.85616) + RASmodelCoeffs_.lookupOrAddDefault("alphaOmega2", 0.85616) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), - gamma1(turbulenceModelCoeffs_.lookupOrAddDefault("gamma1", 0.5532)), - gamma2(turbulenceModelCoeffs_.lookupOrAddDefault("gamma2", 0.4403)), - beta1(turbulenceModelCoeffs_.lookupOrAddDefault("beta1", 0.075)), - beta2(turbulenceModelCoeffs_.lookupOrAddDefault("beta2", 0.0828)), - betaStar(turbulenceModelCoeffs_.lookupOrAddDefault("betaStar", 0.09)), - a1(turbulenceModelCoeffs_.lookupOrAddDefault("a1", 0.31)), - c1(turbulenceModelCoeffs_.lookupOrAddDefault("c1", 10.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + gamma1(RASmodelCoeffs_.lookupOrAddDefault("gamma1", 0.5532)), + gamma2(RASmodelCoeffs_.lookupOrAddDefault("gamma2", 0.4403)), + beta1(RASmodelCoeffs_.lookupOrAddDefault("beta1", 0.075)), + beta2(RASmodelCoeffs_.lookupOrAddDefault("beta2", 0.0828)), + betaStar(RASmodelCoeffs_.lookupOrAddDefault("betaStar", 0.09)), + a1(RASmodelCoeffs_.lookupOrAddDefault("a1", 0.31)), + c1(RASmodelCoeffs_.lookupOrAddDefault("c1", 10.0)), omega0_("omega0", dimless/dimTime, SMALL), omegaSmall_("omegaSmall", dimless/dimTime, SMALL), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), y_(mesh_), @@ -225,29 +225,29 @@ tmp kOmegaSST::divDevRhoReff(volVectorField& U) const bool kOmegaSST::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("alphaK1", alphaK1); - turbulenceModelCoeffs_.readIfPresent("alphaK2", alphaK2); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent("alphaK1", alphaK1); + RASmodelCoeffs_.readIfPresent("alphaK2", alphaK2); + RASmodelCoeffs_.readIfPresent ( "alphaOmega1", alphaOmega1 ); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent ( "alphaOmega2", alphaOmega2 ); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); - turbulenceModelCoeffs_.readIfPresent("gamma1", gamma1); - turbulenceModelCoeffs_.readIfPresent("gamma2", gamma2); - turbulenceModelCoeffs_.readIfPresent("beta1", beta1); - turbulenceModelCoeffs_.readIfPresent("beta2", beta2); - turbulenceModelCoeffs_.readIfPresent("betaStar", betaStar); - turbulenceModelCoeffs_.readIfPresent("a1", a1); - turbulenceModelCoeffs_.readIfPresent("c1", c1); - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("gamma1", gamma1); + RASmodelCoeffs_.readIfPresent("gamma2", gamma2); + RASmodelCoeffs_.readIfPresent("beta1", beta1); + RASmodelCoeffs_.readIfPresent("beta2", beta2); + RASmodelCoeffs_.readIfPresent("betaStar", betaStar); + RASmodelCoeffs_.readIfPresent("a1", a1); + RASmodelCoeffs_.readIfPresent("c1", c1); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); return true; } @@ -269,7 +269,7 @@ void kOmegaSST::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H index 717403d3e8..e0f124dcbf 100644 --- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H @@ -63,7 +63,7 @@ SourceFiles #ifndef compressiblekOmegaSST_H #define compressiblekOmegaSST_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,7 +81,7 @@ namespace RAS class kOmegaSST : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.C b/src/turbulenceModels/RAS/compressible/laminar/laminar.C index 291f40e585..e325766e27 100644 --- a/src/turbulenceModels/RAS/compressible/laminar/laminar.C +++ b/src/turbulenceModels/RAS/compressible/laminar/laminar.C @@ -39,7 +39,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(laminar, 0); -addToRunTimeSelectionTable(turbulenceModel, laminar, dictionary); +addToRunTimeSelectionTable(RASmodel, laminar, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ laminar::laminar basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel) + RASmodel(typeName, rho, U, phi, thermophysicalModel) {} @@ -178,7 +178,7 @@ tmp laminar::divDevRhoReff(volVectorField& U) const bool laminar::read() { - return turbulenceModel::read(); + return RASmodel::read(); } diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.H b/src/turbulenceModels/RAS/compressible/laminar/laminar.H index 31efee8b39..d9a3dd61fc 100644 --- a/src/turbulenceModels/RAS/compressible/laminar/laminar.H +++ b/src/turbulenceModels/RAS/compressible/laminar/laminar.H @@ -37,7 +37,7 @@ SourceFiles #ifndef compressibleLaminar_H #define compressibleLaminar_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class laminar : - public turbulenceModel + public RASmodel { public: diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C index f7aa5b9fef..6f2030f389 100644 --- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C +++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(realizableKE, 0); -addToRunTimeSelectionTable(turbulenceModel, realizableKE, dictionary); +addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -93,17 +93,17 @@ realizableKE::realizableKE basicThermo& thermophysicalModel ) : - turbulenceModel(typeName, rho, U, phi, thermophysicalModel), + RASmodel(typeName, rho, U, phi, thermophysicalModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - A0(turbulenceModelCoeffs_.lookupOrAddDefault("A0", 4.0)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.9)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + A0(RASmodelCoeffs_.lookupOrAddDefault("A0", 4.0)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.9)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.833333) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.833333) ), - alphah(turbulenceModelCoeffs_.lookupOrAddDefault("alphah", 1.0)), + alphah(RASmodelCoeffs_.lookupOrAddDefault("alphah", 1.0)), k_ ( @@ -206,14 +206,14 @@ tmp realizableKE::divDevRhoReff(volVectorField& U) const bool realizableKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("A0", A0); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("alphah", alphah); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("A0", A0); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("alphah", alphah); return true; } @@ -233,7 +233,7 @@ void realizableKE::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_)); diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H index d8f1d10e11..3b4b7d340a 100644 --- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H +++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H @@ -47,7 +47,7 @@ SourceFiles #ifndef realizableKE_H #define realizableKE_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,7 +64,7 @@ namespace RAS class realizableKE : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C index 64d45abbdf..487a50f696 100644 --- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ #include "mutStandardRoughWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "RASmodel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -120,8 +120,8 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate const Pstream::commsTypes ) { - const turbulenceModel& rasModel - = db().lookupObject("turbulenceProperties"); + const RASmodel& rasModel + = db().lookupObject("turbulenceProperties"); const scalar kappa = rasModel.kappa(); const scalar E = rasModel.E(); diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H index 00c5fea678..b234ffa06b 100644 --- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H +++ b/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H @@ -78,7 +78,7 @@ Description label faceCelli = curPatch.faceCells()[facei]; scalar yPlus = - Cmu25*turbulenceModel::y_[patchi][facei] + Cmu25*RASmodel::y_[patchi][facei] *sqrt(k_[faceCelli]) /(muw[facei]/rhow[facei]); @@ -90,7 +90,7 @@ Description epsilon_[faceCelli] += Cmu75*pow(k_[faceCelli], 1.5) - /(kappa_*turbulenceModel::y_[patchi][facei]); + /(kappa_*RASmodel::y_[patchi][facei]); if (yPlus > yPlusLam_) { @@ -98,7 +98,7 @@ Description (mutw[facei] + muw[facei]) *magFaceGradU[facei] *Cmu25*sqrt(k_[faceCelli]) - /(kappa_*turbulenceModel::y_[patchi][facei]); + /(kappa_*RASmodel::y_[patchi][facei]); } } } diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H index 8103b850b5..e60a34d594 100644 --- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H +++ b/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H @@ -51,7 +51,7 @@ Description label faceCelli = curPatch.faceCells()[facei]; scalar yPlus = - Cmu25*turbulenceModel::y_[patchi][facei] + Cmu25*RASmodel::y_[patchi][facei] *sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]); if (yPlus > yPlusLam_) diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C index 1151255d8b..b0e3cea24b 100644 --- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C +++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LRR, 0); -addToRunTimeSelectionTable(turbulenceModel, LRR, dictionary); +addToRunTimeSelectionTable(RASmodel, LRR, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,22 +52,22 @@ LRR::LRR transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault("Clrr1", 1.8)), - Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault("Clrr2", 0.6)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - Cs(turbulenceModelCoeffs_.lookupOrAddDefault("Cs", 0.25)), - Ceps(turbulenceModelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Clrr1(RASmodelCoeffs_.lookupOrAddDefault("Clrr1", 1.8)), + Clrr2(RASmodelCoeffs_.lookupOrAddDefault("Clrr2", 0.6)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cs(RASmodelCoeffs_.lookupOrAddDefault("Cs", 0.25)), + Ceps(RASmodelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), couplingFactor_ ( - turbulenceModelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) + RASmodelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) ), R_ @@ -176,18 +176,18 @@ tmp LRR::divDevReff(volVectorField& U) const bool LRR::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("Clrr1", Clrr1); - turbulenceModelCoeffs_.readIfPresent("Clrr2", Clrr2); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("Cs", Cs); - turbulenceModelCoeffs_.readIfPresent("Ceps", Ceps); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("Clrr1", Clrr1); + RASmodelCoeffs_.readIfPresent("Clrr2", Clrr2); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("Cs", Cs); + RASmodelCoeffs_.readIfPresent("Ceps", Ceps); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent ( "couplingFactor", couplingFactor_ @@ -219,7 +219,7 @@ void LRR::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_)); volScalarField G = 0.5*tr(P); diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H index e4c8c9f338..5384420a05 100644 --- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H +++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H @@ -37,7 +37,7 @@ SourceFiles #ifndef LRR_H #define LRR_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class LRR : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C index eaa3da2984..562a1640df 100644 --- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C @@ -39,7 +39,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LamBremhorstKE, 0); -addToRunTimeSelectionTable(turbulenceModel, LamBremhorstKE, dictionary); +addToRunTimeSelectionTable(RASmodel, LamBremhorstKE, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,14 +51,14 @@ LamBremhorstKE::LamBremhorstKE transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), k_ @@ -158,12 +158,12 @@ tmp LamBremhorstKE::divDevReff(volVectorField& U) const bool LamBremhorstKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); return true; } @@ -183,7 +183,7 @@ void LamBremhorstKE::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H index 4a9f48ecd4..ef44721350 100644 --- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H +++ b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H @@ -37,7 +37,7 @@ SourceFiles #ifndef LamBremhorstKE_H #define LamBremhorstKE_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +55,7 @@ namespace RAS class LamBremhorstKE : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C index d2fb24cde5..0e9346319c 100644 --- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LaunderGibsonRSTM, 0); -addToRunTimeSelectionTable(turbulenceModel, LaunderGibsonRSTM, dictionary); +addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,25 +52,25 @@ LaunderGibsonRSTM::LaunderGibsonRSTM transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Clg1(turbulenceModelCoeffs_.lookupOrAddDefault("Clg1", 1.8)), - Clg2(turbulenceModelCoeffs_.lookupOrAddDefault("Clg2", 0.6)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - Cs(turbulenceModelCoeffs_.lookupOrAddDefault("Cs", 0.25)), - Ceps(turbulenceModelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), - alphaR(turbulenceModelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Clg1(RASmodelCoeffs_.lookupOrAddDefault("Clg1", 1.8)), + Clg2(RASmodelCoeffs_.lookupOrAddDefault("Clg2", 0.6)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cs(RASmodelCoeffs_.lookupOrAddDefault("Cs", 0.25)), + Ceps(RASmodelCoeffs_.lookupOrAddDefault("Ceps", 0.15)), + alphaR(RASmodelCoeffs_.lookupOrAddDefault("alphaR", 1.22)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault("C1Ref", 0.5)), - C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault("C2Ref", 0.3)), + C1Ref(RASmodelCoeffs_.lookupOrAddDefault("C1Ref", 0.5)), + C2Ref(RASmodelCoeffs_.lookupOrAddDefault("C2Ref", 0.3)), couplingFactor_ ( - turbulenceModelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) + RASmodelCoeffs_.lookupOrAddDefault("couplingFactor", 0.0) ), yr_(mesh_), @@ -181,21 +181,21 @@ tmp LaunderGibsonRSTM::divDevReff(volVectorField& U) const bool LaunderGibsonRSTM::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("Clg1", Clg1); - turbulenceModelCoeffs_.readIfPresent("Clg2", Clg2); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("Cs", Cs); - turbulenceModelCoeffs_.readIfPresent("Ceps", Ceps); - turbulenceModelCoeffs_.readIfPresent("alphaR", alphaR); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("C1Ref", C1Ref); - turbulenceModelCoeffs_.readIfPresent("C2Ref", C2Ref); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("Clg1", Clg1); + RASmodelCoeffs_.readIfPresent("Clg2", Clg2); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("Cs", Cs); + RASmodelCoeffs_.readIfPresent("Ceps", Ceps); + RASmodelCoeffs_.readIfPresent("alphaR", alphaR); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("C1Ref", C1Ref); + RASmodelCoeffs_.readIfPresent("C2Ref", C2Ref); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent ( "couplingFactor", couplingFactor_ @@ -227,7 +227,7 @@ void LaunderGibsonRSTM::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H index 82ea6ae7d5..27ea7bec61 100644 --- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -36,7 +36,7 @@ SourceFiles #ifndef LaunderGibsonRSTM_H #define LaunderGibsonRSTM_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDistReflection.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class LaunderGibsonRSTM : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C index edf6c03051..4f69418ef3 100644 --- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C @@ -39,7 +39,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LaunderSharmaKE, 0); -addToRunTimeSelectionTable(turbulenceModel, LaunderSharmaKE, dictionary); +addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -66,14 +66,14 @@ LaunderSharmaKE::LaunderSharmaKE transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), k_ @@ -163,12 +163,12 @@ tmp LaunderSharmaKE::divDevReff(volVectorField& U) const bool LaunderSharmaKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); return true; } @@ -188,7 +188,7 @@ void LaunderSharmaKE::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H index befc3a589b..a43dbfd5da 100644 --- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H @@ -37,7 +37,7 @@ SourceFiles #ifndef LaunderSharmaKE_H #define LaunderSharmaKE_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class LaunderSharmaKE : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C index 3050ca0c1b..6f4c71588b 100644 --- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LienCubicKE, 0); -addToRunTimeSelectionTable(turbulenceModel, LienCubicKE, dictionary); +addToRunTimeSelectionTable(RASmodel, LienCubicKE, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,21 +52,21 @@ LienCubicKE::LienCubicKE transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - A1(turbulenceModelCoeffs_.lookupOrAddDefault("A1", 1.25)), - A2(turbulenceModelCoeffs_.lookupOrAddDefault("A2", 1000.0)), - Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), - Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), - Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), - alphaKsi(turbulenceModelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9)), + A1(RASmodelCoeffs_.lookupOrAddDefault("A1", 1.25)), + A2(RASmodelCoeffs_.lookupOrAddDefault("A2", 1000.0)), + Ctau1(RASmodelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), + Ctau2(RASmodelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), + Ctau3(RASmodelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), + alphaKsi(RASmodelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9)), k_ ( @@ -200,18 +200,18 @@ tmp LienCubicKE::divDevReff(volVectorField& U) const bool LienCubicKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("A1", A1); - turbulenceModelCoeffs_.readIfPresent("A2", A2); - turbulenceModelCoeffs_.readIfPresent("Ctau1", Ctau1); - turbulenceModelCoeffs_.readIfPresent("Ctau2", Ctau2); - turbulenceModelCoeffs_.readIfPresent("Ctau3", Ctau3); - turbulenceModelCoeffs_.readIfPresent("alphaKsi", alphaKsi); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("A1", A1); + RASmodelCoeffs_.readIfPresent("A2", A2); + RASmodelCoeffs_.readIfPresent("Ctau1", Ctau1); + RASmodelCoeffs_.readIfPresent("Ctau2", Ctau2); + RASmodelCoeffs_.readIfPresent("Ctau3", Ctau3); + RASmodelCoeffs_.readIfPresent("alphaKsi", alphaKsi); return true; } @@ -231,7 +231,7 @@ void LienCubicKE::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); gradU = fvc::grad(U_); diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H index 4b1a061df7..798655e1b5 100644 --- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H +++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H @@ -36,7 +36,7 @@ SourceFiles #ifndef LienCubicKE_H #define LienCubicKE_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace RAS class LienCubicKE : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C index 96cae22468..ba18e63bb5 100644 --- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LienCubicKELowRe, 0); -addToRunTimeSelectionTable(turbulenceModel, LienCubicKELowRe, dictionary); +addToRunTimeSelectionTable(RASmodel, LienCubicKELowRe, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,28 +52,28 @@ LienCubicKELowRe::LienCubicKELowRe transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - A1(turbulenceModelCoeffs_.lookupOrAddDefault("A1", 1.25)), - A2(turbulenceModelCoeffs_.lookupOrAddDefault("A2", 1000.0)), - Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), - Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), - Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), - alphaKsi(turbulenceModelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9)), - CmuWall(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Am(turbulenceModelCoeffs_.lookupOrAddDefault("Am", 0.016)), + A1(RASmodelCoeffs_.lookupOrAddDefault("A1", 1.25)), + A2(RASmodelCoeffs_.lookupOrAddDefault("A2", 1000.0)), + Ctau1(RASmodelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), + Ctau2(RASmodelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), + Ctau3(RASmodelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), + alphaKsi(RASmodelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9)), + CmuWall(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Am(RASmodelCoeffs_.lookupOrAddDefault("Am", 0.016)), Aepsilon ( - turbulenceModelCoeffs_.lookupOrAddDefault("Aepsilon", 0.263) + RASmodelCoeffs_.lookupOrAddDefault("Aepsilon", 0.263) ), - Amu(turbulenceModelCoeffs_.lookupOrAddDefault("Amu", 0.00222)), + Amu(RASmodelCoeffs_.lookupOrAddDefault("Amu", 0.00222)), k_ ( @@ -228,22 +228,22 @@ tmp LienCubicKELowRe::divDevReff(volVectorField& U) const bool LienCubicKELowRe::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("A1", A1); - turbulenceModelCoeffs_.readIfPresent("A2", A2); - turbulenceModelCoeffs_.readIfPresent("Ctau1", Ctau1); - turbulenceModelCoeffs_.readIfPresent("Ctau2", Ctau2); - turbulenceModelCoeffs_.readIfPresent("Ctau3", Ctau3); - turbulenceModelCoeffs_.readIfPresent("alphaKsi", alphaKsi); - turbulenceModelCoeffs_.readIfPresent("Cmu", CmuWall); - turbulenceModelCoeffs_.readIfPresent("Am", Am); - turbulenceModelCoeffs_.readIfPresent("Aepsilon", Aepsilon); - turbulenceModelCoeffs_.readIfPresent("Amu", Amu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("A1", A1); + RASmodelCoeffs_.readIfPresent("A2", A2); + RASmodelCoeffs_.readIfPresent("Ctau1", Ctau1); + RASmodelCoeffs_.readIfPresent("Ctau2", Ctau2); + RASmodelCoeffs_.readIfPresent("Ctau3", Ctau3); + RASmodelCoeffs_.readIfPresent("alphaKsi", alphaKsi); + RASmodelCoeffs_.readIfPresent("Cmu", CmuWall); + RASmodelCoeffs_.readIfPresent("Am", Am); + RASmodelCoeffs_.readIfPresent("Aepsilon", Aepsilon); + RASmodelCoeffs_.readIfPresent("Amu", Amu); return true; } @@ -263,7 +263,7 @@ void LienCubicKELowRe::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H index 17e2dbfacb..c366422bdb 100644 --- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H +++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H @@ -51,7 +51,7 @@ SourceFiles #ifndef LienCubicKELowRe_H #define LienCubicKELowRe_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +69,7 @@ namespace RAS class LienCubicKELowRe : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C index 8f9b218d1d..119f7ca262 100644 --- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C +++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(LienLeschzinerLowRe, 0); -addToRunTimeSelectionTable(turbulenceModel, LienLeschzinerLowRe, dictionary); +addToRunTimeSelectionTable(RASmodel, LienLeschzinerLowRe, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,22 +52,22 @@ LienLeschzinerLowRe::LienLeschzinerLowRe transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - Am(turbulenceModelCoeffs_.lookupOrAddDefault("Am", 0.016)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Am(RASmodelCoeffs_.lookupOrAddDefault("Am", 0.016)), Aepsilon ( - turbulenceModelCoeffs_.lookupOrAddDefault("Aepsilon", 0.263) + RASmodelCoeffs_.lookupOrAddDefault("Aepsilon", 0.263) ), - Amu(turbulenceModelCoeffs_.lookupOrAddDefault("Amu", 0.00222)), + Amu(RASmodelCoeffs_.lookupOrAddDefault("Amu", 0.00222)), k_ ( @@ -168,16 +168,16 @@ tmp LienLeschzinerLowRe::divDevReff(volVectorField& U) const bool LienLeschzinerLowRe::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("Am", Am); - turbulenceModelCoeffs_.readIfPresent("Aepsilon", Aepsilon); - turbulenceModelCoeffs_.readIfPresent("Amu", Amu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("Am", Am); + RASmodelCoeffs_.readIfPresent("Aepsilon", Aepsilon); + RASmodelCoeffs_.readIfPresent("Amu", Amu); return true; } @@ -197,7 +197,7 @@ void LienLeschzinerLowRe::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H index effce00a16..8ecbf82744 100644 --- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H +++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H @@ -37,7 +37,7 @@ SourceFiles #ifndef LienLeschzinerLowRe_H #define LienLeschzinerLowRe_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +55,7 @@ namespace RAS class LienLeschzinerLowRe : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files index e22ea7b007..a8f6b81c88 100644 --- a/src/turbulenceModels/RAS/incompressible/Make/files +++ b/src/turbulenceModels/RAS/incompressible/Make/files @@ -1,5 +1,5 @@ -turbulenceModel/turbulenceModel.C -turbulenceModel/newTurbulenceModel.C +RASmodel/RASmodel.C +RASmodel/newRASmodel.C laminar/laminar.C kEpsilon/kEpsilon.C RNGkEpsilon/RNGkEpsilon.C diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C index 8001d707c7..56885340f0 100644 --- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(NonlinearKEShih, 0); -addToRunTimeSelectionTable(turbulenceModel, NonlinearKEShih, dictionary); +addToRunTimeSelectionTable(RASmodel, NonlinearKEShih, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,23 +52,23 @@ NonlinearKEShih::NonlinearKEShih transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), - A1(turbulenceModelCoeffs_.lookupOrAddDefault("A1", 1.25)), - A2(turbulenceModelCoeffs_.lookupOrAddDefault("A2", 1000.0)), - Ctau1(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), - Ctau2(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), - Ctau3(turbulenceModelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), + A1(RASmodelCoeffs_.lookupOrAddDefault("A1", 1.25)), + A2(RASmodelCoeffs_.lookupOrAddDefault("A2", 1000.0)), + Ctau1(RASmodelCoeffs_.lookupOrAddDefault("Ctau1", -4.0)), + Ctau2(RASmodelCoeffs_.lookupOrAddDefault("Ctau2", 13.0)), + Ctau3(RASmodelCoeffs_.lookupOrAddDefault("Ctau3", -2.0)), alphaKsi ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9) + RASmodelCoeffs_.lookupOrAddDefault("alphaKsi", 0.9) ), k_ @@ -187,18 +187,18 @@ tmp NonlinearKEShih::divDevReff(volVectorField& U) const bool NonlinearKEShih::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("A1", A1); - turbulenceModelCoeffs_.readIfPresent("A2", A2); - turbulenceModelCoeffs_.readIfPresent("Ctau1", Ctau1); - turbulenceModelCoeffs_.readIfPresent("Ctau2", Ctau2); - turbulenceModelCoeffs_.readIfPresent("Ctau3", Ctau3); - turbulenceModelCoeffs_.readIfPresent("alphaKsi", alphaKsi); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("A1", A1); + RASmodelCoeffs_.readIfPresent("A2", A2); + RASmodelCoeffs_.readIfPresent("Ctau1", Ctau1); + RASmodelCoeffs_.readIfPresent("Ctau2", Ctau2); + RASmodelCoeffs_.readIfPresent("Ctau3", Ctau3); + RASmodelCoeffs_.readIfPresent("alphaKsi", alphaKsi); return true; } @@ -218,7 +218,7 @@ void NonlinearKEShih::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); gradU = fvc::grad(U_); diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H index f8e5973a64..bb17f69ea7 100644 --- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H +++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H @@ -37,7 +37,7 @@ SourceFiles #ifndef NonlinearKEShih_H #define NonlinearKEShih_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class NonlinearKEShih : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C index d10559ccde..07e6dce444 100644 --- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C +++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C @@ -39,7 +39,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(QZeta, 0); -addToRunTimeSelectionTable(turbulenceModel, QZeta, dictionary); +addToRunTimeSelectionTable(RASmodel, QZeta, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -77,18 +77,18 @@ QZeta::QZeta transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), alphaZeta ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaZeta", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaZeta", 0.76923) ), Anisotropic ( - turbulenceModelCoeffs_.lookupOrAddDefault("anisotropic", false) + RASmodelCoeffs_.lookupOrAddDefault("anisotropic", false) ), k_ @@ -206,13 +206,13 @@ tmp QZeta::divDevReff(volVectorField& U) const bool QZeta::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphaZeta", alphaZeta); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphaZeta", alphaZeta); + RASmodelCoeffs_.readIfPresent ( "anisotropic", Anisotropic @@ -236,7 +236,7 @@ void QZeta::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H index 5e9d6953f0..c7cd31a13f 100644 --- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H +++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H @@ -37,7 +37,7 @@ SourceFiles #ifndef QZeta_H #define QZeta_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace RAS class QZeta : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C similarity index 81% rename from src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C rename to src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C index a139bbefd9..e1c09563fa 100644 --- a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallFvPatch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -36,23 +36,24 @@ namespace incompressible // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defineTypeNameAndDebug(turbulenceModel, 0); -defineRunTimeSelectionTable(turbulenceModel, dictionary); +defineTypeNameAndDebug(RASmodel, 0); +defineRunTimeSelectionTable(RASmodel, dictionary); // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -void turbulenceModel::printCoeffs() +void RASmodel::printCoeffs() { if (printCoeffs_) { - Info<< turbulenceModelCoeffs_; + Info<< type() << "Coeffs" << nl + << RASmodelCoeffs_; } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -turbulenceModel::turbulenceModel +RASmodel::RASmodel ( const word& type, const volVectorField& U, @@ -81,10 +82,17 @@ turbulenceModel::turbulenceModel turbulence_(lookup("turbulence")), printCoeffs_(lookupOrDefault("printCoeffs", false)), - turbulenceModelCoeffs_(subDict(type + "Coeffs")), + RASmodelCoeffs_(subDict(type + "Coeffs")), - kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))), - E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))), + kappa_ + ( + subDict("wallFunctionCoeffs").lookupOrAddDefault + ( + "kappa", + 0.4187 + ) + ), + E_(subDict("wallFunctionCoeffs").lookupOrAddDefault("E", 9.0)), yPlusLam_(yPlusLam(kappa_, E_)), k0_("k0", dimVelocity*dimVelocity, SMALL), @@ -95,13 +103,13 @@ turbulenceModel::turbulenceModel {} -turbulenceModel::~turbulenceModel() +RASmodel::~RASmodel() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E) +scalar RASmodel::yPlusLam(const scalar kappa, const scalar E) { scalar ypl = 11.0; @@ -114,7 +122,7 @@ scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E) } -tmp turbulenceModel::yPlus(const label patchNo) const +tmp RASmodel::yPlus(const label patchNo) const { const fvPatch& curPatch = mesh_.boundary()[patchNo]; @@ -123,7 +131,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const if (typeid(curPatch) == typeid(wallFvPatch)) { - scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu")); + scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu"))); Yp = pow(Cmu, 0.25)*y_[patchNo] *sqrt(k()().boundaryField()[patchNo].patchInternalField()) @@ -133,7 +141,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const { WarningIn ( - "tmp turbulenceModel::yPlus(const label patchNo)" + "tmp RASmodel::yPlus(const label patchNo)" ) << "const : " << endl << "Patch " << patchNo << " is not a wall. Returning blank field" << endl; @@ -145,7 +153,7 @@ tmp turbulenceModel::yPlus(const label patchNo) const } -void turbulenceModel::correct() +void RASmodel::correct() { if (mesh_.changing()) { @@ -154,12 +162,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_; diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H similarity index 93% rename from src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H rename to src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H index aaeb320f1d..d6e0bd6173 100644 --- a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H @@ -29,19 +29,19 @@ Description Namespace for incompressible RAS turbulence models. Class - Foam::incompressible::turbulenceModel + Foam::incompressible::RASmodel Description Abstract base class for incompressible turbulence models. SourceFiles - turbulenceModel.C + RASmodel.C newTurbulenceModel.C \*---------------------------------------------------------------------------*/ -#ifndef turbulenceModel_H -#define turbulenceModel_H +#ifndef RASmodel_H +#define RASmodel_H #include "volFields.H" #include "surfaceFields.H" @@ -64,10 +64,10 @@ namespace incompressible { /*---------------------------------------------------------------------------*\ - Class turbulenceModel Declaration + Class RASmodel Declaration \*---------------------------------------------------------------------------*/ -class turbulenceModel +class RASmodel : public IOdictionary { @@ -86,7 +86,7 @@ protected: Switch turbulence_; Switch printCoeffs_; - dictionary turbulenceModelCoeffs_; + dictionary RASmodelCoeffs_; scalar kappa_; scalar E_; @@ -112,16 +112,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 @@ -129,7 +129,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - turbulenceModel, + RASmodel, dictionary, ( const volVectorField& U, @@ -143,7 +143,7 @@ public: // Constructors //- Construct from components - turbulenceModel + RASmodel ( const word& type, const volVectorField& U, @@ -155,7 +155,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const volVectorField& U, const surfaceScalarField& phi, @@ -165,7 +165,7 @@ public: // Destructor - virtual ~turbulenceModel(); + virtual ~RASmodel(); // Member Functions diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C b/src/turbulenceModels/RAS/incompressible/RASmodel/checkIncompressibleTurbulenceModelsLock.C similarity index 100% rename from src/turbulenceModels/RAS/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C rename to src/turbulenceModels/RAS/incompressible/RASmodel/checkIncompressibleTurbulenceModelsLock.C diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C b/src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C similarity index 78% rename from src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C rename to src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C index 6b060f9419..5eb569274c 100644 --- a/src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C +++ b/src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C @@ -26,7 +26,7 @@ License #include "error.H" -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -37,17 +37,17 @@ namespace incompressible // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -autoPtr turbulenceModel::New +autoPtr RASmodel::New ( const volVectorField& U, const surfaceScalarField& phi, transportModel& transport ) { - 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 @@ -62,29 +62,29 @@ autoPtr 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 volVectorField&, " + "RASmodel::New(const volVectorField&, " "const surfaceScalarField&, transportModel&)" - ) << "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(cstrIter()(U, phi, transport)); + return autoPtr(cstrIter()(U, phi, transport)); } diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C index 5ec48b1ed5..f053c2cf57 100644 --- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(RNGkEpsilon, 0); -addToRunTimeSelectionTable(turbulenceModel, RNGkEpsilon, dictionary); +addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,18 +51,18 @@ RNGkEpsilon::RNGkEpsilon transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.0845)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.42)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.68)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.39)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.0845)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.42)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.68)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.39)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 1.39) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 1.39) ), - eta0(turbulenceModelCoeffs_.lookupOrAddDefault("eta0", 4.38)), - beta(turbulenceModelCoeffs_.lookupOrAddDefault("beta", 0.012)), + eta0(RASmodelCoeffs_.lookupOrAddDefault("eta0", 4.38)), + beta(RASmodelCoeffs_.lookupOrAddDefault("beta", 0.012)), k_ ( @@ -154,15 +154,15 @@ tmp RNGkEpsilon::divDevReff(volVectorField& U) const bool RNGkEpsilon::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); - turbulenceModelCoeffs_.readIfPresent("eta0", eta0); - turbulenceModelCoeffs_.readIfPresent("beta", beta); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("eta0", eta0); + RASmodelCoeffs_.readIfPresent("beta", beta); return true; } @@ -182,7 +182,7 @@ void RNGkEpsilon::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField S2 = 2*magSqr(symm(fvc::grad(U_))); diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H index 47df99ac8c..6753c114ad 100644 --- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H @@ -36,7 +36,7 @@ SourceFiles #ifndef RNGkEpsilon_H #define RNGkEpsilon_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace RAS class RNGkEpsilon : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C index c623765464..80fd745e78 100644 --- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(SpalartAllmaras, 0); -addToRunTimeSelectionTable(turbulenceModel, SpalartAllmaras, dictionary); +addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -112,17 +112,17 @@ SpalartAllmaras::SpalartAllmaras transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - alphaNut(turbulenceModelCoeffs_.lookupOrAddDefault("alphaNut", 1.5)), + alphaNut(RASmodelCoeffs_.lookupOrAddDefault("alphaNut", 1.5)), - Cb1(turbulenceModelCoeffs_.lookupOrAddDefault("Cb1", 0.1355)), - Cb2(turbulenceModelCoeffs_.lookupOrAddDefault("Cb2", 0.622)), + Cb1(RASmodelCoeffs_.lookupOrAddDefault("Cb1", 0.1355)), + Cb2(RASmodelCoeffs_.lookupOrAddDefault("Cb2", 0.622)), Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)), - Cw2(turbulenceModelCoeffs_.lookupOrAddDefault("Cw2", 0.3)), - Cw3(turbulenceModelCoeffs_.lookupOrAddDefault("Cw3", 2.0)), - Cv1(turbulenceModelCoeffs_.lookupOrAddDefault("Cv1", 7.1)), - Cv2(turbulenceModelCoeffs_.lookupOrAddDefault("Cv2", 5.0)), + Cw2(RASmodelCoeffs_.lookupOrAddDefault("Cw2", 0.3)), + Cw3(RASmodelCoeffs_.lookupOrAddDefault("Cw3", 2.0)), + Cv1(RASmodelCoeffs_.lookupOrAddDefault("Cv1", 7.1)), + Cv2(RASmodelCoeffs_.lookupOrAddDefault("Cv2", 5.0)), nuTilda_ ( @@ -259,17 +259,17 @@ tmp SpalartAllmaras::divDevReff(volVectorField& U) const bool SpalartAllmaras::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("alphaNut", alphaNut); + RASmodelCoeffs_.readIfPresent("alphaNut", alphaNut); - turbulenceModelCoeffs_.readIfPresent("Cb1", Cb1); - turbulenceModelCoeffs_.readIfPresent("Cb2", Cb2); + RASmodelCoeffs_.readIfPresent("Cb1", Cb1); + RASmodelCoeffs_.readIfPresent("Cb2", Cb2); Cw1 = Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2); - turbulenceModelCoeffs_.readIfPresent("Cw2", Cw2); - turbulenceModelCoeffs_.readIfPresent("Cw3", Cw3); - turbulenceModelCoeffs_.readIfPresent("Cv1", Cv1); - turbulenceModelCoeffs_.readIfPresent("Cv2", Cv2); + RASmodelCoeffs_.readIfPresent("Cw2", Cw2); + RASmodelCoeffs_.readIfPresent("Cw3", Cw3); + RASmodelCoeffs_.readIfPresent("Cv1", Cv1); + RASmodelCoeffs_.readIfPresent("Cv2", Cv2); return true; } @@ -289,7 +289,7 @@ void SpalartAllmaras::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H index 6ad20dbe13..67b9b2bf2f 100644 --- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H @@ -52,7 +52,7 @@ SourceFiles #ifndef SpalartAllmaras_H #define SpalartAllmaras_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -70,7 +70,7 @@ namespace RAS class SpalartAllmaras : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C index 524649e8f3..b44b57fe81 100644 --- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(kEpsilon, 0); -addToRunTimeSelectionTable(turbulenceModel, kEpsilon, dictionary); +addToRunTimeSelectionTable(RASmodel, kEpsilon, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -52,14 +52,14 @@ kEpsilon::kEpsilon transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - C1(turbulenceModelCoeffs_.lookupOrAddDefault("C1", 1.44)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.92)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + C1(RASmodelCoeffs_.lookupOrAddDefault("C1", 1.44)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.92)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.76923) ), k_ @@ -151,12 +151,12 @@ tmp kEpsilon::divDevReff(volVectorField& U) const bool kEpsilon::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("C1", C1); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("C1", C1); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); return true; } @@ -176,7 +176,7 @@ void kEpsilon::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_))); diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H index 697edabc2f..7f9dd06b35 100644 --- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H @@ -36,7 +36,7 @@ SourceFiles #ifndef kEpsilon_H #define kEpsilon_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace RAS class kEpsilon : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C index a2d6838b28..8f364e2fce 100644 --- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(kOmegaSST, 0); -addToRunTimeSelectionTable(turbulenceModel, kOmegaSST, dictionary); +addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -94,36 +94,36 @@ kOmegaSST::kOmegaSST transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), alphaK1 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaK1", 0.85034) + RASmodelCoeffs_.lookupOrAddDefault("alphaK1", 0.85034) ), - alphaK2(turbulenceModelCoeffs_.lookupOrAddDefault("alphaK2", 1.0)), + alphaK2(RASmodelCoeffs_.lookupOrAddDefault("alphaK2", 1.0)), alphaOmega1 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaOmega1", 0.5) + RASmodelCoeffs_.lookupOrAddDefault("alphaOmega1", 0.5) ), alphaOmega2 ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaOmega2", 0.85616) + RASmodelCoeffs_.lookupOrAddDefault("alphaOmega2", 0.85616) ), - gamma1(turbulenceModelCoeffs_.lookupOrAddDefault("gamma1", 0.5532)), - gamma2(turbulenceModelCoeffs_.lookupOrAddDefault("gamma2", 0.4403)), - beta1(turbulenceModelCoeffs_.lookupOrAddDefault("beta1", 0.075)), - beta2(turbulenceModelCoeffs_.lookupOrAddDefault("beta2", 0.0828)), + gamma1(RASmodelCoeffs_.lookupOrAddDefault("gamma1", 0.5532)), + gamma2(RASmodelCoeffs_.lookupOrAddDefault("gamma2", 0.4403)), + beta1(RASmodelCoeffs_.lookupOrAddDefault("beta1", 0.075)), + beta2(RASmodelCoeffs_.lookupOrAddDefault("beta2", 0.0828)), betaStar ( - turbulenceModelCoeffs_.lookupOrAddDefault("betaStar", 0.09) + RASmodelCoeffs_.lookupOrAddDefault("betaStar", 0.09) ), - a1(turbulenceModelCoeffs_.lookupOrAddDefault("a1", 0.31)), - c1(turbulenceModelCoeffs_.lookupOrAddDefault("c1", 10.0)), + a1(RASmodelCoeffs_.lookupOrAddDefault("a1", 0.31)), + c1(RASmodelCoeffs_.lookupOrAddDefault("c1", 10.0)), omega0_("omega0", dimless/dimTime, SMALL), omegaSmall_("omegaSmall", dimless/dimTime, SMALL), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), y_(mesh_), @@ -216,28 +216,28 @@ tmp kOmegaSST::divDevReff(volVectorField& U) const bool kOmegaSST::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("alphaK1", alphaK1); - turbulenceModelCoeffs_.readIfPresent("alphaK2", alphaK2); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent("alphaK1", alphaK1); + RASmodelCoeffs_.readIfPresent("alphaK2", alphaK2); + RASmodelCoeffs_.readIfPresent ( "alphaOmega1", alphaOmega1 ); - turbulenceModelCoeffs_.readIfPresent + RASmodelCoeffs_.readIfPresent ( "alphaOmega2", alphaOmega2 ); - turbulenceModelCoeffs_.readIfPresent("gamma1", gamma1); - turbulenceModelCoeffs_.readIfPresent("gamma2", gamma2); - turbulenceModelCoeffs_.readIfPresent("beta1", beta1); - turbulenceModelCoeffs_.readIfPresent("beta2", beta2); - turbulenceModelCoeffs_.readIfPresent("betaStar", betaStar); - turbulenceModelCoeffs_.readIfPresent("a1", a1); - turbulenceModelCoeffs_.readIfPresent("c1", c1); - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("gamma1", gamma1); + RASmodelCoeffs_.readIfPresent("gamma2", gamma2); + RASmodelCoeffs_.readIfPresent("beta1", beta1); + RASmodelCoeffs_.readIfPresent("beta2", beta2); + RASmodelCoeffs_.readIfPresent("betaStar", betaStar); + RASmodelCoeffs_.readIfPresent("a1", a1); + RASmodelCoeffs_.readIfPresent("c1", c1); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); return true; } @@ -257,7 +257,7 @@ void kOmegaSST::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); if (mesh_.changing()) { diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H index 0672ed3f39..13be4a234a 100644 --- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H @@ -64,7 +64,7 @@ SourceFiles #ifndef kOmegaSST_H #define kOmegaSST_H -#include "turbulenceModel.H" +#include "RASmodel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -82,7 +82,7 @@ namespace RAS class kOmegaSST : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C index 931adedc68..f97260a35a 100644 --- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C +++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C @@ -39,7 +39,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(laminar, 0); -addToRunTimeSelectionTable(turbulenceModel, laminar, dictionary); +addToRunTimeSelectionTable(RASmodel, laminar, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ laminar::laminar transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel) + RASmodel(typeName, U, phi, lamTransportModel) {} @@ -184,7 +184,7 @@ tmp laminar::divDevReff(volVectorField& U) const bool laminar::read() { - return turbulenceModel::read(); + return RASmodel::read(); } diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H index e29ac76b49..5546e7d330 100644 --- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H +++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H @@ -36,7 +36,7 @@ SourceFiles #ifndef laminar_H #define laminar_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace RAS class laminar : - public turbulenceModel + public RASmodel { public: diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C index 132a7b84cb..b5b9a7e592 100644 --- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C +++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C @@ -40,7 +40,7 @@ namespace RAS // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // defineTypeNameAndDebug(realizableKE, 0); -addToRunTimeSelectionTable(turbulenceModel, realizableKE, dictionary); +addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -92,16 +92,16 @@ realizableKE::realizableKE transportModel& lamTransportModel ) : - turbulenceModel(typeName, U, phi, lamTransportModel), + RASmodel(typeName, U, phi, lamTransportModel), - Cmu(turbulenceModelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), - A0(turbulenceModelCoeffs_.lookupOrAddDefault("A0", 4.0)), - C2(turbulenceModelCoeffs_.lookupOrAddDefault("C2", 1.9)), - alphak(turbulenceModelCoeffs_.lookupOrAddDefault("alphak", 1.0)), + Cmu(RASmodelCoeffs_.lookupOrAddDefault("Cmu", 0.09)), + A0(RASmodelCoeffs_.lookupOrAddDefault("A0", 4.0)), + C2(RASmodelCoeffs_.lookupOrAddDefault("C2", 1.9)), + alphak(RASmodelCoeffs_.lookupOrAddDefault("alphak", 1.0)), alphaEps ( - turbulenceModelCoeffs_.lookupOrAddDefault("alphaEps", 0.833333) + RASmodelCoeffs_.lookupOrAddDefault("alphaEps", 0.833333) ), k_ @@ -195,13 +195,13 @@ tmp realizableKE::divDevReff(volVectorField& U) const bool realizableKE::read() { - if (turbulenceModel::read()) + if (RASmodel::read()) { - turbulenceModelCoeffs_.readIfPresent("Cmu", Cmu); - turbulenceModelCoeffs_.readIfPresent("A0", A0); - turbulenceModelCoeffs_.readIfPresent("C2", C2); - turbulenceModelCoeffs_.readIfPresent("alphak", alphak); - turbulenceModelCoeffs_.readIfPresent("alphaEps", alphaEps); + RASmodelCoeffs_.readIfPresent("Cmu", Cmu); + RASmodelCoeffs_.readIfPresent("A0", A0); + RASmodelCoeffs_.readIfPresent("C2", C2); + RASmodelCoeffs_.readIfPresent("alphak", alphak); + RASmodelCoeffs_.readIfPresent("alphaEps", alphaEps); return true; } @@ -221,7 +221,7 @@ void realizableKE::correct() return; } - turbulenceModel::correct(); + RASmodel::correct(); volTensorField gradU = fvc::grad(U_); volScalarField S2 = 2*magSqr(dev(symm(gradU))); diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H index 41c15c9ee5..bc4ee34cbc 100644 --- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H +++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H @@ -48,7 +48,7 @@ SourceFiles #ifndef realizableKE_H #define realizableKE_H -#include "turbulenceModel.H" +#include "RASmodel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,7 +65,7 @@ namespace RAS class realizableKE : - public turbulenceModel + public RASmodel { // Private data diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C index ac6cfb35ec..0e23cdb23c 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutStandardRoughWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "RASmodel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -120,8 +120,8 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate const Pstream::commsTypes ) { - const turbulenceModel& rasModel - = db().lookupObject("turbulenceProperties"); + const RASmodel& rasModel + = db().lookupObject("turbulenceProperties"); const scalar kappa = rasModel.kappa(); const scalar E = rasModel.E(); diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C index d4be48e28f..71bb6f4cd6 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutStandardWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "RASmodel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -105,8 +105,8 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate const Pstream::commsTypes ) { - const turbulenceModel& rasModel - = db().lookupObject("turbulenceProperties"); + const RASmodel& rasModel + = db().lookupObject("turbulenceProperties"); scalar kappa = rasModel.kappa(); scalar E = rasModel.E(); diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C index b25cc9f079..2029cd5d71 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "RASmodel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -97,8 +97,8 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes) { - const turbulenceModel& rasModel - = db().lookupObject("turbulenceProperties"); + const RASmodel& rasModel + = db().lookupObject("turbulenceProperties"); scalar kappa = rasModel.kappa(); scalar E = rasModel.E(); diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H index 4a6602f597..151866c683 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H @@ -76,7 +76,7 @@ Description label faceCelli = curPatch.faceCells()[facei]; scalar yPlus = - Cmu25*turbulenceModel::y_[patchi][facei] + Cmu25*RASmodel::y_[patchi][facei] *sqrt(k_[faceCelli]) /nuw[facei]; @@ -88,7 +88,7 @@ Description epsilon_[faceCelli] += Cmu75*pow(k_[faceCelli], 1.5) - /(kappa_*turbulenceModel::y_[patchi][facei]); + /(kappa_*RASmodel::y_[patchi][facei]); if (yPlus > yPlusLam_) { @@ -96,7 +96,7 @@ Description (nutw[facei] + nuw[facei]) *magFaceGradU[facei] *Cmu25*sqrt(k_[faceCelli]) - /(kappa_*turbulenceModel::y_[patchi][facei]); + /(kappa_*RASmodel::y_[patchi][facei]); } } } diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C index 9cf66cc3b3..af20a46ea9 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "incompressible/RASmodel/RASmodel.H" #include "MRFZones.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H index 390e3b0149..fc1c30b19f 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H @@ -36,9 +36,9 @@ singlePhaseTransportModel laminarTransport(U, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::RASmodel::New(U, phi, laminarTransport) ); diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties index 9b738288b3..ca792d9f45 100644 --- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties index 91e74e5b1e..ba6e807f82 100644 --- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties +++ b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties index 24ae5e9082..3e1e16755c 100644 --- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties index 76158edd86..f979cb3a80 100644 --- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kEpsilon; +RASmodel kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties index e2e899ca1a..df50c86414 100644 --- a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel laminar; +RASmodel laminar; turbulence off; diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties index cf62556002..b14ec53716 100644 --- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties index a723387ddb..68a30fe751 100644 --- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties index e439b7fdb0..c0e5f76583 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties +++ b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties @@ -22,8 +22,8 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// turbulenceModel kEpsilon; -turbulenceModel laminar; +// RASmodel kEpsilon; +RASmodel laminar; turbulence off; diff --git a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties index 2c2118c78a..6f67a329b1 100644 --- a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties +++ b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties index 605d31eb8f..a10685dcae 100644 --- a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties +++ b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; laminarCoeffs diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties index 605d31eb8f..a10685dcae 100644 --- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; laminarCoeffs diff --git a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties index 639f7418bf..aa269bc9b6 100644 --- a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kOmegaSST; //kEpsilon; +RASmodel kOmegaSST; //kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H index 1191d94b02..dba0679738 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H @@ -41,9 +41,9 @@ Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence + autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::RASmodel::New ( rho, U, diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C index 0b9edd0b3c..91af3c9dc9 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "basicThermo.H" -#include "compressible/turbulenceModel/turbulenceModel.H" +#include "compressible/RASmodel/RASmodel.H" #include "basicThermoCloud.H" #include "basicKinematicCloud.H" diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties index 7d4495dc58..038378f511 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kEpsilon; +RASmodel kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/settlingFoam/dahl/constant/turbulenceProperties b/tutorials/settlingFoam/dahl/constant/turbulenceProperties index 2190843e1d..e1c73326f9 100644 --- a/tutorials/settlingFoam/dahl/constant/turbulenceProperties +++ b/tutorials/settlingFoam/dahl/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties index 2190843e1d..e1c73326f9 100644 --- a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties +++ b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties index bebe8455e5..4f812b18a7 100644 --- a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties +++ b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kOmegaSST; +RASmodel kOmegaSST; turbulence on; diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H index 9f1017f23e..aab42f3534 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H @@ -46,9 +46,9 @@ singlePhaseTransportModel laminarTransport(Urel, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::turbulenceModel::New(Urel, phi, laminarTransport) + incompressible::RASmodel::New(Urel, phi, laminarTransport) ); Info<< "Creating SRF model\n" << endl; diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C index 7480f08dcc..5e89702f0f 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "incompressible/RASmodel/RASmodel.H" #include "SRFModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties index c24f035fe5..1e9b27636e 100644 --- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties index 6a3194ffd3..60c47b9acf 100644 --- a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/turbFoam/cavity/constant/turbulenceProperties b/tutorials/turbFoam/cavity/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/turbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/turbFoam/cavity/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties index dc05e1c634..0046e64aad 100644 --- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence off;