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

Removed some WIN32 warnings.

Browse source
This commit is contained in:
Harry Moffat 2009-03-27 00:51:38 +00:00
parent adf53b7dcc
commit c4631a9836
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -384,7 +384,7 @@ namespace Cantera {
* NOTE: This is an overwritten function from the State.h
* class
*/
void IdealMolalSoln::setDensity(doublereal rho) {
void IdealMolalSoln::setDensity(const doublereal rho) {
double dens = density();
if (rho != dens) {
throw CanteraError("Idea;MolalSoln::setDensity",
@ -401,7 +401,7 @@ namespace Cantera {
* NOTE: This is a virtual function, overwritten function from the State.h
* class
*/
void IdealMolalSoln::setMolarDensity(doublereal conc) {
void IdealMolalSoln::setMolarDensity(const doublereal conc) {
double concI = State::molarDensity();
if (conc != concI) {
throw CanteraError("IdealMolalSoln::setMolarDensity",

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

@ -321,7 +321,7 @@ namespace Cantera {
*
* @param rho Input Density
*/
void setDensity(doublereal rho);
void setDensity(const doublereal rho);
/**
* Overwritten setMolarDensity() function is necessary because the
@ -334,7 +334,7 @@ namespace Cantera {
*
* @param rho Input Density
*/
void setMolarDensity(doublereal rho);
void setMolarDensity(const doublereal rho);
//! The isothermal compressibility. Units: 1/Pa.
/*!

14
Cantera/src/thermo/IdealSolidSolnPhase.cpp
View file

@ -299,7 +299,7 @@ namespace Cantera {
* class
*/
void IdealSolidSolnPhase::
setDensity(doublereal rho) {
setDensity(const doublereal rho) {
/*
* Unless the input density is exactly equal to the density
* calculated and storred in the State object, we throw an
@ -341,7 +341,7 @@ namespace Cantera {
* NOTE: This is a virtual function that overrides the State.h
* class
*/
void IdealSolidSolnPhase::setMolarDensity(doublereal n) {
void IdealSolidSolnPhase::setMolarDensity(const doublereal n) {
throw CanteraError("IdealSolidSolnPhase::setMolarDensity",
"Density is not an independent variable");
}
@ -351,7 +351,7 @@ namespace Cantera {
*
* Sets the mole fractions and adjusts the internal density.
*/
void IdealSolidSolnPhase::setMoleFractions(const doublereal *x) {
void IdealSolidSolnPhase::setMoleFractions(const doublereal * const x) {
State::setMoleFractions(x);
calcDensity();
}
@ -361,7 +361,7 @@ namespace Cantera {
*
* Sets the mole fractions and adjusts the internal density.
*/
void IdealSolidSolnPhase::setMoleFractions_NoNorm(const doublereal *x) {
void IdealSolidSolnPhase::setMoleFractions_NoNorm(const doublereal * const x) {
State::setMoleFractions(x);
calcDensity();
}
@ -371,7 +371,7 @@ namespace Cantera {
*
* Sets the mass fractions and adjusts the internal density.
*/
void IdealSolidSolnPhase::setMassFractions(const doublereal *y) {
void IdealSolidSolnPhase::setMassFractions(const doublereal * const y) {
State::setMassFractions(y);
calcDensity();
}
@ -381,7 +381,7 @@ namespace Cantera {
*
* Sets the mass fractions and adjusts the internal density.
*/
void IdealSolidSolnPhase::setMassFractions_NoNorm(const doublereal *y) {
void IdealSolidSolnPhase::setMassFractions_NoNorm(const doublereal * const y) {
State::setMassFractions_NoNorm(y);
calcDensity();
}
@ -391,7 +391,7 @@ namespace Cantera {
*
* Sets the concentrations and adjusts the internal density
*/
void IdealSolidSolnPhase::setConcentrations(const doublereal *c) {
void IdealSolidSolnPhase::setConcentrations(const doublereal * const c) {
State::setConcentrations(c);
calcDensity();
}

14
Cantera/src/thermo/IdealSolidSolnPhase.h
View file

@ -333,7 +333,7 @@ namespace Cantera {
*
* @param rho Input density
*/
virtual void setDensity(doublereal rho);
virtual void setDensity(const doublereal rho);
/**
* Overwritten setMolarDensity() function is necessary because the
@ -346,42 +346,42 @@ namespace Cantera {
*
* @param rho Input Density
*/
virtual void setMolarDensity(doublereal rho);
virtual void setMolarDensity(const doublereal rho);
//! Set the mole fractions
/*!
* @param x Input vector of mole fractions.
* Length: m_kk.
*/
virtual void setMoleFractions(const doublereal *x);
virtual void setMoleFractions(const doublereal * const x);
//! Set the mole fractions, but don't normalize them to one.
/*!
* @param x Input vector of mole fractions.
* Length: m_kk.
*/
virtual void setMoleFractions_NoNorm(const doublereal *x);
virtual void setMoleFractions_NoNorm(const doublereal * const x);
//! Set the mass fractions, and normalize them to one.
/*!
* @param y Input vector of mass fractions.
* Length: m_kk.
*/
virtual void setMassFractions(const doublereal *y);
virtual void setMassFractions(const doublereal * const y);
//! Set the mass fractions, but don't normalize them to one
/*!
* @param y Input vector of mass fractions.
* Length: m_kk.
*/
virtual void setMassFractions_NoNorm(const doublereal *y);
virtual void setMassFractions_NoNorm(const doublereal * const y);
//! Set the concentration,
/*!
* @param c Input vector of concentrations.
* Length: m_kk.
*/
virtual void setConcentrations(const doublereal *c);
virtual void setConcentrations(const doublereal * const c);
//@}