Thermodynamics: Completed dictionary based selection mechanisms for all thermodynamic packages

Rationalised "make" macros to reduce code duplication
Removed solid phase radiation properties
Updated tutorials appropriately
This commit is contained in:
Henry
2012-10-03 22:43:50 +01:00
parent 88050abcab
commit ca2ad8032e
93 changed files with 536 additions and 1212 deletions

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture homogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture reactingSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
solidComponents
(

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -110,7 +110,16 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -1,4 +1,4 @@
/*--------------------------------*- C++ -*----------------------------------*\
/*--------------------------------*- C++ -*----------------------------------* \
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;