zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermophysicalModels: Removed seldom used or unused instantiations

Browse Source 
Now that dynamic compilation of thermo and chemistry is available it is no
longer necessary or useful to instantiate vast numbers of thermo combinations
within the standard OpenFOAM libraries.  This reduces compile time, library size
and simplifies maintenance.
This commit is contained in:
Henry Weller
2021-04-21 21:22:52 +01:00
parent 6897a85cc3
commit 974712b2bd
28 changed files with 131 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C
View File

@ -27,13 +27,13 @@ License
#include "phaseSurfaceArrheniusReactionRate.H" #include "phaseSurfaceArrheniusReactionRate.H"
#include "forCommonGases.H" #include "forGases.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases forGases
( (
makeGeneralReaction, makeGeneralReaction,
IrreversibleReaction, IrreversibleReaction,

4
src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,7 +29,6 @@ License
#include "forGases.H" #include "forGases.H"
#include "forLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "forTabulated.H" #include "forTabulated.H"
#include "makeThermo.H" #include "makeThermo.H"
@ -39,7 +38,6 @@ namespace Foam
{ {
forGases(makeThermos, rhoThermo, heRhoThermo, pureMixture); forGases(makeThermos, rhoThermo, heRhoThermo, pureMixture);
forLiquids(makeThermos, rhoThermo, heRhoThermo, pureMixture); forLiquids(makeThermos, rhoThermo, heRhoThermo, pureMixture);
forPolynomials(makeThermos, rhoThermo, heRhoThermo, pureMixture);
forTabulated(makeThermos, rhoThermo, heRhoThermo, pureMixture); forTabulated(makeThermos, rhoThermo, heRhoThermo, pureMixture);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DACChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "DAC.H" #include "DAC.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, DAC); forGases(makeChemistryReductionMethod, DAC);
forCommonLiquids(makeChemistryReductionMethod, DAC); forLiquids(makeChemistryReductionMethod, DAC);
forPolynomials(makeChemistryReductionMethod, DAC);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRGChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "DRG.H" #include "DRG.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, DRG); forGases(makeChemistryReductionMethod, DRG);
forCommonLiquids(makeChemistryReductionMethod, DRG); forLiquids(makeChemistryReductionMethod, DRG);
forPolynomials(makeChemistryReductionMethod, DRG);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEPChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "DRGEP.H" #include "DRGEP.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, DRGEP); forGases(makeChemistryReductionMethod, DRGEP);
forCommonLiquids(makeChemistryReductionMethod, DRGEP); forLiquids(makeChemistryReductionMethod, DRGEP);
forPolynomials(makeChemistryReductionMethod, DRGEP);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/EFA/EFAChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "EFA.H" #include "EFA.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, EFA); forGases(makeChemistryReductionMethod, EFA);
forCommonLiquids(makeChemistryReductionMethod, EFA); forLiquids(makeChemistryReductionMethod, EFA);
forPolynomials(makeChemistryReductionMethod, EFA);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFAChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "PFA.H" #include "PFA.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, PFA); forGases(makeChemistryReductionMethod, PFA);
forCommonLiquids(makeChemistryReductionMethod, PFA); forLiquids(makeChemistryReductionMethod, PFA);
forPolynomials(makeChemistryReductionMethod, PFA);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -25,18 +25,16 @@ License
#include "chemistryReductionMethod.H" #include "chemistryReductionMethod.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(defineChemistryReductionMethod, nullArg); forGases(defineChemistryReductionMethod, nullArg);
forCommonLiquids(defineChemistryReductionMethod, nullArg); forLiquids(defineChemistryReductionMethod, nullArg);
forPolynomials(defineChemistryReductionMethod, nullArg);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReductionMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "noChemistryReduction.H" #include "noChemistryReduction.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryReductionMethod.H" #include "makeChemistryReductionMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryReductionMethod, none); forGases(makeChemistryReductionMethod, none);
forCommonLiquids(makeChemistryReductionMethod, none); forLiquids(makeChemistryReductionMethod, none);
forPolynomials(makeChemistryReductionMethod, none);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISATChemistryTabulationMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "ISAT.H" #include "ISAT.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryTabulationMethod.H" #include "makeChemistryTabulationMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryTabulationMethod, ISAT); forGases(makeChemistryTabulationMethod, ISAT);
forCommonLiquids(makeChemistryTabulationMethod, ISAT); forLiquids(makeChemistryTabulationMethod, ISAT);
forPolynomials(makeChemistryTabulationMethod, ISAT);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -25,18 +25,16 @@ License
#include "chemistryTabulationMethod.H" #include "chemistryTabulationMethod.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryTabulationMethod.H" #include "makeChemistryTabulationMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(defineChemistryTabulationMethod, nullArg); forGases(defineChemistryTabulationMethod, nullArg);
forCommonLiquids(defineChemistryTabulationMethod, nullArg); forLiquids(defineChemistryTabulationMethod, nullArg);
forPolynomials(defineChemistryTabulationMethod, nullArg);
} }

12
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulationMethods.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,18 +27,16 @@ License
#include "noChemistryTabulation.H" #include "noChemistryTabulation.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistryTabulationMethod.H" #include "makeChemistryTabulationMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistryTabulationMethod, none); forGases(makeChemistryTabulationMethod, none);
forCommonLiquids(makeChemistryTabulationMethod, none); forLiquids(makeChemistryTabulationMethod, none);
forPolynomials(makeChemistryTabulationMethod, none);
} }

