From 19662496c3320c53d849559e6dfc79c89e9d5668 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 28 Jun 2013 21:24:46 +0000
Subject: [PATCH] Deprecate VPSSMgr::standardVolumes

---
 include/cantera/thermo/VPSSMgr.h | 3 +++
 src/thermo/IdealSolnGasVPSS.cpp  | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h
index 5991a37ca..3b3016590 100644
--- a/include/cantera/thermo/VPSSMgr.h
+++ b/include/cantera/thermo/VPSSMgr.h
@@ -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;
     }
 
diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp
index d0ac7dcf8..957b9f084 100644
--- a/src/thermo/IdealSolnGasVPSS.cpp
+++ b/src/thermo/IdealSolnGasVPSS.cpp
@@ -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;