From 878abceb6a4b46eff28e67b58d458d85313f8433 Mon Sep 17 00:00:00 2001 From: Steven DeCaluwe Date: Mon, 15 Jul 2013 17:44:01 +0000 Subject: [PATCH] Removed 'const' declaration from satPressure function for remaining ThermoPhase class members. --- include/cantera/thermo/DebyeHuckel.h | 2 +- include/cantera/thermo/HMWSoln.h | 2 +- include/cantera/thermo/WaterSSTP.h | 2 +- src/thermo/HMWSoln.cpp | 3 +-- src/thermo/WaterSSTP.cpp | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index b4df8f7a4..358bd30c7 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -1131,7 +1131,7 @@ public: * * @param T Temperature (kelvin) */ - virtual doublereal satPressure(doublereal T) const { + virtual doublereal satPressure(doublereal T) { err("satPressure"); return -1.0; } diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index 56acc7893..e51635e2a 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -1985,7 +1985,7 @@ public: * * @param T Temperature (kelvin) */ - virtual doublereal satPressure(doublereal T) const; + virtual doublereal satPressure(doublereal T); virtual doublereal vaporFraction() const { err("vaprFraction"); diff --git a/include/cantera/thermo/WaterSSTP.h b/include/cantera/thermo/WaterSSTP.h index a78618afc..68dd4e9ce 100644 --- a/include/cantera/thermo/WaterSSTP.h +++ b/include/cantera/thermo/WaterSSTP.h @@ -343,7 +343,7 @@ public: /*! * @param t Temperature (kelvin) */ - virtual doublereal satPressure(doublereal t) const; + virtual doublereal satPressure(doublereal t); //! Return the fraction of vapor at the current conditions /*! diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index d99f33c0b..8a123b2ac 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -1020,8 +1020,7 @@ void HMWSoln::setParametersFromXML(const XML_Node& eosdata) { } -doublereal HMWSoln::satPressure(doublereal t) const -{ +doublereal HMWSoln::satPressure(doublereal t) { double p_old = pressure(); double t_old = temperature(); double pres = m_waterSS->satPressure(t); diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index dc62a7b7b..91ece89ce 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -451,8 +451,7 @@ void WaterSSTP::setDensity(const doublereal dens) m_sub->setState_TR(temp, dens); } -doublereal WaterSSTP::satPressure(doublereal t) const -{ +doublereal WaterSSTP::satPressure(doublereal t) { doublereal tsave = temperature(); doublereal dsave = density(); doublereal pp = m_sub->psat(t);