12
src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,18 +28,16 @@ License
#include "StandardChemistryModel.H" #include "StandardChemistryModel.H"
#include "TDACChemistryModel.H" #include "TDACChemistryModel.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistrySolver.H" #include "makeChemistrySolver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistrySolvers, EulerImplicit); forGases(makeChemistrySolvers, EulerImplicit);
forCommonLiquids(makeChemistrySolvers, EulerImplicit); forLiquids(makeChemistrySolvers, EulerImplicit);
forPolynomials(makeChemistrySolvers, EulerImplicit);
} }

12
src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,18 +28,16 @@ License
#include "StandardChemistryModel.H" #include "StandardChemistryModel.H"
#include "TDACChemistryModel.H" #include "TDACChemistryModel.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistrySolver.H" #include "makeChemistrySolver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(defineChemistrySolvers, nullArg); forGases(defineChemistrySolvers, nullArg);
forCommonLiquids(defineChemistrySolvers, nullArg); forLiquids(defineChemistrySolvers, nullArg);
forPolynomials(defineChemistrySolvers, nullArg);
} }

12
src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,18 +28,16 @@ License
#include "StandardChemistryModel.H" #include "StandardChemistryModel.H"
#include "TDACChemistryModel.H" #include "TDACChemistryModel.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistrySolver.H" #include "makeChemistrySolver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistrySolvers, noChemistrySolver); forGases(makeChemistrySolvers, noChemistrySolver);
forCommonLiquids(makeChemistrySolvers, noChemistrySolver); forLiquids(makeChemistrySolvers, noChemistrySolver);
forPolynomials(makeChemistrySolvers, noChemistrySolver);
} }

12
src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,18 +28,16 @@ License
#include "StandardChemistryModel.H" #include "StandardChemistryModel.H"
#include "TDACChemistryModel.H" #include "TDACChemistryModel.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "makeChemistrySolver.H" #include "makeChemistrySolver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeChemistrySolvers, ode); forGases(makeChemistrySolvers, ode);
forCommonLiquids(makeChemistrySolvers, ode); forLiquids(makeChemistrySolvers, ode);
forPolynomials(makeChemistrySolvers, ode);
} }

