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

Made the function reportParams() in the SpeciesThermo class a const

Browse source 
function.
Added "None" to TransportBase.h. I think I had taken it out inadvertently
from one of the other .h files. It's needed here to specify no
transport. (maybe time for using enums)
This commit is contained in:
Harry Moffat 2007-02-14 17:43:31 +00:00
parent a317c47b3a
commit 0c2269a357
8 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/src/GeneralSpeciesThermo.cpp
View file

@ -178,7 +178,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
SpeciesThermoInterpType *sp = m_sp[index];
int n;
sp->reportParameters(n, type, minTemp, maxTemp,

2
Cantera/src/GeneralSpeciesThermo.h
View file

@ -89,7 +89,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure);
doublereal &refPressure) const;
protected:

2
Cantera/src/NasaThermo.h
View file

@ -317,7 +317,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
type = reportType(index);
if (type == NASA) {
int grp = m_group_map[index];

2
Cantera/src/ShomateThermo.h
View file

@ -184,7 +184,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
type = reportType(index);
if (type == SHOMATE) {
int grp = m_group_map[index];

2
Cantera/src/SimpleThermo.h
View file

@ -100,7 +100,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
type = reportType(index);
int loc = m_loc[index];
if (type == SIMPLE) {

3
Cantera/src/SpeciesThermo.h
View file

@ -249,13 +249,12 @@ namespace Cantera {
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
*
* @todo should be a const function.
*/
virtual void reportParams(int index, int &type,
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) =0;
doublereal &refPressure) const =0;
//! Modify parameters for the standard state
/*!

5
Cantera/src/SpeciesThermoMgr.h
View file

@ -292,13 +292,12 @@ namespace Cantera {
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
*
* @todo should be a const function.
*/
virtual void reportParams(int index, int &type,
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
int ctype = reportType(index);
if (ctype == m_thermo1.ID) {
m_thermo1.reportParams(index, type, c, minTemp, maxTemp,
@ -450,7 +449,7 @@ namespace Cantera {
doublereal * const c,
doublereal &minTemp,
doublereal &maxTemp,
doublereal &refPressure) {
doublereal &refPressure) const {
m_thermo[index]->reportParameters(index, type, c, minTemp, maxTemp, refPressure);
}

1
Cantera/src/transport/TransportBase.h
View file

@ -25,6 +25,7 @@ namespace Cantera {
const int CK_Mode = 10;
// types of transport models that can be constructed
const int None = 199;
const int cMulticomponent = 200;
const int CK_Multicomponent = 202;
const int cMixtureAveraged = 210;