diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C index 2407602924..d4a759a467 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C @@ -45,7 +45,7 @@ Foam::SpecieMixture::volScalarFieldProperty ) const { const typename MixtureType::thermoType& thermo = - this->getLocalThermo(speciei); + this->specieThermo(speciei); tmp tPsi ( @@ -96,7 +96,7 @@ Foam::tmp Foam::SpecieMixture::fieldProperty ) const { const typename MixtureType::thermoType& thermo = - this->getLocalThermo(speciei); + this->specieThermo(speciei); tmp tPsi(new scalarField(p.size())); @@ -130,14 +130,14 @@ Foam::SpecieMixture::SpecieMixture template Foam::scalar Foam::SpecieMixture::Wi(const label speciei) const { - return this->getLocalThermo(speciei).W(); + return this->specieThermo(speciei).W(); } template Foam::scalar Foam::SpecieMixture::Hf(const label speciei) const { - return this->getLocalThermo(speciei).Hf(); + return this->specieThermo(speciei).Hf(); } @@ -149,7 +149,7 @@ Foam::scalar Foam::SpecieMixture::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::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::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::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::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::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::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::alphah const scalar T ) const { - return this->getLocalThermo(speciei).alphah(p, T); + return this->specieThermo(speciei).alphah(p, T); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C index 6fa450c5d4..e250e9e03d 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C @@ -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::read(const dictionary& thermoDict) template -const ThermoType& Foam::egrMixture::getLocalThermo +const ThermoType& Foam::egrMixture::specieThermo ( const label speciei ) const diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H index bea2cb3fad..2ea3242903 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H @@ -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; }; diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C index 79f5b5dd1e..a9f184e2aa 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C @@ -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::read(const dictionary& thermoDict) template -const ThermoType& Foam::homogeneousMixture::getLocalThermo +const ThermoType& Foam::homogeneousMixture::specieThermo ( const label speciei ) const diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H index 59473e46df..84b9b516f3 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H @@ -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; }; diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C index 063437d7ea..55bf5cd422 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C @@ -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::read(const dictionary& thermoDict) template -const ThermoType& Foam::inhomogeneousMixture::getLocalThermo +const ThermoType& Foam::inhomogeneousMixture::specieThermo ( const label speciei ) const diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H index 7c1bfd9447..2e5478ba03 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H @@ -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; }; diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H index 4d2ce49152..7885adbcb4 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H @@ -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]; } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H index 4516075f24..2ac7e6f831 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/singleComponentMixture/singleComponentMixture.H @@ -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) diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C index 91325bae49..c6f782e234 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C @@ -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::read template -const ThermoType& Foam::veryInhomogeneousMixture::getLocalThermo +const ThermoType& Foam::veryInhomogeneousMixture::specieThermo ( const label speciei ) const diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H index 5eb0e9fb98..484e53041f 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H @@ -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; };