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

[Thermo] Remove redundant implementations of logStandardConc

Browse source 
For the cases where logStandardConc just calls standardConcentration,
rely on the default implementation in class ThermoPhase.
This commit is contained in:
Ray Speth 2014-03-13 21:35:49 +00:00
parent d0b3ad3d4b
commit 89eab1bb48
18 changed files with 0 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/cantera/thermo/ConstDensityThermo.h
View file

@ -153,12 +153,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
//! Natural logarithm of the standard concentration of the kth species.
/*!
* @param k index of the species (defaults to zero)
*/
virtual doublereal logStandardConc(size_t k=0) const;
//! Get the Gibbs functions for the standard
//! state of the species at the current <I>T</I> and <I>P</I> of the solution
/*!

6
include/cantera/thermo/DebyeHuckel.h
View file

@ -868,12 +868,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
//! Natural logarithm of the standard concentration of the kth species.
/*!
* @param k index of the species (defaults to zero)
*/
virtual doublereal logStandardConc(size_t k=0) const;
//! Returns the units of the standard and generalized concentrations.
/*!
* Note they have the same units, as their

7
include/cantera/thermo/HMWSoln.h
View file

@ -1706,13 +1706,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
//! Returns the natural logarithm of the standard
//! concentration of the kth species
/*!
* @param k Species index
*/
virtual doublereal logStandardConc(size_t k=0) const;
//! Returns the units of the standard and generalized concentrations.
/*!
* Note they have the same units, as their

7
include/cantera/thermo/IdealGasPhase.h
View file

@ -554,13 +554,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k = 0) const;
//! Returns the natural logarithm of the standard
//! concentration of the kth species
/*!
* @param k index of the species. (defaults to zero)
*/
virtual doublereal logStandardConc(size_t k = 0) const;
//! Get the array of non-dimensional activity coefficients at
//! the current solution temperature, pressure, and solution concentration.
/*!

8
include/cantera/thermo/IdealMolalSoln.h
View file

@ -407,14 +407,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
/*!
* Returns the natural logarithm of the standard
* concentration of the kth species
*
* @param k Species index
*/
virtual doublereal logStandardConc(size_t k=0) const;
/*!
* Returns the units of the standard and generalized
* concentrations Note they have the same units, as their

7
include/cantera/thermo/IdealSolnGasVPSS.h
View file

@ -175,13 +175,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
//! Returns the natural logarithm of the standard
//! concentration of the kth species
/*!
* @param k index of the species. (defaults to zero)
*/
virtual doublereal logStandardConc(size_t k=0) const;
//! Returns the units of the standard and generalized concentrations.
/*!
* Note they have the same units, as their

8
include/cantera/thermo/MolalityVPSSTP.h
View file

@ -431,14 +431,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
/**
* Returns the natural logarithm of the standard
* concentration of the kth species
*
* @param k species index
*/
virtual doublereal logStandardConc(size_t k=0) const;
/**
* Returns the units of the standard and generalized
* concentrations Note they have the same units, as their

7
include/cantera/thermo/PseudoBinaryVPSSTP.h
View file

@ -135,13 +135,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
/**
* Returns the natural logarithm of the standard
* concentration of the kth species
*
* @param k species index
*/
virtual doublereal logStandardConc(size_t k=0) const;
//@}
/// @name Partial Molar Properties of the Solution
//@{

7
include/cantera/thermo/RedlichKwongMFTP.h
View file

