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

thermophysicalModels: Permit wildcard names of thermo dictionaries

Browse Source 
This can be useful when reusing thermo configurations across multiple
setups. In one simulation, the fluid might be entirely air, and in
another there might be additional pollutant or fuel species. This could
be defined without changing the species' thermo enties as follows:

    "(mixture|air)"
    {
        specie
        {
            molWeight   28.9;
        }
        thermodynamics
        {
            Hf          0;
            Cv          724.8;
        }
        transport
        {
            mu          1.84e-05;
            Pr          0.7;
        }
    }

This was semi-supported before, but it lead to the wrong name (i.e., the
wildcard string) being stored in the base specie class. Now the name is
passed through the thermo constructors, so it is always correct.
This commit is contained in:
Will Bainbridge
2023-06-08 09:46:12 +01:00
parent f25278f9e2
commit 5233335924
116 changed files with 613 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/test/thermoMixture/Test-thermoMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,8 +55,8 @@ int main(int argc, char *argv[])
dictionary dict(IFstream("thermoDict")());
ThermoType t1(dict.subDict("specie1"));
ThermoType t2(dict.subDict("specie2"));
ThermoType t1("specie1", dict.subDict("specie1"));
ThermoType t2("specie2", dict.subDict("specie2"));
Info<< "Checking Cp of mixture of hConstThermo" << endl;

39
applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -101,48 +101,23 @@ int main(int argc, char *argv[])
scalar stoicCO2 = n;
scalar stoicH2O = m/2.0;
thermo FUEL
(
"fuel",
thermo(thermoData.subDict(fuelName))
);
thermo FUEL("fuel", thermoData.subDict(fuelName));
Info<< "fuel " << FUEL << ';' << endl;
FUEL *= FUEL.W();
thermo O2
(
"O2",
thermo(thermoData.subDict("O2"))
);
thermo O2("O2", thermoData.subDict("O2"));
O2 *= O2.W();
thermo N2
(
"N2",
thermo(thermoData.subDict("N2"))
);
thermo N2("N2", thermoData.subDict("N2"));
N2 *= N2.W();
thermo CO2
(
"CO2",
thermo(thermoData.subDict("CO2"))
);
thermo CO2("CO2", thermoData.subDict("CO2"));
CO2 *= CO2.W();
thermo H2O
(
"H2O",
thermo(thermoData.subDict("H2O"))
);
thermo H2O("H2O", thermoData.subDict("H2O"));
H2O *= H2O.W();
thermo oxidant
(
"oxidant",
stoicO2*O2
+ stoicN2*N2
);
thermo oxidant("oxidant", stoicO2*O2 + stoicN2*N2);
Info<< "oxidant " << (1/oxidant.Y())*oxidant << ';' << endl;
dimensionedScalar stoichiometricAirFuelMassRatio

