research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Kinetics] Switch parameter order in ChebyshevRate constructor

Browse source 
The usual order of arguments is temperature then pressure.
This commit is contained in:
Ray Speth 2015-04-30 22:34:25 -04:00
parent 6458b0c50d
commit 7a21855574
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/cantera/kinetics/RxnRates.h
View file

@ -452,15 +452,15 @@ public:
//! Constructor directly from coefficient array
/*
* @param Pmin Minimum pressure [Pa]
* @param Pmax Maximum pressure [Pa]
* @param Tmin Minimum temperature [K]
* @param Tmax Maximum temperature [K]
* @param Pmin Minimum pressure [Pa]
* @param Pmax Maximum pressure [Pa]
* @param coeffs Coefficient array dimensioned `nT` by `nP` where `nT` and
* `nP` are the number of temperatures and pressures used in the fit,
* respectively.
*/
ChebyshevRate(double Pmin, double Pmax, double Tmin, double Tmax,
ChebyshevRate(double Tmin, double Tmax, double Pmin, double Pmax,
const Array2D& coeffs);
//! Update concentration-dependent parts of the rate coefficient.

6
src/kinetics/Reaction.cpp
View file

@ -474,10 +474,10 @@ void setupChebyshevReaction(ChebyshevReaction& R, const XML_Node& rxn_node)
coeffs(t,p) = coeffs_flat[nP*t + p];
}
}
R.rate = ChebyshevRate(getFloat(rc, "Pmin", "toSI"),
getFloat(rc, "Pmax", "toSI"),
getFloat(rc, "Tmin", "toSI"),
R.rate = ChebyshevRate(getFloat(rc, "Tmin", "toSI"),
getFloat(rc, "Tmax", "toSI"),
getFloat(rc, "Pmin", "toSI"),
getFloat(rc, "Pmax", "toSI"),
coeffs);
setupReaction(R, rxn_node);
}

2
src/kinetics/RxnRates.cpp
View file

@ -265,7 +265,7 @@ ChebyshevRate::ChebyshevRate(const ReactionData& rdata)
PrDen_ = 1.0 / (logPmax - logPmin);
}
ChebyshevRate::ChebyshevRate(double Pmin, double Pmax, double Tmin, double Tmax,
ChebyshevRate::ChebyshevRate(double Tmin, double Tmax, double Pmin, double Pmax,
const Array2D& coeffs)
: Tmin_(Tmin)
, Tmax_(Tmax)

2
test/kinetics/kineticsFromScratch.cpp
View file

@ -195,7 +195,7 @@ TEST_F(KineticsFromScratch, add_chebyshev_reaction)
coeffs(2,1) = 2.6889e-01;
coeffs(2,2) = 9.4806e-02;
coeffs(2,3) = -7.6385e-03;
ChebyshevRate rate(1000.0, 10000000.0, 290, 3000, coeffs);
ChebyshevRate rate(290, 3000, 1000.0, 10000000.0, coeffs);
shared_ptr<ChebyshevReaction> R(new ChebyshevReaction(reac, prod, rate));
kin.addReaction(R);