From 974712b2bdb05a1e2e736e61bca49a88cd08cda0 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 21 Apr 2021 21:22:52 +0100 Subject: [PATCH] thermophysicalModels: Removed seldom used or unused instantiations 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. --- .../makephaseSurfaceArrheniusReactions.C | 4 +- .../basic/rhoThermo/rhoThermos.C | 4 +- .../DAC/DACChemistryReductionMethods.C | 12 +- .../DRG/DRGChemistryReductionMethods.C | 12 +- .../DRGEP/DRGEPChemistryReductionMethods.C | 12 +- .../EFA/EFAChemistryReductionMethods.C | 12 +- .../PFA/PFAChemistryReductionMethods.C | 12 +- .../chemistryReductionMethods.C | 12 +- .../noChemistryReductionMethods.C | 12 +- .../ISAT/ISATChemistryTabulationMethods.C | 12 +- .../chemistryTabulationMethods.C | 12 +- .../noChemistryTabulationMethods.C | 12 +- .../EulerImplicitChemistrySolvers.C | 12 +- .../chemistrySolver/chemistrySolvers.C | 12 +- .../noChemistrySolver/noChemistrySolvers.C | 12 +- .../chemistrySolver/ode/odeChemistrySolvers.C | 12 +- ...efluxLimitedLangmuirHinshelwoodReactions.C | 6 +- .../makeLangmuirHinshelwoodReactions.C | 12 +- .../reactions/makeMichaelisMentenReactions.C | 6 +- .../chemistryModel/reactions/makeReactions.C | 103 +++++------------- .../makesurfaceArrheniusReactions.C | 6 +- .../rhoReactionThermo/rhoReactionThermos.C | 6 +- .../specie/include/forAbsoluteGases.H | 8 +- .../specie/include/forCommonGases.H | 72 ------------ .../specie/include/forCommonLiquids.H | 70 ------------ .../specie/include/forGases.H | 28 ++--- .../specie/include/forLiquids.H | 7 +- .../specie/include/forPolynomials.H | 63 ----------- 28 files changed, 131 insertions(+), 432 deletions(-) delete mode 100644 src/thermophysicalModels/specie/include/forCommonGases.H delete mode 100644 src/thermophysicalModels/specie/include/forCommonLiquids.H delete mode 100644 src/thermophysicalModels/specie/include/forPolynomials.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C index dabd075057..4aae5558c9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C @@ -27,13 +27,13 @@ License #include "phaseSurfaceArrheniusReactionRate.H" -#include "forCommonGases.H" +#include "forGases.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases + forGases ( makeGeneralReaction, IrreversibleReaction, diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C index ea0391785f..6d5d2ca2cf 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,6 @@ License #include "forGases.H" #include "forLiquids.H" -#include "forPolynomials.H" #include "forTabulated.H" #include "makeThermo.H" @@ -39,7 +38,6 @@ namespace Foam { forGases(makeThermos, rhoThermo, heRhoThermo, pureMixture); forLiquids(makeThermos, rhoThermo, heRhoThermo, pureMixture); - forPolynomials(makeThermos, rhoThermo, heRhoThermo, pureMixture); forTabulated(makeThermos, rhoThermo, heRhoThermo, pureMixture); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DACChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DACChemistryReductionMethods.C index 2f55f2d5ce..b368495f18 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DACChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DACChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "DAC.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, DAC); - forCommonLiquids(makeChemistryReductionMethod, DAC); - forPolynomials(makeChemistryReductionMethod, DAC); + forGases(makeChemistryReductionMethod, DAC); + forLiquids(makeChemistryReductionMethod, DAC); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRGChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRGChemistryReductionMethods.C index d851df8241..6edd374017 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRGChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRGChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "DRG.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, DRG); - forCommonLiquids(makeChemistryReductionMethod, DRG); - forPolynomials(makeChemistryReductionMethod, DRG); + forGases(makeChemistryReductionMethod, DRG); + forLiquids(makeChemistryReductionMethod, DRG); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEPChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEPChemistryReductionMethods.C index 44cf106771..70791136f0 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEPChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRGEP/DRGEPChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "DRGEP.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, DRGEP); - forCommonLiquids(makeChemistryReductionMethod, DRGEP); - forPolynomials(makeChemistryReductionMethod, DRGEP); + forGases(makeChemistryReductionMethod, DRGEP); + forLiquids(makeChemistryReductionMethod, DRGEP); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/EFA/EFAChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/EFA/EFAChemistryReductionMethods.C index 88d670f70c..e6613f7b4a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/EFA/EFAChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/EFA/EFAChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "EFA.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, EFA); - forCommonLiquids(makeChemistryReductionMethod, EFA); - forPolynomials(makeChemistryReductionMethod, EFA); + forGases(makeChemistryReductionMethod, EFA); + forLiquids(makeChemistryReductionMethod, EFA); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFAChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFAChemistryReductionMethods.C index 82499738ad..2599ab678b 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFAChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFAChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "PFA.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, PFA); - forCommonLiquids(makeChemistryReductionMethod, PFA); - forPolynomials(makeChemistryReductionMethod, PFA); + forGases(makeChemistryReductionMethod, PFA); + forLiquids(makeChemistryReductionMethod, PFA); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethods.C index ab4ced6297..c627473d14 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,18 +25,16 @@ License #include "chemistryReductionMethod.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(defineChemistryReductionMethod, nullArg); - forCommonLiquids(defineChemistryReductionMethod, nullArg); - forPolynomials(defineChemistryReductionMethod, nullArg); + forGases(defineChemistryReductionMethod, nullArg); + forLiquids(defineChemistryReductionMethod, nullArg); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReductionMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReductionMethods.C index 885fd48587..94868cab7e 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReductionMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReductionMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "noChemistryReduction.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryReductionMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryReductionMethod, none); - forCommonLiquids(makeChemistryReductionMethod, none); - forPolynomials(makeChemistryReductionMethod, none); + forGases(makeChemistryReductionMethod, none); + forLiquids(makeChemistryReductionMethod, none); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISATChemistryTabulationMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISATChemistryTabulationMethods.C index e126b1e983..aa502cdc22 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISATChemistryTabulationMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISATChemistryTabulationMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "ISAT.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryTabulationMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryTabulationMethod, ISAT); - forCommonLiquids(makeChemistryTabulationMethod, ISAT); - forPolynomials(makeChemistryTabulationMethod, ISAT); + forGases(makeChemistryTabulationMethod, ISAT); + forLiquids(makeChemistryTabulationMethod, ISAT); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethods.C index ddf0972cb0..2d03196524 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,18 +25,16 @@ License #include "chemistryTabulationMethod.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryTabulationMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(defineChemistryTabulationMethod, nullArg); - forCommonLiquids(defineChemistryTabulationMethod, nullArg); - forPolynomials(defineChemistryTabulationMethod, nullArg); + forGases(defineChemistryTabulationMethod, nullArg); + forLiquids(defineChemistryTabulationMethod, nullArg); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulationMethods.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulationMethods.C index e5644e13f0..e9351bd8aa 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulationMethods.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulationMethods.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,16 @@ License #include "noChemistryTabulation.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistryTabulationMethod.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistryTabulationMethod, none); - forCommonLiquids(makeChemistryTabulationMethod, none); - forPolynomials(makeChemistryTabulationMethod, none); + forGases(makeChemistryTabulationMethod, none); + forLiquids(makeChemistryTabulationMethod, none); } diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C index 76c490278c..e93d9411a5 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicitChemistrySolvers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,18 +28,16 @@ License #include "StandardChemistryModel.H" #include "TDACChemistryModel.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistrySolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistrySolvers, EulerImplicit); - forCommonLiquids(makeChemistrySolvers, EulerImplicit); - forPolynomials(makeChemistrySolvers, EulerImplicit); + forGases(makeChemistrySolvers, EulerImplicit); + forLiquids(makeChemistrySolvers, EulerImplicit); } diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C index 0e4cb5df52..cab31d0992 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolvers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,18 +28,16 @@ License #include "StandardChemistryModel.H" #include "TDACChemistryModel.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistrySolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(defineChemistrySolvers, nullArg); - forCommonLiquids(defineChemistrySolvers, nullArg); - forPolynomials(defineChemistrySolvers, nullArg); + forGases(defineChemistrySolvers, nullArg); + forLiquids(defineChemistrySolvers, nullArg); } diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C index dd1dd31ef6..74a90a6953 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolvers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,18 +28,16 @@ License #include "StandardChemistryModel.H" #include "TDACChemistryModel.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistrySolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistrySolvers, noChemistrySolver); - forCommonLiquids(makeChemistrySolvers, noChemistrySolver); - forPolynomials(makeChemistrySolvers, noChemistrySolver); + forGases(makeChemistrySolvers, noChemistrySolver); + forLiquids(makeChemistrySolvers, noChemistrySolver); } diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C index b69aac2b85..5abf46e92a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/odeChemistrySolvers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,18 +28,16 @@ License #include "StandardChemistryModel.H" #include "TDACChemistryModel.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" #include "makeChemistrySolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeChemistrySolvers, ode); - forCommonLiquids(makeChemistrySolvers, ode); - forPolynomials(makeChemistrySolvers, ode); + forGases(makeChemistrySolvers, ode); + forLiquids(makeChemistrySolvers, ode); } diff --git a/src/thermophysicalModels/chemistryModel/reactions/fluxLimitedLangmuirHinshelwood/makefluxLimitedLangmuirHinshelwoodReactions.C b/src/thermophysicalModels/chemistryModel/reactions/fluxLimitedLangmuirHinshelwood/makefluxLimitedLangmuirHinshelwoodReactions.C index 084808998b..084c304fca 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/fluxLimitedLangmuirHinshelwood/makefluxLimitedLangmuirHinshelwoodReactions.C +++ b/src/thermophysicalModels/chemistryModel/reactions/fluxLimitedLangmuirHinshelwood/makefluxLimitedLangmuirHinshelwoodReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,13 +27,13 @@ License #include "fluxLimitedLangmuirHinshelwoodReactionRate.H" -#include "forCommonGases.H" +#include "forGases.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases + forGases ( makeGeneralReaction, IrreversibleReaction, diff --git a/src/thermophysicalModels/chemistryModel/reactions/makeLangmuirHinshelwoodReactions.C b/src/thermophysicalModels/chemistryModel/reactions/makeLangmuirHinshelwoodReactions.C index 0e8f0837c3..79119bac4b 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/makeLangmuirHinshelwoodReactions.C +++ b/src/thermophysicalModels/chemistryModel/reactions/makeLangmuirHinshelwoodReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,17 +27,15 @@ License #include "LangmuirHinshelwoodReactionRate.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases(makeIRReactions, LangmuirHinshelwoodReactionRate); - forCommonLiquids(makeIRReactions, LangmuirHinshelwoodReactionRate); - forPolynomials(makeIRReactions, LangmuirHinshelwoodReactionRate); + forGases(makeIRReactions, LangmuirHinshelwoodReactionRate); + forLiquids(makeIRReactions, LangmuirHinshelwoodReactionRate); } // ************************************************************************* // diff --git a/src/thermophysicalModels/chemistryModel/reactions/makeMichaelisMentenReactions.C b/src/thermophysicalModels/chemistryModel/reactions/makeMichaelisMentenReactions.C index e081485b96..c7bc959336 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/makeMichaelisMentenReactions.C +++ b/src/thermophysicalModels/chemistryModel/reactions/makeMichaelisMentenReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,13 +27,13 @@ License #include "MichaelisMentenReactionRate.H" -#include "forCommonLiquids.H" +#include "forLiquids.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonLiquids(makeIReactions, MichaelisMentenReactionRate); + forLiquids(makeIReactions, MichaelisMentenReactionRate); } // ************************************************************************* // diff --git a/src/thermophysicalModels/chemistryModel/reactions/makeReactions.C b/src/thermophysicalModels/chemistryModel/reactions/makeReactions.C index 199ab4eded..2097931668 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/makeReactions.C +++ b/src/thermophysicalModels/chemistryModel/reactions/makeReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,9 +43,8 @@ License #include "MichaelisMentenReactionRate.H" -#include "forCommonGases.H" -#include "forCommonLiquids.H" -#include "forPolynomials.H" +#include "forGases.H" +#include "forLiquids.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,54 +58,41 @@ const char* const Foam::Tuple2::typeName namespace Foam { - forCommonGases(defineReaction, nullArg); - forCommonLiquids(defineReaction, nullArg); - forPolynomials(defineReaction, nullArg); + forGases(defineReaction, nullArg); + forLiquids(defineReaction, nullArg); // Irreversible/reversible/non-equilibrium-reversible reactions - forCommonGases(makeIRNReactions, ArrheniusReactionRate); - forCommonLiquids(makeIRNReactions, ArrheniusReactionRate); - forPolynomials(makeIRNReactions, ArrheniusReactionRate); + forGases(makeIRNReactions, ArrheniusReactionRate); + forLiquids(makeIRNReactions, ArrheniusReactionRate); - forCommonGases(makeIRNReactions, LandauTellerReactionRate); - forCommonLiquids(makeIRNReactions, LandauTellerReactionRate); - forPolynomials(makeIRNReactions, LandauTellerReactionRate); + forGases(makeIRNReactions, LandauTellerReactionRate); + forLiquids(makeIRNReactions, LandauTellerReactionRate); - forCommonGases(makeIRNReactions, thirdBodyArrheniusReactionRate); - forCommonLiquids(makeIRNReactions, thirdBodyArrheniusReactionRate); - forPolynomials(makeIRNReactions, thirdBodyArrheniusReactionRate); + forGases(makeIRNReactions, thirdBodyArrheniusReactionRate); + forLiquids(makeIRNReactions, thirdBodyArrheniusReactionRate); // Irreversible/reversible reactions - forCommonGases(makeIRReactions, JanevReactionRate); - forCommonLiquids(makeIRReactions, JanevReactionRate); - forPolynomials(makeIRReactions, JanevReactionRate); + forGases(makeIRReactions, JanevReactionRate); + forLiquids(makeIRReactions, JanevReactionRate); - forCommonGases(makeIRReactions, powerSeriesReactionRate); - forCommonLiquids(makeIRReactions, powerSeriesReactionRate); - forPolynomials(makeIRReactions, powerSeriesReactionRate); + forGases(makeIRReactions, powerSeriesReactionRate); + forLiquids(makeIRReactions, powerSeriesReactionRate); // Pressure dependent reactions - forCommonGases + forGases ( makeIRRPressureDependentReactions, FallOffReactionRate, ArrheniusReactionRate, LindemannFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - FallOffReactionRate, - ArrheniusReactionRate, - LindemannFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, FallOffReactionRate, @@ -114,21 +100,14 @@ namespace Foam LindemannFallOffFunction ); - forCommonGases + forGases ( makeIRRPressureDependentReactions, FallOffReactionRate, ArrheniusReactionRate, TroeFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - FallOffReactionRate, - ArrheniusReactionRate, - TroeFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, FallOffReactionRate, @@ -136,21 +115,14 @@ namespace Foam TroeFallOffFunction ); - forCommonGases + forGases ( makeIRRPressureDependentReactions, FallOffReactionRate, ArrheniusReactionRate, SRIFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - FallOffReactionRate, - ArrheniusReactionRate, - SRIFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, FallOffReactionRate, @@ -158,21 +130,14 @@ namespace Foam SRIFallOffFunction ); - forCommonGases + forGases ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, ArrheniusReactionRate, LindemannFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - ChemicallyActivatedReactionRate, - ArrheniusReactionRate, - LindemannFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, @@ -180,21 +145,14 @@ namespace Foam LindemannFallOffFunction ); - forCommonGases + forGases ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, ArrheniusReactionRate, TroeFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - ChemicallyActivatedReactionRate, - ArrheniusReactionRate, - TroeFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, @@ -202,21 +160,14 @@ namespace Foam TroeFallOffFunction ); - forCommonGases + forGases ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, ArrheniusReactionRate, SRIFallOffFunction ); - forCommonLiquids - ( - makeIRRPressureDependentReactions, - ChemicallyActivatedReactionRate, - ArrheniusReactionRate, - SRIFallOffFunction - ); - forPolynomials + forLiquids ( makeIRRPressureDependentReactions, ChemicallyActivatedReactionRate, diff --git a/src/thermophysicalModels/chemistryModel/reactions/surfaceArrheniusReactionRate/makesurfaceArrheniusReactions.C b/src/thermophysicalModels/chemistryModel/reactions/surfaceArrheniusReactionRate/makesurfaceArrheniusReactions.C index a52ff7c684..5dd46b7b67 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/surfaceArrheniusReactionRate/makesurfaceArrheniusReactions.C +++ b/src/thermophysicalModels/chemistryModel/reactions/surfaceArrheniusReactionRate/makesurfaceArrheniusReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,13 +27,13 @@ License #include "surfaceArrheniusReactionRate.H" -#include "forCommonGases.H" +#include "forGases.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - forCommonGases + forGases ( makeGeneralReaction, IrreversibleReaction, diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C index 0ce28b4fce..e071b3f2ef 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,6 @@ License #include "forGases.H" #include "forLiquids.H" -#include "forPolynomials.H" #include "forTabulated.H" #include "makeReactionThermo.H" @@ -68,9 +67,6 @@ namespace Foam forLiquids(makeRhoReactionThermos, coefficientMultiComponentMixture); forLiquids(makeRhoReactionThermo, singleComponentMixture); - forPolynomials(makeRhoReactionThermos, coefficientMultiComponentMixture); - forPolynomials(makeRhoReactionThermo, singleComponentMixture); - forTabulated(makeRhoReactionThermos, valueMultiComponentMixture); } diff --git a/src/thermophysicalModels/specie/include/forAbsoluteGases.H b/src/thermophysicalModels/specie/include/forAbsoluteGases.H index 758c445d5e..a2de1826e5 100644 --- a/src/thermophysicalModels/specie/include/forAbsoluteGases.H +++ b/src/thermophysicalModels/specie/include/forAbsoluteGases.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,6 @@ License #include "janafThermo.H" #include "absoluteEnthalpy.H" -#include "absoluteInternalEnergy.H" #include "constTransport.H" #include "sutherlandTransport.H" @@ -51,10 +50,7 @@ License #define forAbsoluteGasEnergiesAndThermos(Mu, Macro, Args...) \ forAbsoluteGasEqns(Mu, absoluteEnthalpy, hConstThermo, 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) + forAbsoluteGasEqns(Mu, absoluteEnthalpy, janafThermo, Macro, Args); #define forAbsoluteGasTransports(Macro, Args...) \ forAbsoluteGasEnergiesAndThermos(constTransport, Macro, Args); \ diff --git a/src/thermophysicalModels/specie/include/forCommonGases.H b/src/thermophysicalModels/specie/include/forCommonGases.H deleted file mode 100644 index e23038e8a0..0000000000 --- a/src/thermophysicalModels/specie/include/forCommonGases.H +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#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 - -// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/include/forCommonLiquids.H b/src/thermophysicalModels/specie/include/forCommonLiquids.H deleted file mode 100644 index 368a984283..0000000000 --- a/src/thermophysicalModels/specie/include/forCommonLiquids.H +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#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 - -// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/include/forGases.H b/src/thermophysicalModels/specie/include/forGases.H index 83ee50eb7e..f769d35eab 100644 --- a/src/thermophysicalModels/specie/include/forGases.H +++ b/src/thermophysicalModels/specie/include/forGases.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ License #include "specie.H" #include "Boussinesq.H" -#include "incompressiblePerfectGas.H" #include "perfectGas.H" -#include "PengRobinsonGas.H" #include "eConstThermo.H" #include "hConstThermo.H" @@ -49,24 +47,22 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define forGasEquations(Mu, He, Cp, 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); \ +#define forGasEqns(Mu, He, Cp, Macro, Args...) \ + forThermo(Mu, He, Cp, Boussinesq, specie, Macro, Args); \ forThermo(Mu, He, Cp, perfectGas, specie, Macro, Args) -#define forGasEnergiesAndThermos(Mu, Macro, Args...) \ - forGasEquations(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \ - forGasEquations(Mu, sensibleEnthalpy, janafThermo, Macro, Args); \ - forGasEquations(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args); \ - forGasEquations(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args); \ - forGasEquations(Mu, sensibleInternalEnergy, janafThermo, Macro, Args) +#define forGasEnergiesAndThermos(Mu, Macro, Args...) \ + forGasEqns(Mu, sensibleEnthalpy, hConstThermo, Macro, Args); \ + forGasEqns(Mu, sensibleEnthalpy, janafThermo, Macro, Args); \ + forGasEqns(Mu, sensibleInternalEnergy, eConstThermo, Macro, Args); \ + forGasEqns(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args); \ + forGasEqns(Mu, sensibleInternalEnergy, janafThermo, Macro, Args) -#define forGasTransports(Macro, Args...) \ - forGasEnergiesAndThermos(constTransport, Macro, Args); \ +#define forGasTransports(Macro, Args...) \ + forGasEnergiesAndThermos(constTransport, Macro, Args); \ forGasEnergiesAndThermos(sutherlandTransport, Macro, Args) -#define forGases(Macro, Args...) \ +#define forGases(Macro, Args...) \ forGasTransports(Macro, Args) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/include/forLiquids.H b/src/thermophysicalModels/specie/include/forLiquids.H index 6898f97d0c..04cb57a2b9 100644 --- a/src/thermophysicalModels/specie/include/forLiquids.H +++ b/src/thermophysicalModels/specie/include/forLiquids.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,6 @@ License #include "specie.H" #include "adiabaticPerfectFluid.H" -#include "perfectFluid.H" #include "rhoConst.H" #include "rPolynomial.H" @@ -40,7 +39,6 @@ License #include "sensibleInternalEnergy.H" #include "constTransport.H" -#include "WLFTransport.H" #include "thermo.H" @@ -59,8 +57,7 @@ License forLiquidEquations(Mu, sensibleInternalEnergy, hConstThermo, Macro, Args) #define forLiquidTransports(Macro, Args...) \ - forLiquidEnergiesAndThermos(constTransport, Macro, Args); \ - forLiquidEnergiesAndThermos(WLFTransport, Macro, Args) + forLiquidEnergiesAndThermos(constTransport, Macro, Args); #define forLiquids(Macro, Args...) \ forLiquidTransports(Macro, Args) diff --git a/src/thermophysicalModels/specie/include/forPolynomials.H b/src/thermophysicalModels/specie/include/forPolynomials.H deleted file mode 100644 index 0b7b96abf0..0000000000 --- a/src/thermophysicalModels/specie/include/forPolynomials.H +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#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 - -// ************************************************************************* //