20
applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,19 +77,19 @@ int main(int argc, char *argv[])
const scalar T = 3000.0;
// Oxidant (mole-based)
thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
thermo O2("O2", thermoData.subDict("O2")); O2 *= O2.W();
thermo N2("N2", thermoData.subDict("N2")); N2 *= N2.W();
// Intermediates (mole-based)
thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
thermo OH(thermoData.subDict("OH")); OH *= OH.W();
thermo H(thermoData.subDict("H")); H *= H.W();
thermo O(thermoData.subDict("O")); O *= O.W();
thermo H2("H2", thermoData.subDict("H2")); H2 *= H2.W();
thermo OH("OH", thermoData.subDict("OH")); OH *= OH.W();
thermo H("H", thermoData.subDict("H")); H *= H.W();
thermo O("O", thermoData.subDict("O")); O *= O.W();
// Products (mole-based)
thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO(thermoData.subDict("CO")); CO *= CO.W();
thermo CO2("CO2", thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O("H2O", thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO("CO", thermoData.subDict("CO")); CO *= CO.W();
SLPtrList<thermo> EQreactions;

16
applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -102,19 +102,19 @@ int main(int argc, char *argv[])
<< nl << endl;
// Reactants (mole-based)
thermo FUEL(thermoData.subDict(fuelName)); FUEL *= FUEL.W();
thermo FUEL(fuelName, thermoData.subDict(fuelName)); FUEL *= FUEL.W();
// Oxidant (mole-based)
thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
thermo O2("O2", thermoData.subDict("O2")); O2 *= O2.W();
thermo N2("N2", thermoData.subDict("N2")); N2 *= N2.W();
// Intermediates (mole-based)
thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
thermo H2("H2", thermoData.subDict("H2")); H2 *= H2.W();
// Products (mole-based)
thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO(thermoData.subDict("CO")); CO *= CO.W();
thermo CO2("CO2", thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O("H2O", thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO("CO", thermoData.subDict("CO")); CO *= CO.W();
// Product dissociation reactions

26
applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,22 +97,38 @@ int main(int argc, char *argv[])
dictionary thermoData(thermoDataFile);
const thermo reactant0(thermoData.subDict(rMix[0].name()));
const thermo reactant0
(
rMix[0].name(),
thermoData.subDict(rMix[0].name())
);
thermo reactants(rMix[0].volFrac()*reactant0.rho(p, T0)*reactant0);
for (label i=1; i<rMix.size(); i++)
{
const thermo reactanti(thermoData.subDict(rMix[i].name()));
const thermo reactanti
(
rMix[i].name(),
thermoData.subDict(rMix[i].name())
);
reactants += rMix[i].volFrac()*reactanti.rho(p, T0)*reactanti;
}
const thermo product0(thermoData.subDict(pMix[0].name()));
const thermo product0
(
pMix[0].name(),
thermoData.subDict(pMix[0].name())
);
thermo products(pMix[0].volFrac()*product0.rho(p, T0)*product0);
for (label i=1; i<pMix.size(); i++)
{
const thermo producti(thermoData.subDict(pMix[i].name()));
const thermo producti
(
pMix[i].name(),
thermoData.subDict(pMix[i].name())
);
products += pMix[i].volFrac()*producti.rho(p, T0)*producti;
}

2
src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
View File

@ -187,7 +187,7 @@ const solidType& thermalBaffle1DFvPatchScalarField<solidType>::solid() const
{
if (solidPtr_.empty())
{
solidPtr_.reset(new solidType(solidDict_));
solidPtr_.reset(new solidType("solid", solidDict_));
}
return solidPtr_();

6
src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ Foam::pureMixture<ThermoType>::pureMixture
)
:
basicMixture(thermoDict, mesh, phaseName),
mixture_(thermoDict.subDict("mixture"))
mixture_("mixture", thermoDict.subDict("mixture"))
{}
@ -46,7 +46,7 @@ Foam::pureMixture<ThermoType>::pureMixture
template<class ThermoType>
void Foam::pureMixture<ThermoType>::read(const dictionary& thermoDict)
{
mixture_ = ThermoType(thermoDict.subDict("mixture"));
mixture_ = ThermoType("mixture", thermoDict.subDict("mixture"));
}

13
src/thermophysicalModels/multicomponentThermo/mixtures/egrMixture/egrMixture.C
View File

@ -51,9 +51,9 @@ Foam::egrMixture<ThermoType>::egrMixture
stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
fuel_(thermoDict.subDict("fuel")),
oxidant_(thermoDict.subDict("oxidant")),
products_(thermoDict.subDict("burntProducts")),
fuel_("fuel", thermoDict.subDict("fuel")),
oxidant_("oxidant", thermoDict.subDict("oxidant")),
products_("burntProducts", thermoDict.subDict("burntProducts")),
mixture_("mixture", fuel_),
@ -102,9 +102,10 @@ void Foam::egrMixture<ThermoType>::read(const dictionary& thermoDict)
{
stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
fuel_ = ThermoType(thermoDict.subDict("fuel"));
oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
products_ = ThermoType(thermoDict.subDict("burntProducts"));
fuel_ = ThermoType("fuel", thermoDict.subDict("fuel"));
oxidant_ = ThermoType("oxidant", thermoDict.subDict("oxidant"));
products_ =
ThermoType("burntProducts", thermoDict.subDict("burntProducts"));
}

10
src/thermophysicalModels/multicomponentThermo/mixtures/homogeneousMixture/homogeneousMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,8 +50,8 @@ Foam::homogeneousMixture<ThermoType>::homogeneousMixture
phaseName
),
reactants_(thermoDict.subDict("reactants")),
products_(thermoDict.subDict("products")),
reactants_("reactants", thermoDict.subDict("reactants")),
products_("products", thermoDict.subDict("products")),
mixture_("mixture", reactants_),
b_(Y("b"))
{}
@ -86,8 +86,8 @@ const ThermoType& Foam::homogeneousMixture<ThermoType>::mixture
template<class ThermoType>
void Foam::homogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
{
reactants_ = ThermoType(thermoDict.subDict("reactants"));
products_ = ThermoType(thermoDict.subDict("products"));
reactants_ = ThermoType("reactants", thermoDict.subDict("reactants"));
products_ = ThermoType("products", thermoDict.subDict("products"));
}

15
src/thermophysicalModels/multicomponentThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,9 +56,9 @@ Foam::inhomogeneousMixture<ThermoType>::inhomogeneousMixture
stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
fuel_(thermoDict.subDict("fuel")),
oxidant_(thermoDict.subDict("oxidant")),
products_(thermoDict.subDict("burntProducts")),
fuel_("fuel", thermoDict.subDict("fuel")),
oxidant_("oxidant", thermoDict.subDict("oxidant")),
products_("burntProducts", thermoDict.subDict("burntProducts")),
mixture_("mixture", fuel_),
@ -100,9 +100,10 @@ void Foam::inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
{
stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
fuel_ = ThermoType(thermoDict.subDict("fuel"));
oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
products_ = ThermoType(thermoDict.subDict("burntProducts"));
fuel_ = ThermoType("fuel", thermoDict.subDict("fuel"));
oxidant_ = ThermoType("oxidant", thermoDict.subDict("oxidant"));
products_ =
ThermoType("burntProducts", thermoDict.subDict("burntProducts"));
}

4
src/thermophysicalModels/multicomponentThermo/mixtures/multicomponentMixture/multicomponentMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,7 +41,7 @@ Foam::multicomponentMixture<ThermoType>::readSpeciesData
specieThermos.set
(
i,
new ThermoType(thermoDict.subDict(species_[i]))
new ThermoType(species_[i], thermoDict.subDict(species_[i]))
);
}

6
src/thermophysicalModels/multicomponentThermo/mixtures/singleComponentMixture/singleComponentMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,7 +36,7 @@ Foam::singleComponentMixture<ThermoType>::singleComponentMixture
)
:
basicSpecieMixture(thermoDict, wordList(), mesh, phaseName),
mixture_(thermoDict.subDict("mixture"))
mixture_("mixture", thermoDict.subDict("mixture"))
{}
@ -55,7 +55,7 @@ void Foam::singleComponentMixture<ThermoType>::read
const dictionary& thermoDict
)
{
mixture_ = ThermoType(thermoDict.subDict("mixture"));
mixture_ = ThermoType("mixture", thermoDict.subDict("mixture"));
}