6
src/thermophysicalModels/chemistryModel/reactions/fluxLimitedLangmuirHinshelwood/makefluxLimitedLangmuirHinshelwoodReactions.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,13 +27,13 @@ License
#include "fluxLimitedLangmuirHinshelwoodReactionRate.H" #include "fluxLimitedLangmuirHinshelwoodReactionRate.H"
#include "forCommonGases.H" #include "forGases.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases forGases
( (
makeGeneralReaction, makeGeneralReaction,
IrreversibleReaction, IrreversibleReaction,

12
src/thermophysicalModels/chemistryModel/reactions/makeLangmuirHinshelwoodReactions.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,17 +27,15 @@ License
#include "LangmuirHinshelwoodReactionRate.H" #include "LangmuirHinshelwoodReactionRate.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases(makeIRReactions, LangmuirHinshelwoodReactionRate); forGases(makeIRReactions, LangmuirHinshelwoodReactionRate);
forCommonLiquids(makeIRReactions, LangmuirHinshelwoodReactionRate); forLiquids(makeIRReactions, LangmuirHinshelwoodReactionRate);
forPolynomials(makeIRReactions, LangmuirHinshelwoodReactionRate);
} }
// ************************************************************************* // // ************************************************************************* //

6
src/thermophysicalModels/chemistryModel/reactions/makeMichaelisMentenReactions.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,13 +27,13 @@ License
#include "MichaelisMentenReactionRate.H" #include "MichaelisMentenReactionRate.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonLiquids(makeIReactions, MichaelisMentenReactionRate); forLiquids(makeIReactions, MichaelisMentenReactionRate);
} }
// ************************************************************************* // // ************************************************************************* //

