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

Removed the at() function for vectors. gcc v2.95 does not support

Browse source 
this function.
This commit is contained in:
Harry Moffat 2004-07-26 15:58:21 +00:00
parent c5cd689da0
commit 6cb7ab41f3
2 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Cantera/src/NasaThermo.h
View file

@ -120,13 +120,15 @@ namespace Cantera {
int grp = m_group_map[k];
int pos = m_posInGroup_map[k];
const NasaPoly1 *nlow = &(m_low[grp-1].at(pos));
const vector<NasaPoly1> &mlg = m_low[grp-1];
const NasaPoly1 *nlow = &(mlg[pos]);
doublereal tmid = nlow->maxTemp();
if (t < tmid) {
nlow->updateProperties(m_t.begin(), cp_R, h_RT, s_R);
} else {
const NasaPoly1 *nhigh = &(m_high[grp-1].at(pos));
const vector<NasaPoly1> &mhg = m_high[grp-1];
const NasaPoly1 *nhigh = &(mhg[pos]);
nhigh->updateProperties(m_t.begin(), cp_R, h_RT, s_R);
}
}
@ -204,8 +206,10 @@ namespace Cantera {
if (type == NASA) {
int grp = m_group_map[index];
int pos = m_posInGroup_map[index];
const NasaPoly1 *lowPoly = &(m_low[grp-1].at(pos));
const NasaPoly1 *highPoly = &(m_high[grp-1].at(pos));
const vector<NasaPoly1> &mlg = m_low[grp-1];
const vector<NasaPoly1> &mhg = m_high[grp-1];
const NasaPoly1 *lowPoly = &(mlg[pos]);
const NasaPoly1 *highPoly = &(mhg[pos]);
doublereal tmid = lowPoly->maxTemp();
c[0] = tmid;
@ -242,7 +246,18 @@ namespace Cantera {
int m_ngroups;
mutable vector_fp m_t;
/*
* This map takes as its index, the species index in the phase.
* It returns the group index, where the temperature polynomials
* for that species are storred. group indecises start at 1,
* so a decrement is always performed to access vectors.
*/
mutable map<int, int> m_group_map;
/*
* This map takes as its index, the species index in the phase.
* It returns the position index within the group, where the
* temperature polynomials for that species are storred.
*/
mutable map<int, int> m_posInGroup_map;
private:

24
Cantera/src/ShomateThermo.h
View file

@ -102,13 +102,15 @@ namespace Cantera {
int grp = m_group_map[k];
int pos = m_posInGroup_map[k];
const ShomatePoly *nlow = &(m_low[grp-1].at(pos));
const vector<ShomatePoly> &mlg = m_low[grp-1];
const ShomatePoly *nlow = &(mlg[pos]);
doublereal tmid = nlow->maxTemp();
if (t < tmid) {
nlow->updateProperties(m_t.begin(), cp_R, h_RT, s_R);
} else {
const ShomatePoly *nhigh = &(m_high[grp-1].at(pos));
const vector<ShomatePoly> &mhg = m_high[grp-1];
const ShomatePoly *nhigh = &(mhg[pos]);
nhigh->updateProperties(m_t.begin(), cp_R, h_RT, s_R);
}
}
@ -175,8 +177,10 @@ namespace Cantera {
if (type == NASA) {
int grp = m_group_map[index];
int pos = m_posInGroup_map[index];
const ShomatePoly *lowPoly = &(m_low[grp-1].at(pos));
const ShomatePoly *highPoly = &(m_high[grp-1].at(pos));
const vector<ShomatePoly> &mlg = m_low[grp-1];
const vector<ShomatePoly> &mhg = m_high[grp-1];
const ShomatePoly *lowPoly = &(mlg[pos]);
const ShomatePoly *highPoly = &(mhg[pos]);
doublereal tmid = lowPoly->maxTemp();
c[0] = tmid;
int n;
@ -212,7 +216,19 @@ namespace Cantera {
int m_ngroups;
mutable vector_fp m_t;
/*
* This map takes as its index, the species index in the phase.
* It returns the group index, where the temperature polynomials
* for that species are storred. group indecises start at 1,
* so a decrement is always performed to access vectors.
*/
mutable map<int, int> m_group_map;
/*
* This map takes as its index, the species index in the phase.
* It returns the position index within the group, where the
* temperature polynomials for that species are storred.
*/
mutable map<int, int> m_posInGroup_map;
};