15
src/thermophysicalModels/multicomponentThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,9 +57,9 @@ Foam::veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture
stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
fuel_(thermoDict.subDict("fuel")),
oxidant_(thermoDict.subDict("oxidant")),
products_(thermoDict.subDict("burntProducts")),
fuel_("fuel", thermoDict.subDict("fuel")),
oxidant_("oxidant", thermoDict.subDict("oxidant")),
products_("burntProducts", thermoDict.subDict("burntProducts")),
mixture_("mixture", fuel_),
@ -102,9 +102,10 @@ void Foam::veryInhomogeneousMixture<ThermoType>::read
const dictionary& thermoDict
)
{
fuel_ = ThermoType(thermoDict.subDict("fuel"));
oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
products_ = ThermoType(thermoDict.subDict("burntProducts"));
fuel_ = ThermoType("fuel", thermoDict.subDict("fuel"));
oxidant_ = ThermoType("oxidant", thermoDict.subDict("oxidant"));
products_ =
ThermoType("burntProducts", thermoDict.subDict("burntProducts"));
}

5
src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Thermo>
Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
kappa_(dict.subDict("transport").lookup("kappa"))
{}

13
src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.H
View File

@ -76,16 +76,13 @@ class constAnisoSolidTransport
vector kappa_;
// Private Member Functions
//- Construct from components
inline constAnisoSolidTransport(const Thermo& t, const vector kappa);
public:
// Constructors
//- Construct from components
inline constAnisoSolidTransport(const Thermo& t, const vector kappa);
//- Construct as named copy
inline constAnisoSolidTransport
(
@ -93,8 +90,8 @@ public:
const constAnisoSolidTransport&
);
//- Construct from dictionary
constAnisoSolidTransport(const dictionary&);
//- Construct from name and dictionary
constAnisoSolidTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<constAnisoSolidTransport> clone() const;

5
src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Thermo>
Foam::constIsoSolidTransport<Thermo>::constIsoSolidTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
kappa_(dict.subDict("transport").lookup<scalar>("kappa"))
{}

13
src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.H
View File

@ -77,16 +77,13 @@ class constIsoSolidTransport
scalar kappa_;
// Private Member Functions
//- Construct from components
inline constIsoSolidTransport(const Thermo& t, const scalar kappa);
public:
// Constructors
//- Construct from components
inline constIsoSolidTransport(const Thermo& t, const scalar kappa);
//- Construct as named copy
inline constIsoSolidTransport
(
@ -94,8 +91,8 @@ public:
const constIsoSolidTransport&
);
//- Construct from dictionary
constIsoSolidTransport(const dictionary& dict);
//- Construct from name and dictionary
constIsoSolidTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<constIsoSolidTransport> clone() const;

5
src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Thermo>
Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
kappa0_(0.0),
n0_(0.0),
Tref_(0.0)

13
src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.H
View File

@ -80,7 +80,9 @@ class exponentialSolidTransport
scalar Tref_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline exponentialSolidTransport
@ -91,11 +93,6 @@ class exponentialSolidTransport
const scalar Tref
);
public:
// Constructors
//- Construct as named copy
inline exponentialSolidTransport
(
@ -103,8 +100,8 @@ public:
const exponentialSolidTransport&
);
//- Construct from dictionary
exponentialSolidTransport(const dictionary&);
//- Construct from name and dictionary
exponentialSolidTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<exponentialSolidTransport> clone() const;

5
src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Thermo, int PolySize>
Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
kappaCoeffs_
(
dict.subDict("transport").lookup

13
src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.H
View File

@ -113,7 +113,9 @@ class polynomialSolidTransport
Polynomial<PolySize> kappaCoeffs_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline polynomialSolidTransport
@ -122,11 +124,6 @@ class polynomialSolidTransport
const Polynomial<PolySize>& kappaPoly
);
public:
// Constructors
//- Construct as named copy
inline polynomialSolidTransport
(
@ -134,8 +131,8 @@ public:
const polynomialSolidTransport&
);
//- Construct from dictionary
polynomialSolidTransport(const dictionary& dict);
//- Construct from name and dictionary
polynomialSolidTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<polynomialSolidTransport> clone() const;

5
src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Thermo>
Foam::tabulatedSolidTransport<Thermo>::tabulatedSolidTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
kappa_("kappa", dict.subDict("transport").subDict("kappa"))
{}

13
src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.H
View File

@ -101,7 +101,9 @@ class tabulatedSolidTransport
nonUniformTable kappa_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline tabulatedSolidTransport
@ -110,11 +112,6 @@ class tabulatedSolidTransport
const nonUniformTable& kappa
);
public:
// Constructors
//- Construct as named copy
inline tabulatedSolidTransport
(
@ -122,8 +119,8 @@ public:
const tabulatedSolidTransport&
);
//- Construct from dictionary
tabulatedSolidTransport(const dictionary&);
//- Construct from name and dictionary
tabulatedSolidTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<tabulatedSolidTransport> clone() const;

5
src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Specie>
Foam::Boussinesq<Specie>::Boussinesq
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
rho0_(dict.subDict("equationOfState").lookup<scalar>("rho0")),
T0_(dict.subDict("equationOfState").lookup<scalar>("T0")),
beta_(dict.subDict("equationOfState").lookup<scalar>("beta"))

4
src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
View File

@ -136,8 +136,8 @@ public:
const scalar beta
);
//- Construct from dictionary
Boussinesq(const dictionary& dict);
//- Construct from name and dictionary
Boussinesq(const word& name, const dictionary& dict);
//- Construct as named copy
inline Boussinesq

5
src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
View File

@ -31,7 +31,10 @@ License
template<class Specie>
inline Foam::Boussinesq<Specie>::Boussinesq
(
const Specie& sp, const scalar rho0, const scalar T0, const scalar beta
const Specie& sp,
const scalar rho0,
const scalar T0,
const scalar beta
)
:
Specie(sp),

