zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: combustionModels: Changed the construction order

Browse Source 
The combustion and chemistry models no longer select and own the
thermodynamic model; they hold a reference instead. The construction of
the combustion and chemistry models has been changed to require a
reference to the thermodyanmics, rather than the mesh and a phase name.

At the solver-level the thermo, turbulence and combustion models are now
selected in sequence. The cyclic dependency between the three models has
been resolved, and the raw-pointer based post-construction step for the
combustion model has been removed.

The old solver-level construction sequence (typically in createFields.H)
was as follows:

    autoPtr<combustionModels::psiCombustionModel> combustion
    (
        combustionModels::psiCombustionModel::New(mesh)
    );

    psiReactionThermo& thermo = combustion->thermo();

    // Create rho, U, phi, etc...

    autoPtr<compressible::turbulenceModel> turbulence
    (
        compressible::turbulenceModel::New(rho, U, phi, thermo)
    );

    combustion->setTurbulence(*turbulence);

The new sequence is:

    autoPtr<psiReactionThermo> thermo(psiReactionThermo::New(mesh));

    // Create rho, U, phi, etc...

    autoPtr<compressible::turbulenceModel> turbulence
    (
        compressible::turbulenceModel::New(rho, U, phi, *thermo)
    );

    autoPtr<combustionModels::psiCombustionModel> combustion
    (
        combustionModels::psiCombustionModel::New(*thermo, *turbulence)
    );

ENH: combustionModel, chemistryModel: Simplified model selection

The combustion and chemistry model selection has been simplified so
that the user does not have to specify the form of the thermodynamics.

Examples of new combustion and chemistry entries are as follows:

    In constant/combustionProperties:

        combustionModel PaSR;

        combustionModel FSD;

    In constant/chemistryProperties:

        chemistryType
        {
            solver          ode;
            method          TDAC;
        }

All the angle bracket parts of the model names (e.g.,
<psiThermoCombustion,gasHThermoPhysics>) have been removed as well as
the chemistryThermo entry.

The changes are mostly backward compatible. Only support for the
angle bracket form of chemistry solver names has been removed. Warnings
will print if some of the old entries are used, as the parts relating to
thermodynamics are now ignored.

ENH: combustionModel, chemistryModel: Simplified model selection

Updated all tutorials to the new format

STYLE: combustionModel: Namespace changes

Wrapped combustion model make macros in the Foam namespace and removed
combustion model namespace from the base classes. This fixes a namespace
specialisation bug in gcc 4.8. It is also somewhat less verbose in the
solvers.

This resolves bug report https://bugs.openfoam.org/view.php?id=2787

ENH: combustionModels: Default to the "none" model

When the constant/combustionProperties dictionary is missing, the solver
will now default to the "none" model. This is consistent with how
radiation models are selected.
This commit is contained in:
Will Bainbridge
2017-11-23 16:57:12 +00:00
committed by Andrew Heather
parent 255ec7366b
commit 22aae2816d
190 changed files with 2266 additions and 2991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tutorials/combustion/chemFoam/gri/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

3
tutorials/combustion/chemFoam/h2/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

3
tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

5
tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

3
tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

4
tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
combustionModel infinitelyFastChemistry;
active true;
@ -24,3 +24,5 @@ infinitelyFastChemistryCoeffs
semiImplicit no;
C 10;
}
// ************************************************************************* //

2
tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
combustionModel infinitelyFastChemistry;
active true;

6
tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
View File

@ -15,10 +15,10 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
combustionModel infinitelyFastChemistry;
//combustionModel FSD<psiThermoCombustion,gasHThermoPhysics>;
//combustionModel diffusionMulticomponent<psiChemistryCombustion,gasHThermoPhysics>;
//combustionModel FSD;
//combustionModel diffusionMulticomponent;
//NOTE: To use diffusionMulticomponent combustion model you need to rename files:
// reactions.twoSteps -> reactions
// thermophysicalProperties.twoSteps -> thermophysicalProperties

3
tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo psi;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
View File

@ -16,7 +16,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
combustionModel infinitelyFastChemistry;
active on;

5
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
importantSpecies

5
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties.test
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

2
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel EDC<psiChemistryCombustion>;
combustionModel EDC;
active true;

5
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties
View File

@ -16,9 +16,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

2
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel EDC<psiChemistryCombustion>;
combustionModel EDC;
active true;

3
tutorials/combustion/reactingFoam/RAS/membrane/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo psi;
solver EulerImplicit;
}
chemistry off;

2
tutorials/combustion/reactingFoam/RAS/membrane/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel noCombustion<psiThermoCombustion>;
combustionModel none;
// ************************************************************************* //

3
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo psi;
solver EulerImplicit;
}
chemistry on;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<psiChemistryCombustion>;
combustionModel laminar;
active true;

3
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo psi;
solver EulerImplicit;
}
chemistry on;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<psiChemistryCombustion>;
combustionModel laminar;
active true;

5
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<psiChemistryCombustion>;
combustionModel laminar;
active true;

3
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<psiChemistryCombustion>;
combustionModel laminar;
active true;

5
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

5
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties.new
View File

@ -17,9 +17,8 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
TDAC on;
solver ode;
method TDAC;
}
chemistry on;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<psiChemistryCombustion>;
combustionModel laminar;
active true;

3
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

2
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustion>;
combustionModel PaSR;
active true;

3
tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo rho;
solver EulerImplicit;
}
chemistry on;

2
tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active true;

3
tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustion>;
combustionModel PaSR;
active false;

3
tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo rho;
solver noChemistrySolver;
}
chemistry off;

2
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel laminar<rhoChemistryCombustion>;
combustionModel laminar;
active false;

3
tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo psi;
solver ode;
}
chemistry on;

2
tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustion>;
combustionModel PaSR;
active yes;

3
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo rho;
solver EulerImplicit;
}
chemistry on;

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustion>;
combustionModel PaSR;
active true;

3
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/chemistryProperties.gas
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo rho;
solver EulerImplicit;
}
chemistry off;

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/combustionProperties.gas
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustion>;
combustionModel PaSR;
active false;

3
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/chemistryProperties.gas
View File

@ -17,8 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver EulerImplicit;
chemistryThermo rho;
solver EulerImplicit;
}
chemistry off;

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/combustionProperties.gas
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustion>;
combustionModel PaSR;
active false;