Commit 988b0fd3 authored by Henry Weller's avatar Henry Weller
Browse files

ThermalDiffusivity: Refactored to support phase turbulence models

parent f95661df
......@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
const word& modelName
)
:
Foam::RASModels::kEpsilon<eddyDiffusivity<compressible::turbulenceModel> >
Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> >
(
geometricOneField(),
rho,
......
......@@ -80,7 +80,7 @@ class PDRkEpsilon
:
public Foam::RASModels::kEpsilon
<
eddyDiffusivity
EddyDiffusivity
<
compressible::turbulenceModel
>
......
......@@ -36,8 +36,6 @@ SourceFiles
#ifndef EddyDiffusivity_H
#define EddyDiffusivity_H
#include "CompressibleTurbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
......
......@@ -27,8 +27,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class TransportModel>
Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
template<class BasicTurbulenceModel>
Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
(
const word& type,
const geometricOneField& alpha,
......@@ -40,7 +40,7 @@ Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
const word& propertiesName
)
:
CompressibleTurbulenceModel<TransportModel>
BasicTurbulenceModel
(
type,
alpha,
......@@ -56,9 +56,9 @@ Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
template<class TransportModel>
Foam::autoPtr<Foam::ThermalDiffusivity<TransportModel> >
Foam::ThermalDiffusivity<TransportModel>::New
template<class BasicTurbulenceModel>
Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
(
const volScalarField& rho,
const volVectorField& U,
......@@ -70,7 +70,7 @@ Foam::ThermalDiffusivity<TransportModel>::New
return autoPtr<ThermalDiffusivity>
(
static_cast<ThermalDiffusivity*>(
CompressibleTurbulenceModel<transportModel>::New
BasicTurbulenceModel::New
(
rho,
U,
......
......@@ -25,8 +25,8 @@ Class
Foam::ThermalDiffusivity
Description
Templated abstract base class for single-phase compressible
turbulence models.
Templated wrapper class to provide compressible turbulence models
thermal diffusivity based thermal transport.
SourceFiles
ThermalDiffusivity.C
......@@ -36,8 +36,6 @@ SourceFiles
#ifndef ThermalDiffusivity_H
#define ThermalDiffusivity_H
#include "CompressibleTurbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
......@@ -47,17 +45,17 @@ namespace Foam
Class ThermalDiffusivity Declaration
\*---------------------------------------------------------------------------*/
template<class TransportModel>
template<class BasicTurbulenceModel>
class ThermalDiffusivity
:
public CompressibleTurbulenceModel<TransportModel>
public BasicTurbulenceModel
{
public:
typedef geometricOneField alphaField;
typedef volScalarField rhoField;
typedef TransportModel transportModel;
typedef typename BasicTurbulenceModel::transportModel transportModel;
// Constructors
......
......@@ -41,7 +41,8 @@ License
dictionary \
); \
\
typedef BaseModel<Transport> Transport##BaseModel; \
typedef BaseModel<CompressibleTurbulenceModel<Transport> > \
Transport##BaseModel; \
\
\
typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel; \
......
......@@ -55,7 +55,8 @@ namespace Foam
{
namespace compressible
{
typedef ThermalDiffusivity<fluidThermo> turbulenceModel;
typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo> >
turbulenceModel;
typedef SpecificCompressibleTurbulenceModel
<
......
......@@ -28,6 +28,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
#include "CompressibleTurbulenceModel.H"
#include "ThermalDiffusivity.H"
#include "EddyDiffusivity.H"
......
Supports Markdown
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