5
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Specie>
Foam::PengRobinsonGas<Specie>::PengRobinsonGas
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
Tc_(dict.subDict("equationOfState").lookup<scalar>("Tc")),
Vc_(dict.subDict("equationOfState").lookup<scalar>("Vc")),
Zc_(1.0),

4
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
View File

@ -144,8 +144,8 @@ public:
const scalar& omega
);
//- Construct from dictionary
PengRobinsonGas(const dictionary& dict);
//- Construct from name and dictionary
PengRobinsonGas(const word& name, const dictionary& dict);
//- Construct as named copy
inline PengRobinsonGas(const word& name, const PengRobinsonGas&);

4
src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
View File

@ -26,7 +26,7 @@ License
#include "PengRobinsonGas.H"
#include "mathematicalConstants.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::PengRobinsonGas<Specie>::PengRobinsonGas
@ -48,8 +48,6 @@ inline Foam::PengRobinsonGas<Specie>::PengRobinsonGas
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::PengRobinsonGas<Specie>::PengRobinsonGas
(

5
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Specie>
Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
p0_(dict.subDict("equationOfState").lookup<scalar>("p0")),
rho0_(dict.subDict("equationOfState").lookup<scalar>("rho0")),
gamma_(dict.subDict("equationOfState").lookup<scalar>("gamma")),

4
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
View File

@ -143,8 +143,8 @@ public:
const scalar B
);
//- Construct from dictionary
adiabaticPerfectFluid(const dictionary& dict);
//- Construct from name and dictionary
adiabaticPerfectFluid(const word& name, const dictionary& dict);
//- Construct as named copy
inline adiabaticPerfectFluid

4
src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
View File

