Commit 63da3e9a authored by Henry's avatar Henry
Browse files

Thermodynamics: Rationalization

At the specie level:
    hs = sensible enthalpy
    ha = absolute (what was total) enthalpy
    es = sensibly internal energy
    ea = absolute (what was total) internal energy

At top-level
    Rename total enthalpy h -> ha
    Rename sensible enthalpy hs -> h

Combined h, hs, e and es thermo packages into a single structure.

Thermo packages now provide "he" function which may return either enthalpy or
internal energy, sensible or absolute according to the run-time selected form

alphaEff now returns the effective diffusivity for the particular energy which
the thermodynamics package is selected to solve for.
parent 70ea2f82
......@@ -68,7 +68,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "hhuCombustionThermo.H"
#include "psiuReactionThermo.H"
#include "RASModel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"
......@@ -123,12 +123,12 @@ int main(int argc, char *argv[])
{
#include "bEqn.H"
#include "ftEqn.H"
#include "huEqn.H"
#include "hEqn.H"
#include "hauEqn.H"
#include "haEqn.H"
if (!ign.ignited())
{
hu == h;
hau == ha;
}
#include "pEqn.H"
......
......@@ -57,7 +57,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "hhuCombustionThermo.H"
#include "psiuReactionThermo.H"
#include "RASModel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"
......
......@@ -43,7 +43,7 @@ namespace XiEqModels
Foam::XiEqModels::basicSubGrid::basicSubGrid
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -113,7 +113,7 @@ public:
basicSubGrid
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -43,7 +43,7 @@ namespace XiGModels
Foam::XiGModels::basicSubGrid::basicSubGrid
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -101,7 +101,7 @@ public:
basicSubGrid
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -37,7 +37,7 @@ SourceFiles
#define PDRDragModel_H
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
#include "psiuReactionThermo.H"
#include "RASModel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"
......
......@@ -43,7 +43,7 @@ namespace XiEqModels
Foam::XiEqModels::Gulder::Gulder
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -89,7 +89,7 @@ public:
Gulder
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -43,7 +43,7 @@ namespace XiEqModels
Foam::XiEqModels::SCOPEBlend::SCOPEBlend
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -85,7 +85,7 @@ public:
SCOPEBlend
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -43,7 +43,7 @@ namespace XiEqModels
Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -103,7 +103,7 @@ public:
SCOPEXiEq
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -39,7 +39,7 @@ namespace Foam
Foam::XiEqModel::XiEqModel
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -42,7 +42,7 @@ SourceFiles
#define XiEqModel_H
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
#include "psiuReactionThermo.H"
#include "RASModel.H"
#include "runTimeSelectionTables.H"
......@@ -66,7 +66,7 @@ protected:
dictionary XiEqModelCoeffs_;
//- Thermo
const hhuCombustionThermo& thermo_;
const psiuReactionThermo& thermo_;
//- Turbulence
const compressible::RASModel& turbulence_;
......@@ -107,7 +107,7 @@ public:
dictionary,
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
),
......@@ -126,7 +126,7 @@ public:
static autoPtr<XiEqModel> New
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......@@ -138,7 +138,7 @@ public:
XiEqModel
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -30,7 +30,7 @@ License
Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
(
const dictionary& propDict,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
(
"XiEqModel::New"
"("
" const hhuCombustionThermo& thermo,"
" const psiuReactionThermo& thermo,"
" const compressible::RASModel& turbulence,"
" const volScalarField& Su"
")"
......
......@@ -43,7 +43,7 @@ namespace XiEqModels
Foam::XiEqModels::instability::instability
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -84,7 +84,7 @@ public:
instability
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
);
......
......@@ -43,7 +43,7 @@ namespace XiGModels
Foam::XiGModels::KTS::KTS
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
const compressible::RASModel& turbulence,
const volScalarField& Su
)
......
......@@ -79,7 +79,7 @@ public:
KTS
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
const psiuReactionThermo& thermo,
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