mirror of
https://github.com/OpenFOAM/OpenFOAM-6.git
synced 2025-12-08 06:57:46 +00:00
solvers: Change from pure RAS to any turbulence model
Provides support for running laminar.
This commit is contained in:
@ -69,9 +69,9 @@ dimensionedScalar rhoMin
|
|||||||
);
|
);
|
||||||
|
|
||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
autoPtr<compressible::RASModel> turbulence
|
autoPtr<compressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
compressible::New<compressible::RASModel>
|
compressible::turbulenceModel::New
|
||||||
(
|
(
|
||||||
rho,
|
rho,
|
||||||
U,
|
U,
|
||||||
|
|||||||
@ -68,9 +68,9 @@ dimensionedScalar rhoMin
|
|||||||
);
|
);
|
||||||
|
|
||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
autoPtr<compressible::RASModel> turbulence
|
autoPtr<compressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
compressible::New<compressible::RASModel>
|
compressible::turbulenceModel::New
|
||||||
(
|
(
|
||||||
rho,
|
rho,
|
||||||
U,
|
U,
|
||||||
|
|||||||
@ -47,9 +47,9 @@ volVectorField U
|
|||||||
#include "readTransportProperties.H"
|
#include "readTransportProperties.H"
|
||||||
|
|
||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
autoPtr<incompressible::RASModel> turbulence
|
autoPtr<incompressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
|
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Kinematic density for buoyancy force
|
// Kinematic density for buoyancy force
|
||||||
|
|||||||
@ -47,9 +47,9 @@ volVectorField U
|
|||||||
#include "readTransportProperties.H"
|
#include "readTransportProperties.H"
|
||||||
|
|
||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
autoPtr<incompressible::RASModel> turbulence
|
autoPtr<incompressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
|
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Kinematic density for buoyancy force
|
// Kinematic density for buoyancy force
|
||||||
|
|||||||
@ -37,9 +37,9 @@ volVectorField U
|
|||||||
#include "compressibleCreatePhi.H"
|
#include "compressibleCreatePhi.H"
|
||||||
|
|
||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
autoPtr<compressible::RASModel> turbulence
|
autoPtr<compressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
compressible::New<compressible::RASModel>
|
compressible::turbulenceModel::New
|
||||||
(
|
(
|
||||||
rho,
|
rho,
|
||||||
U,
|
U,
|
||||||
|
|||||||
@ -1,31 +1,17 @@
|
|||||||
Info<< "Creating turbulence model\n" << endl;
|
Info<< "Creating turbulence model\n" << endl;
|
||||||
tmp<volScalarField> talphaEff;
|
tmp<volScalarField> talphaEff;
|
||||||
|
|
||||||
IOobject turbulenceHeader
|
IOobject turbulencePropertiesHeader
|
||||||
(
|
(
|
||||||
"turbulenceProperties",
|
"turbulenceProperties",
|
||||||
runTime.constant(),
|
runTime.constant(),
|
||||||
mesh,
|
mesh,
|
||||||
IOobject::MUST_READ
|
IOobject::MUST_READ_IF_MODIFIED,
|
||||||
|
IOobject::NO_WRITE,
|
||||||
|
false
|
||||||
);
|
);
|
||||||
|
|
||||||
IOobject RASHeader
|
if (turbulencePropertiesHeader.headerOk())
|
||||||
(
|
|
||||||
"RASProperties",
|
|
||||||
runTime.constant(),
|
|
||||||
mesh,
|
|
||||||
IOobject::MUST_READ
|
|
||||||
);
|
|
||||||
|
|
||||||
IOobject LESHeader
|
|
||||||
(
|
|
||||||
"LESProperties",
|
|
||||||
runTime.constant(),
|
|
||||||
mesh,
|
|
||||||
IOobject::MUST_READ
|
|
||||||
);
|
|
||||||
|
|
||||||
if (turbulenceHeader.headerOk())
|
|
||||||
{
|
{
|
||||||
autoPtr<compressible::turbulenceModel> turbulence
|
autoPtr<compressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
@ -40,36 +26,6 @@
|
|||||||
|
|
||||||
talphaEff = turbulence->alphaEff();
|
talphaEff = turbulence->alphaEff();
|
||||||
}
|
}
|
||||||
else if (RASHeader.headerOk())
|
|
||||||
{
|
|
||||||
autoPtr<compressible::RASModel> turbulence
|
|
||||||
(
|
|
||||||
compressible::New<compressible::RASModel>
|
|
||||||
(
|
|
||||||
rho,
|
|
||||||
U,
|
|
||||||
phi,
|
|
||||||
thermo
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
talphaEff = turbulence->alphaEff();
|
|
||||||
}
|
|
||||||
else if (LESHeader.headerOk())
|
|
||||||
{
|
|
||||||
autoPtr<compressible::LESModel> turbulence
|
|
||||||
(
|
|
||||||
compressible::New<compressible::LESModel>
|
|
||||||
(
|
|
||||||
rho,
|
|
||||||
U,
|
|
||||||
phi,
|
|
||||||
thermo
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
talphaEff = turbulence->alphaEff();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
talphaEff = tmp<volScalarField>
|
talphaEff = tmp<volScalarField>
|
||||||
|
|||||||
@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name());
|
|||||||
|
|
||||||
singlePhaseTransportModel laminarTransport(U, phi);
|
singlePhaseTransportModel laminarTransport(U, phi);
|
||||||
|
|
||||||
autoPtr<incompressible::RASModel> turbulence
|
autoPtr<incompressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
|
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -31,9 +31,9 @@ surfaceScalarField phi
|
|||||||
|
|
||||||
singlePhaseTransportModel laminarTransport(U, phi);
|
singlePhaseTransportModel laminarTransport(U, phi);
|
||||||
|
|
||||||
autoPtr<incompressible::RASModel> turbulence
|
autoPtr<incompressible::turbulenceModel> turbulence
|
||||||
(
|
(
|
||||||
incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
|
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||||
);
|
);
|
||||||
|
|
||||||
dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);
|
dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);
|
||||||
|
|||||||
Reference in New Issue
Block a user