@ -25,7 +25,7 @@ License
#include "adiabaticPerfectFluid.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
@ -45,8 +45,6 @@ inline Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
(

10
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie, int PolySize>
Foam::icoPolynomial<Specie, PolySize>::icoPolynomial(const dictionary& dict)
Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
rhoCoeffs_
(
dict.subDict("equationOfState").lookup

4
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -131,8 +131,8 @@ public:
const Polynomial<PolySize>& rhoPoly
);
//- Construct from dictionary
icoPolynomial(const dictionary& dict);
//- Construct from name and dictionary
icoPolynomial(const word& name, const dictionary& dict);
//- Construct as named copy
inline icoPolynomial(const word& name, const icoPolynomial&);

4
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
View File

@ -25,7 +25,7 @@ License
#include "icoPolynomial.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie, int PolySize>
inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
@ -39,8 +39,6 @@ inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie, int PolySize>
inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
(

10
src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::icoTabulated<Specie>::icoTabulated(const dictionary& dict)
Foam::icoTabulated<Specie>::icoTabulated
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
rho_("rho", dict.subDict("equationOfState").subDict("rho"))
{}

7
src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.H
View File

@ -91,6 +91,9 @@ class icoTabulated
:
public Specie
{
// Private Typedefs
//- Table type
typedef Function1s::NonUniformTable<scalar> nonUniformTable;
@ -111,8 +114,8 @@ public:
const nonUniformTable& rho
);
//- Construct from dictionary
icoTabulated(const dictionary& dict);
//- Construct from name and dictionary
icoTabulated(const word& name, const dictionary& dict);
//- Construct as named copy
inline icoTabulated(const word& name, const icoTabulated&);

4
src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
View File

@ -25,7 +25,7 @@ License
#include "icoTabulated.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::icoTabulated<Specie>::icoTabulated
@ -39,8 +39,6 @@ inline Foam::icoTabulated<Specie>::icoTabulated
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::icoTabulated<Specie>::icoTabulated
(

5
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class Specie>
Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
pRef_(dict.subDict("equationOfState").lookup<scalar>("pRef"))
{}

4
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
View File

@ -118,8 +118,8 @@ public:
//- Construct from components
inline incompressiblePerfectGas(const Specie& sp, const scalar pRef);
//- Construct from dictionary
incompressiblePerfectGas(const dictionary& dict);
//- Construct from name and dictionary
incompressiblePerfectGas(const word& name, const dictionary& dict);
//- Construct as named copy
inline incompressiblePerfectGas

3
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
View File

@ -31,7 +31,8 @@ License
template<class Specie>
inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
(
const Specie& sp, const scalar pRef
const Specie& sp,
const scalar pRef
)
:
Specie(sp),

6
src/thermophysicalModels/specie/equationOfState/linear/linear.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,9 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::linear<Specie>::linear(const dictionary& dict)
Foam::linear<Specie>::linear(const word& name, const dictionary& dict)
:
Specie(dict),
Specie(name, dict),
psi_(dict.subDict("equationOfState").lookup<scalar>("psi")),
rho0_(dict.subDict("equationOfState").lookup<scalar>("rho0"))
{}

4
src/thermophysicalModels/specie/equationOfState/linear/linear.H
View File

@ -129,8 +129,8 @@ public:
const scalar rho0
);
//- Construct from dictionary
linear(const dictionary& dict);
//- Construct from name and dictionary
linear(const word& name, const dictionary& dict);
//- Construct as named copy
inline linear(const word& name, const linear&);

4
src/thermophysicalModels/specie/equationOfState/linear/linearI.H
View File

@ -25,7 +25,7 @@ License
#include "linear.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::linear<Specie>::linear
@ -41,8 +41,6 @@ inline Foam::linear<Specie>::linear
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::linear<Specie>::linear
(

10
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::perfectFluid<Specie>::perfectFluid(const dictionary& dict)
Foam::perfectFluid<Specie>::perfectFluid
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
R_(dict.subDict("equationOfState").lookup<scalar>("R")),
rho0_(dict.subDict("equationOfState").lookup<scalar>("rho0"))
{}

4
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
View File

@ -133,8 +133,8 @@ public:
const scalar rho0
);
//- Construct from dictionary
perfectFluid(const dictionary& dict);
//- Construct from name and dictionary
perfectFluid(const word& name, const dictionary& dict);
//- Construct as named copy
inline perfectFluid(const word& name, const perfectFluid&);

4
src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
View File

@ -25,7 +25,7 @@ License
#include "perfectFluid.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::perfectFluid<Specie>::perfectFluid
@ -41,8 +41,6 @@ inline Foam::perfectFluid<Specie>::perfectFluid
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::perfectFluid<Specie>::perfectFluid
(

6
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,9 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::perfectGas<Specie>::perfectGas(const dictionary& dict)
Foam::perfectGas<Specie>::perfectGas(const word& name, const dictionary& dict)
:
Specie(dict)
Specie(name, dict)
{}

4
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
View File

@ -103,8 +103,8 @@ public:
//- Construct from components
inline perfectGas(const Specie& sp);
//- Construct from dictionary
perfectGas(const dictionary& dict);
//- Construct from name and dictionary
perfectGas(const word& name, const dictionary& dict);
//- Construct as named copy
inline perfectGas(const word& name, const perfectGas&);

4
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
View File

@ -25,7 +25,7 @@ License
#include "perfectGas.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::perfectGas<Specie>::perfectGas(const Specie& sp)
@ -34,8 +34,6 @@ inline Foam::perfectGas<Specie>::perfectGas(const Specie& sp)
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::perfectGas<Specie>::perfectGas
(

10
src/thermophysicalModels/specie/equationOfState/rPolynomial/rPolynomial.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::rPolynomial<Specie>::rPolynomial(const dictionary& dict)
Foam::rPolynomial<Specie>::rPolynomial
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
C_(dict.subDict("equationOfState").lookup("C"))
{}

15
src/thermophysicalModels/specie/equationOfState/rPolynomial/rPolynomial.H
View File

@ -111,8 +111,9 @@ class rPolynomial
:
public Specie
{
// Private Data
// Private Classes
//- Coefficient list class
class coeffList
:
public VectorSpace<coeffList, scalar, 5>
@ -133,6 +134,8 @@ class rPolynomial
};
// Private Data
//- Density coefficients
coeffList C_;
@ -142,14 +145,10 @@ public:
// Constructors
//- Construct from components
inline rPolynomial
(
const Specie& sp,
const coeffList& coeffs
);
inline rPolynomial(const Specie& sp, const coeffList& coeffs);
//- Construct from dictionary
rPolynomial(const dictionary& dict);
//- Construct from name and dictionary
rPolynomial(const word& name, const dictionary& dict);
//- Construct as named copy
inline rPolynomial(const word& name, const rPolynomial&);

4
src/thermophysicalModels/specie/equationOfState/rPolynomial/rPolynomialI.H
View File

@ -25,7 +25,7 @@ License
#include "rPolynomial.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rPolynomial<Specie>::rPolynomial
@ -39,8 +39,6 @@ inline Foam::rPolynomial<Specie>::rPolynomial
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rPolynomial<Specie>::rPolynomial
(

6
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,9 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::rhoConst<Specie>::rhoConst(const dictionary& dict)
Foam::rhoConst<Specie>::rhoConst(const word& name, const dictionary& dict)
:
Specie(dict),
Specie(name, dict),
rho_(dict.subDict("equationOfState").lookup<scalar>("rho"))
{}

6
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -113,8 +113,8 @@ public:
//- Construct from components
inline rhoConst(const Specie& sp, const scalar rho);
//- Construct from dictionary
rhoConst(const dictionary& dict);
//- Construct from name and dictionary
rhoConst(const word& name, const dictionary& dict);
//- Construct as named copy
inline rhoConst(const word& name, const rhoConst&);

6
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "rhoConst.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rhoConst<Specie>::rhoConst
@ -39,8 +39,6 @@ inline Foam::rhoConst<Specie>::rhoConst
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rhoConst<Specie>::rhoConst
(

10
src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
Foam::rhoTabulated<Specie>::rhoTabulated(const dictionary& dict)
Foam::rhoTabulated<Specie>::rhoTabulated
(
const word& name,
const dictionary& dict
)
:
Specie(dict),
Specie(name, dict),
rho_("rho", dict.subDict("equationOfState").subDict("rho"))
{}

7
src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
View File

@ -128,6 +128,9 @@ class rhoTabulated
:
public Specie
{
// Private Typedefs
//- Table type
typedef Function2s::UniformTable<scalar> table2D;
@ -148,8 +151,8 @@ public:
const table2D& rho
);
//- Construct from dictionary
rhoTabulated(const dictionary& dict);
//- Construct from name and dictionary
rhoTabulated(const word& name, const dictionary& dict);
//- Construct as named copy
inline rhoTabulated(const word& name, const rhoTabulated&);

4
src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulatedI.H
View File

@ -25,7 +25,7 @@ License
#include "rhoTabulated.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rhoTabulated<Specie>::rhoTabulated
@ -39,8 +39,6 @@ inline Foam::rhoTabulated<Specie>::rhoTabulated
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Specie>
inline Foam::rhoTabulated<Specie>::rhoTabulated
(

6
src/thermophysicalModels/specie/specie/specie.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,9 +36,9 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::specie::specie(const dictionary& dict)
Foam::specie::specie(const word& name, const dictionary& dict)
:
name_(dict.dictName()),
name_(name),
Y_(dict.subDict("specie").lookupOrDefault("massFraction", 1.0)),
molWeight_(dict.subDict("specie").lookup<scalar>("molWeight"))
{}

6
src/thermophysicalModels/specie/specie/specie.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -99,8 +99,8 @@ public:
//- Construct as named copy
inline specie(const word& name, const specie&);
//- Construct from dictionary
specie(const dictionary& dict);
//- Construct from name and dictionary
specie(const word& name, const dictionary& dict);
//- Copy constructor
specie(const specie&) = default;

3
src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,6 +62,7 @@ public:
return "absoluteEnthalpy";
}
// Fundamental properties
static bool enthalpy()

3
src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,6 +63,7 @@ public:
return "absoluteInternalEnergy";
}
// Fundamental properties
static bool enthalpy()

10
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
Foam::eConstThermo<EquationOfState>::eConstThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Cv_(dict.subDict("thermodynamics").lookup<scalar>("Cv")),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Tref_(dict.subDict("thermodynamics").lookupOrDefault<scalar>("Tref", Tstd)),

13
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
View File

@ -121,7 +121,9 @@ class eConstThermo
scalar Esref_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline eConstThermo
@ -133,13 +135,8 @@ class eConstThermo
const scalar Esref
);
public:
// Constructors
//- Construct from dictionary
eConstThermo(const dictionary& dict);
//- Construct from name and dictionary
eConstThermo(const word& name, const dictionary& dict);
//- Construct as named copy
inline eConstThermo(const word&, const eConstThermo&);

4
src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::eConstThermo<EquationOfState>::eConstThermo
@ -43,8 +43,6 @@ inline Foam::eConstThermo<EquationOfState>::eConstThermo
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::eConstThermo<EquationOfState>::eConstThermo
(

5
src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::eIcoTabulatedThermo<EquationOfState>::eIcoTabulatedThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))

9
src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -95,6 +95,9 @@ class eIcoTabulatedThermo
:
public EquationOfState
{
// Private Typedefs
//- Table type
typedef Function1s::integratedNonUniformTable integratedNonUniformTable;
@ -114,8 +117,8 @@ public:
// Constructors
//- Construct from dictionary
eIcoTabulatedThermo(const dictionary& dict);
//- Construct from name and dictionary
eIcoTabulatedThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline eIcoTabulatedThermo(const word&, const eIcoTabulatedThermo&);

5
src/thermophysicalModels/specie/thermo/ePolynomial/ePolynomialThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState, int PolySize>
Foam::ePolynomialThermo<EquationOfState, PolySize>::ePolynomialThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
CvCoeffs_

6
src/thermophysicalModels/specie/thermo/ePolynomial/ePolynomialThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -161,8 +161,8 @@ public:
// Constructors
//- Construct from dictionary
ePolynomialThermo(const dictionary& dict);
//- Construct from name and dictionary
ePolynomialThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline ePolynomialThermo(const word&, const ePolynomialThermo&);

6
src/thermophysicalModels/specie/thermo/ePolynomial/ePolynomialThermoI.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "ePolynomialThermo.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
inline Foam::ePolynomialThermo<EquationOfState, PolySize>::ePolynomialThermo
@ -47,8 +47,6 @@ inline Foam::ePolynomialThermo<EquationOfState, PolySize>::ePolynomialThermo
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
inline Foam::ePolynomialThermo<EquationOfState, PolySize>::ePolynomialThermo
(

5
src/thermophysicalModels/specie/thermo/ePower/ePowerThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::ePowerThermo<EquationOfState>::ePowerThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
c0_(dict.subDict("thermodynamics").lookup<scalar>("C0")),
n0_(dict.subDict("thermodynamics").lookup<scalar>("n0")),
Tref_(dict.subDict("thermodynamics").lookup<scalar>("Tref")),

14
src/thermophysicalModels/specie/thermo/ePower/ePowerThermo.H
View File

@ -126,6 +126,11 @@ class ePowerThermo
//- Check given temperature is within the range of the fitted coeffs
inline void checkT(const scalar T) const;
public:
// Constructors
//- Construct from components
inline ePowerThermo
(
@ -136,13 +141,8 @@ class ePowerThermo
const scalar Hf
);
public:
// Constructors
//- Construct from dictionary
ePowerThermo(const dictionary&);
//- Construct from name and dictionary
ePowerThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline ePowerThermo

30
src/thermophysicalModels/specie/thermo/ePower/ePowerThermoI.H
View File

@ -44,21 +44,6 @@ inline void Foam::ePowerThermo<EquationOfState>::checkT
}
template<class EquationOfState>
inline Foam::ePowerThermo<EquationOfState>::ePowerThermo
(
const word& name,
const ePowerThermo& jt
)
:
EquationOfState(name, jt),
c0_(jt.c0_),
n0_(jt.n0_),
Tref_(jt.Tref_),
Hf_(jt.Hf_)
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
@ -79,6 +64,21 @@ inline Foam::ePowerThermo<EquationOfState>::ePowerThermo
{}
template<class EquationOfState>
inline Foam::ePowerThermo<EquationOfState>::ePowerThermo
(
const word& name,
const ePowerThermo& jt
)
:
EquationOfState(name, jt),
c0_(jt.c0_),
n0_(jt.n0_),
Tref_(jt.Tref_),
Hf_(jt.Hf_)
{}
template<class EquationOfState>
inline Foam::autoPtr<Foam::ePowerThermo<EquationOfState>>
Foam::ePowerThermo<EquationOfState>::clone() const

5
src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::eTabulatedThermo<EquationOfState>::eTabulatedThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
Es_("Es", dict.subDict("thermodynamics").subDict("Es")),

9
src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -126,6 +126,9 @@ class eTabulatedThermo
:
public EquationOfState
{
// Private Typedefs
//- Table type
typedef Function2s::UniformTable<scalar> table2D;
@ -151,8 +154,8 @@ public:
// Constructors
//- Construct from dictionary
eTabulatedThermo(const dictionary& dict);
//- Construct from name and dictionary
eTabulatedThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline eTabulatedThermo(const word&, const eTabulatedThermo&);

10
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::hConstThermo<EquationOfState>::hConstThermo(const dictionary& dict)
Foam::hConstThermo<EquationOfState>::hConstThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Cp_(dict.subDict("thermodynamics").lookup<scalar>("Cp")),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Tref_(dict.subDict("thermodynamics").lookupOrDefault<scalar>("Tref", Tstd)),

13
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
View File

@ -121,7 +121,9 @@ class hConstThermo
scalar Hsref_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline hConstThermo
@ -133,13 +135,8 @@ class hConstThermo
const scalar Hsref
);
public:
// Constructors
//- Construct from dictionary
hConstThermo(const dictionary& dict);
//- Construct from name and dictionary
hConstThermo(const word& name, const dictionary& dict);
//- Construct as named copy
inline hConstThermo(const word&, const hConstThermo&);

4
src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::hConstThermo<EquationOfState>::hConstThermo
@ -43,8 +43,6 @@ inline Foam::hConstThermo<EquationOfState>::hConstThermo
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::hConstThermo<EquationOfState>::hConstThermo
(

5
src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::hIcoTabulatedThermo<EquationOfState>::hIcoTabulatedThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp"))

9
src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -96,6 +96,9 @@ class hIcoTabulatedThermo
:
public EquationOfState
{
// Private Typedefs
//- Table type
typedef Function1s::integratedNonUniformTable integratedNonUniformTable;
@ -115,8 +118,8 @@ public:
// Constructors
//- Construct from dictionary
hIcoTabulatedThermo(const dictionary& dict);
//- Construct from name and dictionary
hIcoTabulatedThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline hIcoTabulatedThermo(const word&, const hIcoTabulatedThermo&);

5
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState, int PolySize>
Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
CpCoeffs_

15
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -141,7 +141,9 @@ class hPolynomialThermo
Polynomial<PolySize> sCoeffs_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline hPolynomialThermo
@ -154,13 +156,8 @@ class hPolynomialThermo
const Polynomial<PolySize>& sCoeffs
);
public:
// Constructors
//- Construct from dictionary
hPolynomialThermo(const dictionary& dict);
//- Construct from name and dictionary
hPolynomialThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline hPolynomialThermo(const word&, const hPolynomialThermo&);

6
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "hPolynomialThermo.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
@ -47,8 +47,6 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
(

5
src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::hPowerThermo<EquationOfState>::hPowerThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
c0_(dict.subDict("thermodynamics").lookup<scalar>("C0")),
n0_(dict.subDict("thermodynamics").lookup<scalar>("n0")),
Tref_(dict.subDict("thermodynamics").lookup<scalar>("Tref")),

14
src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
View File

@ -123,6 +123,11 @@ class hPowerThermo
//- Check given temperature is within the range of the fitted coeffs
inline void checkT(const scalar T) const;
public:
// Constructors
//- Construct from components
inline hPowerThermo
(
@ -133,13 +138,8 @@ class hPowerThermo
const scalar Hf
);
public:
// Constructors
//- Construct from dictionary
hPowerThermo(const dictionary&);
//- Construct from name and dictionary
hPowerThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline hPowerThermo

30
src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
View File

@ -44,21 +44,6 @@ inline void Foam::hPowerThermo<EquationOfState>::checkT
}
template<class EquationOfState>
inline Foam::hPowerThermo<EquationOfState>::hPowerThermo
(
const word& name,
const hPowerThermo& jt
)
:
EquationOfState(name, jt),
c0_(jt.c0_),
n0_(jt.n0_),
Tref_(jt.Tref_),
Hf_(jt.Hf_)
{}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
@ -79,6 +64,21 @@ inline Foam::hPowerThermo<EquationOfState>::hPowerThermo
{}
template<class EquationOfState>
inline Foam::hPowerThermo<EquationOfState>::hPowerThermo
(
const word& name,
const hPowerThermo& jt
)
:
EquationOfState(name, jt),
c0_(jt.c0_),
n0_(jt.n0_),
Tref_(jt.Tref_),
Hf_(jt.Hf_)
{}
template<class EquationOfState>
inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
Foam::hPowerThermo<EquationOfState>::clone() const

5
src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,11 @@ License
template<class EquationOfState>
Foam::hTabulatedThermo<EquationOfState>::hTabulatedThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
Hs_("Hs", dict.subDict("thermodynamics").subDict("Hs")),

9
src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -126,6 +126,9 @@ class hTabulatedThermo
:
public EquationOfState
{
// Private Typedefs
//- Table type
typedef Function2s::UniformTable<scalar> table2D;
@ -151,8 +154,8 @@ public:
// Constructors
//- Construct from dictionary
hTabulatedThermo(const dictionary& dict);
//- Construct from name and dictionary
hTabulatedThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline hTabulatedThermo(const word&, const hTabulatedThermo&);

10
src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,9 +57,13 @@ void Foam::janafThermo<EquationOfState>::checkInputData() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
Foam::janafThermo<EquationOfState>::janafThermo
(
const word& name,
const dictionary& dict
)
:
EquationOfState(dict),
EquationOfState(name, dict),
Tlow_(dict.subDict("thermodynamics").lookup<scalar>("Tlow")),
Thigh_(dict.subDict("thermodynamics").lookup<scalar>("Thigh")),
Tcommon_(dict.subDict("thermodynamics").lookup<scalar>("Tcommon")),

17
src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -136,9 +136,15 @@ class janafThermo
public:
// Public data
// Public static data
//- Number of coefficients
static const int nCoeffs_ = 7;
// Public typdefs
//- Coefficient array type
typedef FixedList<scalar, nCoeffs_> coeffArray;
@ -149,7 +155,10 @@ private:
// Temperature limits of applicability of functions
scalar Tlow_, Thigh_, Tcommon_;
//- Cp coefficients for the high temperature range (Tcommon to Thigh)
coeffArray highCpCoeffs_;
//- Cp coefficients for the low temperature range (Tlow to Tcommon)
coeffArray lowCpCoeffs_;
@ -178,8 +187,8 @@ public:
const bool convertCoeffs = false
);
//- Construct from dictionary
janafThermo(const dictionary& dict);
//- Construct from name and dictionary
janafThermo(const word& name, const dictionary& dict);
//- Construct as a named copy
inline janafThermo(const word&, const janafThermo&);

42
src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,6 +28,26 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class EquationOfState>
inline const typename Foam::janafThermo<EquationOfState>::coeffArray&
Foam::janafThermo<EquationOfState>::coeffs
(
const scalar T
) const
{
if (T < Tcommon_)
{
return lowCpCoeffs_;
}
else
{
return highCpCoeffs_;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::janafThermo<EquationOfState>::janafThermo
(
@ -64,26 +84,6 @@ inline Foam::janafThermo<EquationOfState>::janafThermo
}
template<class EquationOfState>
inline const typename Foam::janafThermo<EquationOfState>::coeffArray&
Foam::janafThermo<EquationOfState>::coeffs
(
const scalar T
) const
{
if (T < Tcommon_)
{
return lowCpCoeffs_;
}
else
{
return highCpCoeffs_;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState>
inline Foam::janafThermo<EquationOfState>::janafThermo
(

3
src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,6 +62,7 @@ public:
return "sensibleEnthalpy";
}
// Fundamental properties
static bool enthalpy()

3
src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,6 +63,7 @@ public:
return "sensibleInternalEnergy";
}
// Fundamental properties
static bool enthalpy()

10
src/thermophysicalModels/specie/thermo/thermo/thermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,9 +37,13 @@ const int Foam::species::thermo<Thermo, Type>::maxIter_ = 100;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
Foam::species::thermo<Thermo, Type>::thermo(const dictionary& dict)
Foam::species::thermo<Thermo, Type>::thermo
(
const word& name,
const dictionary& dict
)
:
Thermo(dict)
Thermo(name, dict)
{}

8
src/thermophysicalModels/specie/thermo/thermo/thermo.H
View File

@ -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-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -102,6 +102,8 @@ class thermo
public:
// Public Typedefs
//- The thermodynamics of the individual species'
typedef thermo<Thermo, Type> thermoType;
@ -111,8 +113,8 @@ public:
//- Construct from components
inline thermo(const Thermo& sp);
//- Construct from dictionary
thermo(const dictionary& dict);
//- Construct from name and dictionary
thermo(const word& name, const dictionary& dict);
//- Construct as named copy
inline thermo(const word& name, const thermo&);

10
src/thermophysicalModels/specie/transport/Andrade/AndradeTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,9 +29,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo>
Foam::AndradeTransport<Thermo>::AndradeTransport(const dictionary& dict)
Foam::AndradeTransport<Thermo>::AndradeTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
muCoeffs_(dict.subDict("transport").lookup("muCoeffs")),
kappaCoeffs_(dict.subDict("transport").lookup("kappaCoeffs"))
{}

20
src/thermophysicalModels/specie/transport/Andrade/AndradeTransport.H
View File

@ -117,10 +117,14 @@ class AndradeTransport
:
public Thermo
{
// Private Data
// Private Typedefs
//- Coefficient list type
typedef FixedList<scalar, 5> coeffList;
// Private Data
//- Dynamic viscosity coefficients
coeffList muCoeffs_;
@ -128,7 +132,9 @@ class AndradeTransport
coeffList kappaCoeffs_;
// Private Member Functions
public:
// Constructors
//- Construct from components
inline AndradeTransport
@ -138,20 +144,16 @@ class AndradeTransport
const coeffList& kappaCoeffs
);
public:
// Constructors
//- Construct as named copy
inline AndradeTransport
(
const word&,
const AndradeTransport&
);
//- Construct from dictionary
AndradeTransport(const dictionary& dict);
//- Construct from name and dictionary
AndradeTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<AndradeTransport> clone() const;

10
src/thermophysicalModels/specie/transport/WLF/WLFTransport.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,9 +42,13 @@ Foam::scalar Foam::WLFTransport<Thermo>::readCoeff
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo>
Foam::WLFTransport<Thermo>::WLFTransport(const dictionary& dict)
Foam::WLFTransport<Thermo>::WLFTransport
(
const word& name,
const dictionary& dict
)
:
Thermo(dict),
Thermo(name, dict),
mu0_(readCoeff("mu0", dict)),
Tr_(readCoeff("Tr", dict)),
C1_(readCoeff("C1", dict)),

25
src/thermophysicalModels/specie/transport/WLF/WLFTransport.H
View File

@ -131,7 +131,15 @@ class WLFTransport
scalar rPr_;
// Private Constructors
// Private Member Functions
//- Read coefficient from dictionary
scalar readCoeff(const word& coeffName, const dictionary& dict);
public:
// Constructors
//- Construct from components
inline WLFTransport
@ -144,22 +152,11 @@ class WLFTransport
const scalar Pr
);
// Private Member Functions
//- Read coefficient from dictionary
scalar readCoeff(const word& coeffName, const dictionary& dict);
public:
// Constructors
//- Construct as named copy
inline WLFTransport(const word&, const WLFTransport&);
//- Construct from dictionary
WLFTransport(const dictionary& dict);
//- Construct from name and dictionary
WLFTransport(const word& name, const dictionary& dict);
//- Construct and return a clone
inline autoPtr<WLFTransport> clone() const;

Some files were not shown because too many files have changed in this diff Show More