@ -269,13 +269,6 @@ public:
*/
virtual doublereal standardConcentration(size_t k=0) const;
//! Returns the natural logarithm of the standard
//! concentration of the kth species
/*!
* @param k index of the species. (defaults to zero)
*/
virtual doublereal logStandardConc(size_t k=0) const;
//! Returns the units of the standard and generalized concentrations.
/*!
* Note they have the same units, as their

5
src/thermo/ConstDensityThermo.cpp
View file

@ -117,11 +117,6 @@ doublereal ConstDensityThermo::standardConcentration(size_t k) const
return molarDensity();
}
doublereal ConstDensityThermo::logStandardConc(size_t k) const
{
return log(molarDensity());
}
void ConstDensityThermo::getChemPotentials(doublereal* mu) const
{
doublereal vdp = (pressure() - m_spthermo->refPressure())/

6
src/thermo/DebyeHuckel.cpp
View file

@ -350,12 +350,6 @@ doublereal DebyeHuckel::standardConcentration(size_t k) const
return 1.0 / mvSolvent;
}
doublereal DebyeHuckel::logStandardConc(size_t k) const
{
double c_solvent = standardConcentration(k);
return log(c_solvent);
}
void DebyeHuckel::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
for (int i = 0; i < sizeUA; i++) {

6
src/thermo/HMWSoln.cpp
View file

@ -812,12 +812,6 @@ doublereal HMWSoln::standardConcentration(size_t k) const
return 1.0 / mvSolvent;
}
doublereal HMWSoln::logStandardConc(size_t k) const
{
double c_solvent = standardConcentration(k);
return log(c_solvent);
}
void HMWSoln::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
for (int i = 0; i < sizeUA; i++) {

7
src/thermo/IdealGasPhase.cpp
View file

@ -100,13 +100,6 @@ doublereal IdealGasPhase::standardConcentration(size_t k) const
return p / (GasConstant * temperature());
}
doublereal IdealGasPhase::logStandardConc(size_t k) const
{
_updateThermo();
double p = pressure();
return std::log(p / (GasConstant * temperature()));
}
void IdealGasPhase::getActivityCoefficients(doublereal* ac) const
{
for (size_t k = 0; k < m_kk; k++) {

6
src/thermo/IdealMolalSoln.cpp
View file

@ -269,12 +269,6 @@ doublereal IdealMolalSoln::standardConcentration(size_t k) const
return c0;
}
doublereal IdealMolalSoln::logStandardConc(size_t k) const
{
double c0 = standardConcentration(k);
return log(c0);
}
void IdealMolalSoln::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
int eos = eosType();

6
src/thermo/IdealSolnGasVPSS.cpp
View file

@ -217,12 +217,6 @@ doublereal IdealSolnGasVPSS::standardConcentration(size_t k) const
}
}
doublereal IdealSolnGasVPSS::logStandardConc(size_t k) const
{
double c = standardConcentration(k);
return std::log(c);
}
void IdealSolnGasVPSS::getUnitsStandardConc(double* uA, int, int sizeUA) const
{
int eos = eosType();

6
src/thermo/MolalityVPSSTP.cpp
View file

@ -299,12 +299,6 @@ doublereal MolalityVPSSTP::standardConcentration(size_t k) const
return -1.0;
}
doublereal MolalityVPSSTP::logStandardConc(size_t k) const
{
err("logStandardConc");
return -1.0;
}
void MolalityVPSSTP::getActivities(doublereal* ac) const
{
err("getActivities");

6
src/thermo/PseudoBinaryVPSSTP.cpp
View file

@ -96,12 +96,6 @@ doublereal PseudoBinaryVPSSTP::standardConcentration(size_t k) const
return -1.0;
}
doublereal PseudoBinaryVPSSTP::logStandardConc(size_t k) const
{
err("logStandardConc");
return -1.0;
}
void PseudoBinaryVPSSTP::getElectrochemPotentials(doublereal* mu) const
{
getChemPotentials(mu);

6
src/thermo/RedlichKwongMFTP.cpp
View file

@ -378,12 +378,6 @@ doublereal RedlichKwongMFTP::standardConcentration(size_t k) const
return 1.0 / m_tmpV[k];
}
doublereal RedlichKwongMFTP::logStandardConc(size_t k) const
{
double c = standardConcentration(k);
return std::log(c);
}
void RedlichKwongMFTP::getUnitsStandardConc(double* uA, int, int sizeUA) const
{
//int eos = eosType();