zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reactions: reordered the thermodynamic state variables so that pressure is before temperature in all function calls

Browse Source
This commit is contained in:
Henry
2012-06-06 14:25:24 +01:00
parent 09a54cda4a
commit 6042ec89b9
34 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
View File

@ -228,8 +228,8 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omega
c2[i] = max(0.0, c[i]);
}
const scalar kf = R.kf(T, p, c2);
const scalar kr = R.kr(kf, T, p, c2);
const scalar kf = R.kf(p, T, c2);
const scalar kr = R.kr(kf, p, T, c2);
pf = 1.0;
pr = 1.0;
@ -409,8 +409,8 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::jacobian
{
const Reaction<ThermoType>& R = reactions_[ri];
const scalar kf0 = R.kf(T, p, c2);
const scalar kr0 = R.kr(T, p, c2);
const scalar kf0 = R.kf(p, T, c2);
const scalar kr0 = R.kr(p, T, c2);
forAll(R.lhs(), j)
{

4
src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.C
View File

@ -62,12 +62,12 @@ Foam::IrreversibleSolidReaction<ReactionRate>::IrreversibleSolidReaction
template<class ReactionRate>
Foam::scalar Foam::IrreversibleSolidReaction<ReactionRate>::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return k_(T, p, c);
return k_(p, T, c);
}

2
src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.H
View File

@ -107,8 +107,8 @@ public:
//- Forward rate constant
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C
View File

@ -307,8 +307,8 @@ void Foam::solidReaction::write(Ostream& os) const
Foam::scalar Foam::solidReaction::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{

2
src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.H
View File

@ -217,8 +217,8 @@ public:
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H
View File

@ -86,8 +86,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
View File

@ -54,8 +54,8 @@ inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
inline Foam::scalar Foam::solidArrheniusReactionRate::operator()
(
const scalar T,
const scalar,
const scalar T,
const scalarField&
) const
{

4
src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
View File

@ -266,7 +266,7 @@ Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::omega
c1[i] = max(0.0, c[i]);
}
scalar kf = R.kf(T, 0.0, c1);
scalar kf = R.kf(0.0, T, c1);
scalar exponent = R.nReact();
@ -358,7 +358,7 @@ void Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::jacobian
{
const solidReaction& R = reactions_[ri];
scalar kf0 = R.kf(T, 0.0, c2);
scalar kf0 = R.kf(0.0, T, c2);
forAll(R.slhs(), j)
{

4
src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
View File

@ -82,12 +82,12 @@ Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
template<class ReactionThermo, class ReactionRate>
Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return k_(T, p, c);
return k_(p, T, c);
}

2
src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
View File

@ -142,8 +142,8 @@ public:
//- Forward rate constant
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

12
src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
View File

@ -93,12 +93,12 @@ template<class ReactionThermo, class ReactionRate>
Foam::scalar
Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return fk_(T, p, c);
return fk_(p, T, c);
}
@ -107,12 +107,12 @@ Foam::scalar
Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
(
const scalar,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return rk_(T, p, c);
return rk_(p, T, c);
}
@ -120,12 +120,12 @@ template<class ReactionThermo, class ReactionRate>
Foam::scalar
Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return rk_(T, p, c);
return rk_(p, T, c);
}

6
src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
View File

@ -145,8 +145,8 @@ public:
//- Forward rate constant
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -154,8 +154,8 @@ public:
virtual scalar kr
(
const scalar kfwd,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -164,8 +164,8 @@ public:
// equilibrium constant
virtual scalar kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

6
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -376,8 +376,8 @@ void Foam::Reaction<ReactionThermo>::write(Ostream& os) const
template<class ReactionThermo>
Foam::scalar Foam::Reaction<ReactionThermo>::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
@ -389,8 +389,8 @@ template<class ReactionThermo>
Foam::scalar Foam::Reaction<ReactionThermo>::kr
(
const scalar kfwd,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
@ -401,8 +401,8 @@ Foam::scalar Foam::Reaction<ReactionThermo>::kr
template<class ReactionThermo>
Foam::scalar Foam::Reaction<ReactionThermo>::kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{

6
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
View File

@ -306,8 +306,8 @@ public:
//- Forward rate constant
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -315,8 +315,8 @@ public:
virtual scalar kr
(
const scalar kfwd,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -325,8 +325,8 @@ public:
// equilibrium constant
virtual scalar kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

10
src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
View File

@ -82,12 +82,12 @@ Foam::ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
template<class ReactionThermo, class ReactionRate>
Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return k_(T, p, c);
return k_(p, T, c);
}
@ -95,8 +95,8 @@ template<class ReactionThermo, class ReactionRate>
Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
(
const scalar kfwd,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
@ -107,12 +107,12 @@ Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
template<class ReactionThermo, class ReactionRate>
Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return kr(kf(T, p, c), T, p, c);
return kr(kf(p, T, c), p, T, c);
}

6
src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
View File

@ -139,8 +139,8 @@ public:
//- Forward rate constant
virtual scalar kf
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -148,8 +148,8 @@ public:
virtual scalar kr
(
const scalar kfwd,
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;
@ -158,8 +158,8 @@ public:
// equilibrium constant
virtual scalar kr
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
View File

@ -95,8 +95,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
View File

@ -68,8 +68,8 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
inline Foam::scalar Foam::ArrheniusReactionRate::operator()
(
const scalar p,
const scalar T,
const scalar,
const scalarField&
) const
{

2
src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
View File

@ -111,8 +111,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

6
src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
View File

@ -92,13 +92,13 @@ inline Foam::scalar Foam::ChemicallyActivatedReactionRate
ChemicallyActivationFunction
>::operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
scalar k0 = k0_(T, p, c);
scalar kInf = kInf_(T, p, c);
scalar k0 = k0_(p, T, c);
scalar kInf = kInf_(p, T, c);
scalar Pr = k0*thirdBodyEfficiencies_.M(c)/kInf;

2
src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
View File

@ -108,8 +108,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

6
src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
View File

@ -80,13 +80,13 @@ template<class ReactionRate, class FallOffFunction>
inline Foam::scalar
Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
scalar k0 = k0_(T, p, c);
scalar kInf = kInf_(T, p, c);
scalar k0 = k0_(p, T, c);
scalar kInf = kInf_(p, T, c);
scalar Pr = k0*thirdBodyEfficiencies_.M(c)/kInf;

2
src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
View File

@ -98,8 +98,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
View File

@ -72,8 +72,8 @@ inline Foam::JanevReactionRate::JanevReactionRate
inline Foam::scalar Foam::JanevReactionRate::operator()
(
const scalar p,
const scalar T,
const scalar,
const scalarField&
) const
{

2
src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
View File

@ -97,8 +97,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
View File

@ -76,8 +76,8 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
inline Foam::scalar Foam::LandauTellerReactionRate::operator()
(
const scalar p,
const scalar T,
const scalar,
const scalarField&
) const
{

2
src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
View File

@ -99,8 +99,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
View File

@ -95,8 +95,8 @@ inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
inline Foam::scalar Foam::LangmuirHinshelwoodReactionRate::operator()
(
const scalar p,
const scalar T,
const scalar,
const scalarField& c
) const
{

2
src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
View File

@ -75,8 +75,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
View File

@ -45,7 +45,7 @@ inline void Foam::infiniteReactionRate::write(Ostream& os) const
inline Foam::scalar Foam::infiniteReactionRate::operator()
(
const scalar,
const scalar p,
const scalar,
const scalarField&
) const

2
src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
View File

@ -98,8 +98,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

2
src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
View File

@ -72,8 +72,8 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
inline Foam::scalar Foam::powerSeriesReactionRate::operator()
(
const scalar p,
const scalar T,
const scalar,
const scalarField&
) const
{

2
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
View File

@ -94,8 +94,8 @@ public:
inline scalar operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const;

4
src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
View File

@ -74,14 +74,14 @@ inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
inline Foam::scalar Foam::thirdBodyArrheniusReactionRate::operator()
(
const scalar T,
const scalar p,
const scalar T,
const scalarField& c
) const
{
return
thirdBodyEfficiencies_.M(c)
*ArrheniusReactionRate::operator()(T, p, c);
*ArrheniusReactionRate::operator()(p, T, c);
}