103
src/thermophysicalModels/chemistryModel/reactions/makeReactions.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,9 +43,8 @@ License
#include "MichaelisMentenReactionRate.H" #include "MichaelisMentenReactionRate.H"
#include "forCommonGases.H" #include "forGases.H"
#include "forCommonLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,54 +58,41 @@ const char* const Foam::Tuple2<Foam::word, Foam::scalar>::typeName
namespace Foam namespace Foam
{ {
forCommonGases(defineReaction, nullArg); forGases(defineReaction, nullArg);
forCommonLiquids(defineReaction, nullArg); forLiquids(defineReaction, nullArg);
forPolynomials(defineReaction, nullArg);
// Irreversible/reversible/non-equilibrium-reversible reactions // Irreversible/reversible/non-equilibrium-reversible reactions
forCommonGases(makeIRNReactions, ArrheniusReactionRate); forGases(makeIRNReactions, ArrheniusReactionRate);
forCommonLiquids(makeIRNReactions, ArrheniusReactionRate); forLiquids(makeIRNReactions, ArrheniusReactionRate);
forPolynomials(makeIRNReactions, ArrheniusReactionRate);
forCommonGases(makeIRNReactions, LandauTellerReactionRate); forGases(makeIRNReactions, LandauTellerReactionRate);
forCommonLiquids(makeIRNReactions, LandauTellerReactionRate); forLiquids(makeIRNReactions, LandauTellerReactionRate);
forPolynomials(makeIRNReactions, LandauTellerReactionRate);
forCommonGases(makeIRNReactions, thirdBodyArrheniusReactionRate); forGases(makeIRNReactions, thirdBodyArrheniusReactionRate);
forCommonLiquids(makeIRNReactions, thirdBodyArrheniusReactionRate); forLiquids(makeIRNReactions, thirdBodyArrheniusReactionRate);
forPolynomials(makeIRNReactions, thirdBodyArrheniusReactionRate);
// Irreversible/reversible reactions // Irreversible/reversible reactions
forCommonGases(makeIRReactions, JanevReactionRate); forGases(makeIRReactions, JanevReactionRate);
forCommonLiquids(makeIRReactions, JanevReactionRate); forLiquids(makeIRReactions, JanevReactionRate);
forPolynomials(makeIRReactions, JanevReactionRate);
forCommonGases(makeIRReactions, powerSeriesReactionRate); forGases(makeIRReactions, powerSeriesReactionRate);
forCommonLiquids(makeIRReactions, powerSeriesReactionRate); forLiquids(makeIRReactions, powerSeriesReactionRate);
forPolynomials(makeIRReactions, powerSeriesReactionRate);
// Pressure dependent reactions // Pressure dependent reactions
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
LindemannFallOffFunction LindemannFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
FallOffReactionRate,
ArrheniusReactionRate,
LindemannFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
@ -114,21 +100,14 @@ namespace Foam
LindemannFallOffFunction LindemannFallOffFunction
); );
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
TroeFallOffFunction TroeFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
FallOffReactionRate,
ArrheniusReactionRate,
TroeFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
@ -136,21 +115,14 @@ namespace Foam
TroeFallOffFunction TroeFallOffFunction
); );
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
SRIFallOffFunction SRIFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
FallOffReactionRate,
ArrheniusReactionRate,
SRIFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
FallOffReactionRate, FallOffReactionRate,
@ -158,21 +130,14 @@ namespace Foam
SRIFallOffFunction SRIFallOffFunction
); );
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
LindemannFallOffFunction LindemannFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate,
ArrheniusReactionRate,
LindemannFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,
@ -180,21 +145,14 @@ namespace Foam
LindemannFallOffFunction LindemannFallOffFunction
); );
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
TroeFallOffFunction TroeFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate,
ArrheniusReactionRate,
TroeFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,
@ -202,21 +160,14 @@ namespace Foam
TroeFallOffFunction TroeFallOffFunction
); );
forCommonGases forGases
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,
ArrheniusReactionRate, ArrheniusReactionRate,
SRIFallOffFunction SRIFallOffFunction
); );
forCommonLiquids forLiquids
(
makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate,
ArrheniusReactionRate,
SRIFallOffFunction
);
forPolynomials
( (
makeIRRPressureDependentReactions, makeIRRPressureDependentReactions,
ChemicallyActivatedReactionRate, ChemicallyActivatedReactionRate,

6
src/thermophysicalModels/chemistryModel/reactions/surfaceArrheniusReactionRate/makesurfaceArrheniusReactions.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,13 +27,13 @@ License
#include "surfaceArrheniusReactionRate.H" #include "surfaceArrheniusReactionRate.H"
#include "forCommonGases.H" #include "forGases.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
forCommonGases forGases
( (
makeGeneralReaction, makeGeneralReaction,
IrreversibleReaction, IrreversibleReaction,

6
src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,7 +33,6 @@ License
#include "forGases.H" #include "forGases.H"
#include "forLiquids.H" #include "forLiquids.H"
#include "forPolynomials.H"
#include "forTabulated.H" #include "forTabulated.H"
#include "makeReactionThermo.H" #include "makeReactionThermo.H"
@ -68,9 +67,6 @@ namespace Foam
forLiquids(makeRhoReactionThermos, coefficientMultiComponentMixture); forLiquids(makeRhoReactionThermos, coefficientMultiComponentMixture);
forLiquids(makeRhoReactionThermo, singleComponentMixture); forLiquids(makeRhoReactionThermo, singleComponentMixture);
forPolynomials(makeRhoReactionThermos, coefficientMultiComponentMixture);
forPolynomials(makeRhoReactionThermo, singleComponentMixture);
forTabulated(makeRhoReactionThermos, valueMultiComponentMixture); forTabulated(makeRhoReactionThermos, valueMultiComponentMixture);
} }

8
src/thermophysicalModels/specie/include/forAbsoluteGases.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,7 +35,6 @@ License
#include "janafThermo.H" #include "janafThermo.H"
#include "absoluteEnthalpy.H" #include "absoluteEnthalpy.H"
#include "absoluteInternalEnergy.H"
#include "constTransport.H" #include "constTransport.H"
#include "sutherlandTransport.H" #include "sutherlandTransport.H"
@ -51,10 +50,7 @@ License
#define forAbsoluteGasEnergiesAndThermos(Mu, Macro, Args...) \ #define forAbsoluteGasEnergiesAndThermos(Mu, Macro, Args...) \
forAbsoluteGasEqns(Mu, absoluteEnthalpy, hConstThermo, Macro, Args); \ forAbsoluteGasEqns(Mu, absoluteEnthalpy, hConstThermo, Macro, Args); \
forAbsoluteGasEqns(Mu, absoluteEnthalpy, janafThermo, Macro, Args); \ forAbsoluteGasEqns(Mu, absoluteEnthalpy, janafThermo, Macro, Args);
forAbsoluteGasEqns(Mu, absoluteInternalEnergy, eConstThermo, Macro, Args); \
forAbsoluteGasEqns(Mu, absoluteInternalEnergy, hConstThermo, Macro, Args); \
forAbsoluteGasEqns(Mu, absoluteInternalEnergy, janafThermo, Macro, Args)
#define forAbsoluteGasTransports(Macro, Args...) \ #define forAbsoluteGasTransports(Macro, Args...) \
forAbsoluteGasEnergiesAndThermos(constTransport, Macro, Args); \ forAbsoluteGasEnergiesAndThermos(constTransport, Macro, Args); \

72
src/thermophysicalModels/specie/include/forCommonGases.H
View File

@ -1,72 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#ifndef forCommonGases_H
#define forCommonGases_H
#include "specie.H"
#include "incompressiblePerfectGas.H"
#include "perfectGas.H"
#include "eConstThermo.H"
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
#include "thermo.H"
#include "forThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define forCommonGasEqns(Mu, He, Cp, Macro, Args...) \
forThermo(Mu, He, Cp, incompressiblePerfectGas, specie, Macro, Args); \
forThermo(Mu, He, Cp, perfectGas, specie, Macro, Args)
#define forCommonGasEnergiesAndThermos(Mu, Macro, Args...) \
forCommonGasEqns(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \
forCommonGasEqns(Mu, sensibleEnthalpy, janafThermo, Macro, Args); \
forCommonGasEqns(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args); \
forCommonGasEqns(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args); \
forCommonGasEqns(Mu, sensibleInternalEnergy, janafThermo, Macro, Args)
#define forCommonGasTransports(Macro, Args...) \
forCommonGasEnergiesAndThermos(constTransport, Macro, Args); \
forCommonGasEnergiesAndThermos(sutherlandTransport, Macro, Args)
#define forCommonGases(Macro, Args...) \
forCommonGasTransports(Macro, Args)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

70
src/thermophysicalModels/specie/include/forCommonLiquids.H
View File

@ -1,70 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#ifndef forCommonLiquids_H
#define forCommonLiquids_H
#include "specie.H"
#include "adiabaticPerfectFluid.H"
#include "perfectFluid.H"
#include "rhoConst.H"
#include "rPolynomial.H"
#include "eConstThermo.H"
#include "hConstThermo.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
#include "constTransport.H"
#include "WLFTransport.H"
#include "thermo.H"
#include "forThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define forCommonLiquidEqns(Mu, He, Cp, Macro, Args...) \
forThermo(Mu, He, Cp, rhoConst, specie, Macro, Args); \
forThermo(Mu, He, Cp, rPolynomial, specie, Macro, Args)
#define forCommonLiquidEnergiesAndThermos(Mu, Macro, Args...) \
forCommonLiquidEqns(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \
forCommonLiquidEqns(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args);\
forCommonLiquidEqns(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args)
#define forCommonLiquidTransports(Macro, Args...) \
forCommonLiquidEnergiesAndThermos(constTransport, Macro, Args);
#define forCommonLiquids(Macro, Args...) \
forCommonLiquidTransports(Macro, Args)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

28
src/thermophysicalModels/specie/include/forGases.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,9 +29,7 @@ License
#include "specie.H" #include "specie.H"
#include "Boussinesq.H" #include "Boussinesq.H"
#include "incompressiblePerfectGas.H"
#include "perfectGas.H" #include "perfectGas.H"
#include "PengRobinsonGas.H"
#include "eConstThermo.H" #include "eConstThermo.H"
#include "hConstThermo.H" #include "hConstThermo.H"
@ -49,24 +47,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define forGasEquations(Mu, He, Cp, Macro, Args...) \ #define forGasEqns(Mu, He, Cp, Macro, Args...) \
forThermo(Mu, He, Cp, Boussinesq, specie, Macro, Args); \ forThermo(Mu, He, Cp, Boussinesq, specie, Macro, Args); \
forThermo(Mu, He, Cp, incompressiblePerfectGas, specie, Macro, Args); \
forThermo(Mu, He, Cp, PengRobinsonGas, specie, Macro, Args); \
forThermo(Mu, He, Cp, perfectGas, specie, Macro, Args) forThermo(Mu, He, Cp, perfectGas, specie, Macro, Args)
#define forGasEnergiesAndThermos(Mu, Macro, Args...) \ #define forGasEnergiesAndThermos(Mu, Macro, Args...) \
forGasEquations(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \ forGasEqns(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \
forGasEquations(Mu, sensibleEnthalpy, janafThermo, Macro, Args); \ forGasEqns(Mu, sensibleEnthalpy, janafThermo, Macro, Args); \
forGasEquations(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args); \ forGasEqns(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args); \
forGasEquations(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args); \ forGasEqns(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args); \
forGasEquations(Mu, sensibleInternalEnergy, janafThermo, Macro, Args) forGasEqns(Mu, sensibleInternalEnergy, janafThermo, Macro, Args)
#define forGasTransports(Macro, Args...) \ #define forGasTransports(Macro, Args...) \
forGasEnergiesAndThermos(constTransport, Macro, Args); \ forGasEnergiesAndThermos(constTransport, Macro, Args); \
forGasEnergiesAndThermos(sutherlandTransport, Macro, Args) forGasEnergiesAndThermos(sutherlandTransport, Macro, Args)
#define forGases(Macro, Args...) \ #define forGases(Macro, Args...) \
forGasTransports(Macro, Args) forGasTransports(Macro, Args)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

7
src/thermophysicalModels/specie/include/forLiquids.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,7 +29,6 @@ License
#include "specie.H" #include "specie.H"
#include "adiabaticPerfectFluid.H" #include "adiabaticPerfectFluid.H"
#include "perfectFluid.H"
#include "rhoConst.H" #include "rhoConst.H"
#include "rPolynomial.H" #include "rPolynomial.H"
@ -40,7 +39,6 @@ License
#include "sensibleInternalEnergy.H" #include "sensibleInternalEnergy.H"
#include "constTransport.H" #include "constTransport.H"
#include "WLFTransport.H"
#include "thermo.H" #include "thermo.H"
@ -59,8 +57,7 @@ License
forLiquidEquations(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args) forLiquidEquations(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args)
#define forLiquidTransports(Macro, Args...) \ #define forLiquidTransports(Macro, Args...) \
forLiquidEnergiesAndThermos(constTransport, Macro, Args); \ forLiquidEnergiesAndThermos(constTransport, Macro, Args);
forLiquidEnergiesAndThermos(WLFTransport, Macro, Args)
#define forLiquids(Macro, Args...) \ #define forLiquids(Macro, Args...) \
forLiquidTransports(Macro, Args) forLiquidTransports(Macro, Args)

63
src/thermophysicalModels/specie/include/forPolynomials.H
View File

@ -1,63 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#ifndef forPolynomials_H
#define forPolynomials_H
#include "specie.H"
#include "icoPolynomial.H"
#include "hPolynomialThermo.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
#include "logPolynomialTransport.H"
#include "polynomialTransport.H"
#include "thermo.H"
#include "forThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define forPolynomialEquations(Mu, He, Cp, Args...) \
forThermo(Mu, He, Cp, icoPolynomial, specie, Args);
#define forPolynomialEnergiesAndThermos(Mu, Args...) \
forPolynomialEquations(Mu, sensibleEnthalpy, hPolynomialThermo, Args); \
forPolynomialEquations(Mu, sensibleInternalEnergy, hPolynomialThermo, Args)
#define forPolynomialTransports(Args...) \
forPolynomialEnergiesAndThermos(logPolynomialTransport, Args); \
forPolynomialEnergiesAndThermos(polynomialTransport, Args)
#define forPolynomials(Macro, Args...) \
forPolynomialTransports(Macro, Args)
#endif
// ************************************************************************* //