From 2647d178fa86ffb3d8fc9713a9cf7135da190bbd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Dec 2015 10:13:09 +0000
Subject: [PATCH] solvers: Change from pure RAS to any turbulence model
Provides support for running laminar.
---
.../compressible/rhoSimpleFoam/createFields.H | 4 +-
.../rhoPorousSimpleFoam/createFields.H | 4 +-
.../createFields.H | 4 +-
.../createFields.H | 4 +-
.../buoyantSimpleFoam/createFields.H | 4 +-
.../heatTransfer/thermoFoam/setAlphaEff.H | 54 ++-----------------
.../createFields.H | 4 +-
.../boundaryFoam/createFields.H | 4 +-
8 files changed, 19 insertions(+), 63 deletions(-)
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 80f317cd855..61cea5c2e51 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -69,9 +69,9 @@ dimensionedScalar rhoMin
);
Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
(
- compressible::New<compressible::RASModel>
+ compressible::turbulenceModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 537eea2ea37..2fe0e53dbc2 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -68,9 +68,9 @@ dimensionedScalar rhoMin
);
Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
(
- compressible::New<compressible::RASModel>
+ compressible::turbulenceModel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
index b8d07b1f1af..0916e2788d9 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
@@ -47,9 +47,9 @@ volVectorField U
#include "readTransportProperties.H"
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
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
index 014bf8045cc..e78daa67b30 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
@@ -47,9 +47,9 @@ volVectorField U
#include "readTransportProperties.H"
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
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index d7cf3eb704d..35c6c59560e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -37,9 +37,9 @@ volVectorField U
#include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
(
- compressible::New<compressible::RASModel>
+ compressible::turbulenceModel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
index 4af3af3ce4c..fff960526fe 100644
--- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
+++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
@@ -1,31 +1,17 @@
Info<< "Creating turbulence model\n" << endl;
tmp<volScalarField> talphaEff;
- IOobject turbulenceHeader
+ IOobject turbulencePropertiesHeader
(
"turbulenceProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
);
- IOobject RASHeader
- (
- "RASProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ
- );
-
- IOobject LESHeader
- (
- "LESProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ
- );
-
- if (turbulenceHeader.headerOk())
+ if (turbulencePropertiesHeader.headerOk())
{
autoPtr<compressible::turbulenceModel> turbulence
(
@@ -40,36 +26,6 @@
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
{
talphaEff = tmp<volScalarField>
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
index cb7da736871..93da72123d6 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
@@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name());
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)
);
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 5ecfebfcb40..0298c8339c0 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -31,9 +31,9 @@ surfaceScalarField 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);
--
GitLab