Eliminated various warning messages produced by VC++
This commit is contained in:
parent
7b72b5492e
commit
30ff1862f9
7 changed files with 16 additions and 17 deletions
|
|
@ -21,7 +21,6 @@
|
|||
#endif
|
||||
|
||||
#include "DebyeHuckel.h"
|
||||
//#include "importCTML.h"
|
||||
#include "ThermoFactory.h"
|
||||
#include "WaterProps.h"
|
||||
#include "PDSS_Water.h"
|
||||
|
|
@ -445,7 +444,7 @@ namespace Cantera {
|
|||
* NOTE: This is a virtual function, overwritten function from the State.h
|
||||
* class
|
||||
*/
|
||||
void DebyeHuckel::setMolarDensity(doublereal conc) {
|
||||
void DebyeHuckel::setMolarDensity(const doublereal conc) {
|
||||
double concI = molarDensity();
|
||||
if (conc != concI) {
|
||||
throw CanteraError("Idea;MolalSoln::setMolarDensity",
|
||||
|
|
@ -458,7 +457,7 @@ namespace Cantera {
|
|||
* function sets the temperature, and makes sure that
|
||||
* the value propagates to underlying objects.
|
||||
*/
|
||||
void DebyeHuckel::setTemperature(doublereal temp) {
|
||||
void DebyeHuckel::setTemperature(const doublereal temp) {
|
||||
_updateStandardStateThermo();
|
||||
State::setTemperature(temp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -816,7 +816,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param rho Input density (kg/m^3).
|
||||
*/
|
||||
void setDensity(doublereal rho);
|
||||
void setDensity(const doublereal rho);
|
||||
|
||||
//! Set the internally storred molar density (kmol/m^3) of the phase.
|
||||
/**
|
||||
|
|
@ -831,7 +831,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param conc Input molar density (kmol/m^3).
|
||||
*/
|
||||
virtual void setMolarDensity(doublereal conc);
|
||||
virtual void setMolarDensity(const doublereal conc);
|
||||
|
||||
//! Set the temperature (K)
|
||||
/*!
|
||||
|
|
@ -844,7 +844,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param temp Temperature in kelvin
|
||||
*/
|
||||
virtual void setTemperature(doublereal temp);
|
||||
virtual void setTemperature(const doublereal temp);
|
||||
|
||||
/**
|
||||
* The isothermal compressibility. Units: 1/Pa.
|
||||
|
|
|
|||
|
|
@ -860,7 +860,7 @@ namespace Cantera {
|
|||
* NOTE: This is an overwritten function from the State.h
|
||||
* class
|
||||
*/
|
||||
void HMWSoln::setDensity(doublereal rho) {
|
||||
void HMWSoln::setDensity(const doublereal rho) {
|
||||
double dens_old = density();
|
||||
|
||||
if (rho != dens_old) {
|
||||
|
|
@ -878,7 +878,7 @@ namespace Cantera {
|
|||
* NOTE: This is an overwritten function from the State.h
|
||||
* class
|
||||
*/
|
||||
void HMWSoln::setMolarDensity(doublereal rho) {
|
||||
void HMWSoln::setMolarDensity(const doublereal rho) {
|
||||
throw CanteraError("HMWSoln::setMolarDensity",
|
||||
"Density is not an independent variable");
|
||||
}
|
||||
|
|
@ -888,7 +888,7 @@ namespace Cantera {
|
|||
* function sets the temperature, and makes sure that
|
||||
* the value propagates to underlying objects.
|
||||
*/
|
||||
void HMWSoln::setTemperature(doublereal temp) {
|
||||
void HMWSoln::setTemperature(const doublereal temp) {
|
||||
State::setTemperature(temp);
|
||||
//m_waterSS->setTemperature(temp);
|
||||
updateStandardStateThermo();
|
||||
|
|
|
|||
|
|
@ -1503,7 +1503,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param rho Input density (kg/m^3).
|
||||
*/
|
||||
void setDensity(doublereal rho);
|
||||
void setDensity(const doublereal rho);
|
||||
|
||||
//! Set the internally storred molar density (kmol/m^3) for the phase.
|
||||
/**
|
||||
|
|
@ -1518,7 +1518,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param conc Input molar density (kmol/m^3).
|
||||
*/
|
||||
void setMolarDensity(doublereal conc);
|
||||
void setMolarDensity(const doublereal conc);
|
||||
|
||||
//! Set the temperature (K)
|
||||
/*!
|
||||
|
|
@ -1531,7 +1531,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param temp Temperature in kelvin
|
||||
*/
|
||||
virtual void setTemperature(doublereal temp);
|
||||
virtual void setTemperature(const doublereal temp);
|
||||
|
||||
/**
|
||||
* The isothermal compressibility. Units: 1/Pa.
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ namespace Cantera {
|
|||
*
|
||||
* @param T Temperature (kelvin)
|
||||
*/
|
||||
virtual void setTemperature(doublereal T);
|
||||
virtual void setTemperature(const doublereal T);
|
||||
|
||||
|
||||
//! Set the temperature and pressure at the same time
|
||||
|
|
|
|||
|
|
@ -542,13 +542,13 @@ namespace Cantera {
|
|||
doublereal WaterSSTP::critDensity() const { return m_sub->Rhocrit(); }
|
||||
|
||||
|
||||
void WaterSSTP::setTemperature(double temp) {
|
||||
void WaterSSTP::setTemperature(const doublereal temp) {
|
||||
State::setTemperature(temp);
|
||||
doublereal dd = density();
|
||||
m_sub->setState_TR(temp, dd);
|
||||
}
|
||||
|
||||
void WaterSSTP::setDensity(double dens) {
|
||||
void WaterSSTP::setDensity(const doublereal dens) {
|
||||
State::setDensity(dens);
|
||||
doublereal temp = temperature();
|
||||
m_sub->setState_TR(temp, dens);
|
||||
|
|
|
|||
|
|
@ -400,9 +400,9 @@ namespace Cantera {
|
|||
virtual doublereal vaporFraction() const;
|
||||
|
||||
|
||||
virtual void setTemperature(double temp);
|
||||
virtual void setTemperature(const doublereal temp);
|
||||
|
||||
virtual void setDensity(double dens);
|
||||
virtual void setDensity(const doublereal dens);
|
||||
|
||||
void constructPhase();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue