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

[Thermo] Eliminate redundant coefficient storage in NasaPoly2

Browse source
This commit is contained in:
Ray Speth 2019-02-21 00:12:09 -05:00
parent 50997a1651
commit b8367d6fe8
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/cantera/thermo/NasaPoly2.h
View file

@ -63,8 +63,7 @@ public:
SpeciesThermoInterpType(tlow, thigh, pref),
m_midT(coeffs[0]),
mnp_low(tlow, coeffs[0], pref, coeffs + 8),
mnp_high(coeffs[0], thigh, pref, coeffs + 1),
m_coeff(coeffs, coeffs + 15) {
mnp_high(coeffs[0], thigh, pref, coeffs + 1) {
}
virtual int reportType() const {
@ -102,14 +101,9 @@ public:
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
n = 0;
mnp_high.reportParameters(n, type, coeffs[0], thigh, pref, coeffs + 1);
mnp_low.reportParameters(n, type, tlow, coeffs[0], pref, coeffs + 8);
type = NASA2;
tlow = m_lowT;
thigh = m_highT;
pref = m_Pref;
for (int i = 0; i < 15; i++) {
coeffs[i] = m_coeff[i];
}
}
doublereal reportHf298(doublereal* const h298 = 0) const {
@ -150,8 +144,6 @@ protected:
NasaPoly1 mnp_low;
//! NasaPoly1 object for the high temperature region.
NasaPoly1 mnp_high;
//! array of polynomial coefficients
vector_fp m_coeff;
};
}