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

Turned the virtual function,getParameters(), to getParameters() const

Browse source
This commit is contained in:
Harry Moffat 2007-06-12 19:14:06 +00:00
parent 8079087eb4
commit 235ff2acb5
14 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/src/thermo/ConstDensityThermo.h
View file

@ -383,7 +383,7 @@ namespace Cantera {
* @param n number of parameters * @param n number of parameters
* @param c array of \a n coefficients * @param c array of \a n coefficients
*/ */
virtual void getParameters(int &n, doublereal * const c) { virtual void getParameters(int &n, doublereal * const c) const {
double d = density(); double d = density();
c[0] = d; c[0] = d;
n = 1; n = 1;

3
Cantera/src/thermo/DebyeHuckel.cpp
View file

@ -1853,7 +1853,8 @@ namespace Cantera {
*/ */
void DebyeHuckel::setParameters(int n, doublereal* c) { void DebyeHuckel::setParameters(int n, doublereal* c) {
} }
void DebyeHuckel::getParameters(int &n, doublereal * const c) {
void DebyeHuckel::getParameters(int &n, doublereal * const c) const {
} }
/* /*

2
Cantera/src/thermo/DebyeHuckel.h
View file

@ -1362,7 +1362,7 @@ namespace Cantera {
* @param n number of parameters * @param n number of parameters
* @param c array of \a n coefficients * @param c array of \a n coefficients
*/ */
virtual void getParameters(int &n, doublereal * const c); virtual void getParameters(int &n, doublereal * const c) const;
//! Set equation of state parameter values from XML entries. //! Set equation of state parameter values from XML entries.
/*! /*!

3
Cantera/src/thermo/HMWSoln.cpp
View file

@ -1400,7 +1400,8 @@ namespace Cantera {
*/ */
void HMWSoln::setParameters(int n, doublereal* c) { void HMWSoln::setParameters(int n, doublereal* c) {
} }
void HMWSoln::getParameters(int &n, doublereal * const c) {
void HMWSoln::getParameters(int &n, doublereal * const c) const {
} }
/** /**
* Set equation of state parameter values from XML * Set equation of state parameter values from XML

2
Cantera/src/thermo/HMWSoln.h
View file

@ -1357,7 +1357,7 @@ namespace Cantera {
* @param n number of parameters * @param n number of parameters
* @param c array of \a n coefficients * @param c array of \a n coefficients
*/ */
virtual void getParameters(int &n, doublereal * const c); virtual void getParameters(int &n, doublereal * const c) const;
/** /**
* Set equation of state parameter values from XML * Set equation of state parameter values from XML

3
Cantera/src/thermo/IdealMolalSoln.cpp
View file

@ -1114,7 +1114,8 @@ namespace Cantera {
*/ */
void IdealMolalSoln::setParameters(int n, doublereal* c) { void IdealMolalSoln::setParameters(int n, doublereal* c) {
} }
void IdealMolalSoln::getParameters(int &n, doublereal * const c) {
void IdealMolalSoln::getParameters(int &n, doublereal * const c) const {
} }
/* /*

2
Cantera/src/thermo/IdealMolalSoln.h
View file

@ -825,7 +825,7 @@ namespace Cantera {
* @param n number of parameters (output) * @param n number of parameters (output)
* @param c array of <I>n</I> coefficients * @param c array of <I>n</I> coefficients
*/ */
virtual void getParameters(int &n, doublereal * const c); virtual void getParameters(int &n, doublereal * const c) const;
/*! /*!
* Set equation of state parameter values from XML * Set equation of state parameter values from XML

2
Cantera/src/thermo/LatticePhase.h
View file

@ -146,7 +146,7 @@ namespace Cantera {
// set the site density of sublattice n // set the site density of sublattice n
virtual void setParameters(int n, doublereal* c) {} virtual void setParameters(int n, doublereal* c) {}
virtual void getParameters(int &n, doublereal * const c) { virtual void getParameters(int &n, doublereal * const c) const {
double d = molarDensity(); double d = molarDensity();
c[0] = d; c[0] = d;
n = 1; n = 1;

3
Cantera/src/thermo/SingleSpeciesTP.h
View file

@ -625,7 +625,8 @@ namespace Cantera {
* *
*/ */
virtual void setParameters(int n, doublereal* c) {} virtual void setParameters(int n, doublereal* c) {}
virtual void getParameters(int &n, doublereal * const c) {}
virtual void getParameters(int &n, doublereal * const c) const {}
/** /**
* Set equation of state parameter values from XML * Set equation of state parameter values from XML

2
Cantera/src/thermo/StoichSubstance.cpp
View file

@ -128,7 +128,7 @@ namespace Cantera {
setDensity(rho); setDensity(rho);
} }
void StoichSubstance::getParameters(int &n, double * const c) { void StoichSubstance::getParameters(int &n, double * const c) const {
double rho = density(); double rho = density();
c[0] = rho; c[0] = rho;
} }

3
Cantera/src/thermo/StoichSubstance.h
View file

@ -427,7 +427,8 @@ namespace Cantera {
virtual void initThermo(); virtual void initThermo();
virtual void setParameters(int n, double *c); virtual void setParameters(int n, double *c);
virtual void getParameters(int &n, double * const c);
virtual void getParameters(int &n, double * const c) const;
virtual void setParametersFromXML(const XML_Node& eosdata); virtual void setParametersFromXML(const XML_Node& eosdata);

2
Cantera/src/thermo/StoichSubstanceSSTP.cpp
View file

@ -415,7 +415,7 @@ namespace Cantera {
* n = 1 * n = 1
* C[0] = density of phase [ kg/m3 ] * C[0] = density of phase [ kg/m3 ]
*/ */
void StoichSubstanceSSTP::getParameters(int &n, double * const c) { void StoichSubstanceSSTP::getParameters(int &n, double * const c) const {
double rho = density(); double rho = density();
n = 1; n = 1;
c[0] = rho; c[0] = rho;

2
Cantera/src/thermo/StoichSubstanceSSTP.h
View file

@ -482,7 +482,7 @@ namespace Cantera {
* - n = 1 * - n = 1
* - c[0] = density of phase [ kg/m3 ] * - c[0] = density of phase [ kg/m3 ]
*/ */
virtual void getParameters(int &n, double * const c); virtual void getParameters(int &n, double * const c) const;
//! Set equation of state parameter values from XML entries. //! Set equation of state parameter values from XML entries.
/*! /*!

4
Cantera/src/thermo/ThermoPhase.h
View file

@ -1390,7 +1390,7 @@ namespace Cantera {
* location of a phase object in a list, and is used by the * location of a phase object in a list, and is used by the
* interface library (clib) routines for this purpose. * interface library (clib) routines for this purpose.
*/ */
int index() { return m_index; } int index() const { return m_index; }
/** /**
@ -1425,7 +1425,7 @@ namespace Cantera {
* @param n number of parameters * @param n number of parameters
* @param c array of \a n coefficients * @param c array of \a n coefficients
*/ */
virtual void getParameters(int &n, doublereal * const c) {} virtual void getParameters(int &n, doublereal * const c) const {}
//! Set equation of state parameter values from XML entries. //! Set equation of state parameter values from XML entries.