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

Deprecate VPSSMgr::standardVolumes

Browse source
This commit is contained in:
Ray Speth 2013-06-28 21:24:46 +00:00
parent 8ded648bf4
commit 19662496c3
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cantera/thermo/VPSSMgr.h
View file

@ -17,6 +17,7 @@
#include "cantera/base/ct_defs.h"
#include "mix_defs.h"
#include "cantera/base/global.h"
namespace Cantera
{
@ -364,7 +365,9 @@ public:
virtual const vector_fp& getStandardVolumes() const;
//! Return a reference to a vector of the species standard molar volumes
//! @deprecated Use getStandardVolumes()
const vector_fp& standardVolumes() const {
warn_deprecated("VPSSMgr::standardVolumes");
return m_Vss;
}

6
src/thermo/IdealSolnGasVPSS.cpp
View file

@ -149,7 +149,7 @@ void IdealSolnGasVPSS::calcDensity()
Phase::setDensity(dens);
} else {
const doublereal* const dtmp = moleFractdivMMW();
const vector_fp& vss = m_VPSS_ptr->standardVolumes();
const vector_fp& vss = m_VPSS_ptr->getStandardVolumes();
double invDens = dot(vss.begin(), vss.end(), dtmp);
/*
* Set the density in the parent State object directly,
@ -176,7 +176,7 @@ void IdealSolnGasVPSS::getActivityConcentrations(doublereal* c) const
if (m_idealGas) {
getConcentrations(c);
} else {
const vector_fp& vss = m_VPSS_ptr->standardVolumes();
const vector_fp& vss = m_VPSS_ptr->getStandardVolumes();
switch (m_formGC) {
case 0:
for (size_t k = 0; k < m_kk; k++) {
@ -203,7 +203,7 @@ doublereal IdealSolnGasVPSS::standardConcentration(size_t k) const
double p = pressure();
return p/(GasConstant * temperature());
} else {
const vector_fp& vss = m_VPSS_ptr->standardVolumes();
const vector_fp& vss = m_VPSS_ptr->getStandardVolumes();
switch (m_formGC) {
case 0:
return 1.0;