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

reactionThermo/mixtures: renamed getLocalThermo -> specieThermo

Browse Source 
This function returns the thermo package for a particular specie and the new
name is far more logical.
This commit is contained in:
Henry Weller
2020-06-01 16:09:43 +01:00
parent 6f2a75b2f7
commit 1bd80e958b
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
View File

@ -45,7 +45,7 @@ Foam::SpecieMixture<MixtureType>::volScalarFieldProperty
) const
{
const typename MixtureType::thermoType& thermo =
this->getLocalThermo(speciei);
this->specieThermo(speciei);
tmp<volScalarField> tPsi
(
@ -96,7 +96,7 @@ Foam::tmp<Foam::scalarField> Foam::SpecieMixture<MixtureType>::fieldProperty
) const
{
const typename MixtureType::thermoType& thermo =
this->getLocalThermo(speciei);
this->specieThermo(speciei);
tmp<scalarField> tPsi(new scalarField(p.size()));
@ -130,14 +130,14 @@ Foam::SpecieMixture<MixtureType>::SpecieMixture
template<class MixtureType>
Foam::scalar Foam::SpecieMixture<MixtureType>::Wi(const label speciei) const
{
return this->getLocalThermo(speciei).W();
return this->specieThermo(speciei).W();
}
template<class MixtureType>
Foam::scalar Foam::SpecieMixture<MixtureType>::Hf(const label speciei) const
{
return this->getLocalThermo(speciei).Hf();
return this->specieThermo(speciei).Hf();
}
@ -149,7 +149,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::rho
const scalar T
) const
{
return this->getLocalThermo(speciei).rho(p, T);
return this->specieThermo(speciei).rho(p, T);
}
@ -181,7 +181,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::Cp
const scalar T
) const
{
return this->getLocalThermo(speciei).Cp(p, T);
return this->specieThermo(speciei).Cp(p, T);
}
@ -213,7 +213,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::HE
const scalar T
) const
{
return this->getLocalThermo(speciei).HE(p, T);
return this->specieThermo(speciei).HE(p, T);
}
@ -257,7 +257,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::Ha
const scalar T
) const
{
return this->getLocalThermo(speciei).Ha(p, T);
return this->specieThermo(speciei).Ha(p, T);
}
@ -301,7 +301,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::Hs
const scalar T
) const
{
return this->getLocalThermo(speciei).Hs(p, T);
return this->specieThermo(speciei).Hs(p, T);
}
@ -333,7 +333,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::mu
const scalar T
) const
{
return this->getLocalThermo(speciei).mu(p, T);
return this->specieThermo(speciei).mu(p, T);
}
@ -365,7 +365,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::kappa
const scalar T
) const
{
return this->getLocalThermo(speciei).kappa(p, T);
return this->specieThermo(speciei).kappa(p, T);
}
@ -397,7 +397,7 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::alphah
const scalar T
) const
{
return this->getLocalThermo(speciei).alphah(p, T);
return this->specieThermo(speciei).alphah(p, T);
}

4
src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.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-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -110,7 +110,7 @@ void Foam::egrMixture<ThermoType>::read(const dictionary& thermoDict)
template<class ThermoType>
const ThermoType& Foam::egrMixture<ThermoType>::getLocalThermo
const ThermoType& Foam::egrMixture<ThermoType>::specieThermo
(
const label speciei
) const

4
src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -175,7 +175,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
const ThermoType& getLocalThermo(const label speciei) const;
const ThermoType& specieThermo(const label speciei) const;
};

4
src/thermophysicalModels/reactionThermo/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-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -92,7 +92,7 @@ void Foam::homogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
template<class ThermoType>
const ThermoType& Foam::homogeneousMixture<ThermoType>::getLocalThermo
const ThermoType& Foam::homogeneousMixture<ThermoType>::specieThermo
(
const label speciei
) const

4
src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -133,7 +133,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
const ThermoType& getLocalThermo(const label speciei) const;
const ThermoType& specieThermo(const label speciei) const;
};

4
src/thermophysicalModels/reactionThermo/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-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,7 +107,7 @@ void Foam::inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
template<class ThermoType>
const ThermoType& Foam::inhomogeneousMixture<ThermoType>::getLocalThermo
const ThermoType& Foam::inhomogeneousMixture<ThermoType>::specieThermo
(
const label speciei
) const

4
src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -164,7 +164,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
const ThermoType& getLocalThermo(const label speciei) const;
const ThermoType& specieThermo(const label speciei) const;
};

4
src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -157,7 +157,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
inline const ThermoType& getLocalThermo(const label speciei) const
inline const ThermoType& specieThermo(const label speciei) const
{
return speciesData_[speciei];
}

4
src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.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) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -126,7 +126,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
inline const ThermoType& getLocalThermo(const label speciei) const
inline const ThermoType& specieThermo(const label speciei) const
{
#ifdef FULLDEBUG
if (speciei != 0)

4
src/thermophysicalModels/reactionThermo/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-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -109,7 +109,7 @@ void Foam::veryInhomogeneousMixture<ThermoType>::read
template<class ThermoType>
const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::getLocalThermo
const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::specieThermo
(
const label speciei
) const

4
src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -170,7 +170,7 @@ public:
void read(const dictionary&);
//- Return thermo based on index
const ThermoType& getLocalThermo(const label speciei) const;
const ThermoType& specieThermo(const label speciei) const;
};