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

consistency update

parent c7a59bb2
......@@ -58,7 +58,7 @@ Description
#include "fvCFD.H"
#include "hhuCombustionThermo.H"
#include "turbulenceModel.H"
#include "RASmodel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"
#include "PDRDragModel.H"
......
......@@ -59,7 +59,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "hhuCombustionThermo.H"
#include "turbulenceModel.H"
#include "RASmodel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"
#include "PDRDragModel.H"
......
......@@ -45,7 +45,7 @@ Foam::XiEqModels::basicSubGrid::basicSubGrid
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
......@@ -94,7 +94,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
);
......
......@@ -45,7 +45,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
......@@ -85,7 +85,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
);
......
......@@ -40,7 +40,7 @@ namespace Foam
Foam::PDRDragModel::PDRDragModel
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......
......@@ -38,7 +38,7 @@ SourceFiles
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
#include "turbulenceModel.H"
#include "RASmodel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"
......@@ -62,7 +62,7 @@ protected:
dictionary PDRDragModelCoeffs_;
const compressible::turbulenceModel& turbulence_;
const compressible::RASmodel& turbulence_;
const volScalarField& rho_;
const volVectorField& U_;
const surfaceScalarField& phi_;
......@@ -96,7 +96,7 @@ public:
dictionary,
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......@@ -117,7 +117,7 @@ public:
static autoPtr<PDRDragModel> New
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......@@ -130,7 +130,7 @@ public:
PDRDragModel
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......
......@@ -31,7 +31,7 @@ License
Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......
......@@ -44,7 +44,7 @@ namespace PDRDragModels
Foam::PDRDragModels::basic::basic
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......
......@@ -86,7 +86,7 @@ public:
basic
(
const dictionary& PDRProperties,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi
......
......@@ -41,7 +41,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(PDRkEpsilon, 0);
addToRunTimeSelectionTable(turbulenceModel, PDRkEpsilon, dictionary);
addToRunTimeSelectionTable(RASmodel, PDRkEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
......@@ -53,17 +53,17 @@ PDRkEpsilon::PDRkEpsilon
basicThermo& thermophysicalModel
)
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
RASmodel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps
(
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_
(
......@@ -164,14 +164,14 @@ tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const
bool PDRkEpsilon::read()
{
if (turbulenceModel::read())
if (RASmodel::read())
{
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true;
}
......@@ -192,7 +192,7 @@ void PDRkEpsilon::correct()
return;
}
turbulenceModel::correct();
RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
......
......@@ -37,7 +37,7 @@ SourceFiles
#ifndef compressiblePDRkEpsilon_H
#define compressiblePDRkEpsilon_H
#include "turbulenceModel.H"
#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -54,7 +54,7 @@ namespace RAS
class PDRkEpsilon
:
public turbulenceModel
public RASmodel
{
// Private data
......
......@@ -45,7 +45,7 @@ Foam::XiEqModels::Gulder::Gulder
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
......@@ -82,7 +82,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
);
......
......@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEBlend::SCOPEBlend
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
......@@ -83,7 +83,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
);
......
......@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
......@@ -90,7 +90,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
);
......
......@@ -41,7 +41,7 @@ Foam::XiEqModel::XiEqModel
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const compressible::turbulenceModel& turbulence,
const compressible::RASmodel& turbulence,
const volScalarField& Su
)
:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment