diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C index 5026b517da..c18cccb712 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C @@ -228,8 +228,8 @@ Foam::scalar Foam::ODEChemistryModel::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::jacobian { const Reaction& 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) { diff --git a/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.C b/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.C index 1eee03741e..eb188bdef7 100644 --- a/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.C +++ b/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.C @@ -62,12 +62,12 @@ Foam::IrreversibleSolidReaction::IrreversibleSolidReaction template Foam::scalar Foam::IrreversibleSolidReaction::kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const { - return k_(T, p, c); + return k_(p, T, c); } diff --git a/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.H b/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.H index a7a12f7566..09e31c1202 100644 --- a/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.H +++ b/src/thermophysicalModels/solid/reaction/Reactions/IrreversibleSolidReaction/IrreversibleSolidReaction.H @@ -107,8 +107,8 @@ public: //- Forward rate constant virtual scalar kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C index 3c5329107e..947eea22c9 100644 --- a/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C +++ b/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C @@ -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 { diff --git a/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.H index d9dedb29da..7188c85e5d 100644 --- a/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.H +++ b/src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.H @@ -217,8 +217,8 @@ public: virtual scalar kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H b/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H index 971cf77bf4..d5409b20db 100644 --- a/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H +++ b/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H @@ -86,8 +86,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H b/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H index a947a23710..c959e8dbd6 100644 --- a/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H +++ b/src/thermophysicalModels/solid/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C index c8eb8da993..9a91af290d 100644 --- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C @@ -266,7 +266,7 @@ Foam::ODESolidChemistryModel::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::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) { diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C index 6f593311ff..21ab18b6d5 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C @@ -82,12 +82,12 @@ Foam::IrreversibleReaction::IrreversibleReaction template Foam::scalar Foam::IrreversibleReaction::kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const { - return k_(T, p, c); + return k_(p, T, c); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H index 49d22e6539..82480e8670 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H @@ -142,8 +142,8 @@ public: //- Forward rate constant virtual scalar kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C index 6c90e7c082..c307f7bf6d 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C @@ -93,12 +93,12 @@ template Foam::scalar Foam::NonEquilibriumReversibleReaction::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::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 Foam::scalar Foam::NonEquilibriumReversibleReaction::kr ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const { - return rk_(T, p, c); + return rk_(p, T, c); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H index 462dffeaf2..0ef23d23df 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H @@ -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; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index dff2a8323a..d1501dc363 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -376,8 +376,8 @@ void Foam::Reaction::write(Ostream& os) const template Foam::scalar Foam::Reaction::kf ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const { @@ -389,8 +389,8 @@ template Foam::scalar Foam::Reaction::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::kr template Foam::scalar Foam::Reaction::kr ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const { diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H index 491a8b2cf3..c4397cb05b 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H @@ -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; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C index 7fc8d872c7..e0fdeed31d 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C @@ -82,12 +82,12 @@ Foam::ReversibleReaction::ReversibleReaction template Foam::scalar Foam::ReversibleReaction::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 Foam::scalar Foam::ReversibleReaction::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::kr template Foam::scalar Foam::ReversibleReaction::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); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H index aac1a29ba4..33f1f6ff96 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H @@ -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; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H index 049b247d0a..ef0181cca4 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H @@ -95,8 +95,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H index 5cdd00036b..205a2929ba 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H index 3f1a329191..6d8068d8a6 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H @@ -111,8 +111,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H index 17b080effa..3642fefaaf 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H @@ -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; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H index e69e2e452c..9fe9b05c20 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H @@ -108,8 +108,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H index 8a1c8e7e4d..6ba162f2dd 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H @@ -80,13 +80,13 @@ template inline Foam::scalar Foam::FallOffReactionRate::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; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H index cd61fbaa95..34e5cdfbc5 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H @@ -98,8 +98,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H index a8d1e8e6f9..5d123cc923 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H index 7aeb25cdc7..6c33ef36f6 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H @@ -97,8 +97,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H index 4699becb79..79a6367bd6 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H index 131bc5cc8c..fd472c8eca 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H @@ -99,8 +99,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H index fee3f6d1e2..44d59b6779 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H index e4abf7c833..78c988fab9 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H @@ -75,8 +75,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H index 713b5a011c..583fd36f20 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H @@ -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 diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H index 01b8f2fb7d..54c9b77625 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H @@ -98,8 +98,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H index b508c95e02..6a7b21567b 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H @@ -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 { diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H index eb07ba9bfc..d6baec8caa 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H @@ -94,8 +94,8 @@ public: inline scalar operator() ( - const scalar T, const scalar p, + const scalar T, const scalarField& c ) const; diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H index 8a6c20c987..842d23879d 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H @@ -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); }