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

[Thermo] Remove redundant overrides of ThermoPhase::eosType()

Browse source
This commit is contained in:
Ray Speth 2014-03-28 23:12:53 +00:00
parent 48042fd4ae
commit 3530050dc4
17 changed files with 0 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/cantera/thermo/GibbsExcessVPSSTP.h
View file

@ -130,16 +130,6 @@ public:
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @}
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h. The MolalityVPSSTP class also returns
* zero, as it is a non-complete class.
*/
virtual int eosType() const;
//! @}
//! @name Mechanical Properties
//! @{

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

@ -138,19 +138,6 @@ public:
*/
ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
/**
* Equation of state type flag. The base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Constants defined for this purpose are
* listed in mix_defs.h.
*/
virtual int eosType() const {
return 0;
}
//! @}
//! @name Molar Thermodynamic Properties of the Solution
//! @{

14
include/cantera/thermo/MargulesVPSSTP.h
View file

@ -326,20 +326,6 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h. The MolalityVPSSTP class also returns
* zero, as it is a non-complete class.
*/
virtual int eosType() const;
//! @}
//! @name Molar Thermodynamic Properties
//! @{

14
include/cantera/thermo/MixedSolventElectrolyte.h
View file

@ -318,20 +318,6 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h. The MolalityVPSSTP class also returns
* zero, as it is a non-complete class.
*/
virtual int eosType() const;
//! @}
//! @name Molar Thermodynamic Properties
//! @{

9
include/cantera/thermo/MixtureFugacityTP.h
View file

@ -103,15 +103,6 @@ public:
//! @}
//! @name Utilities
//! @{
/**
* Equation of state type flag. The base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Constants defined for this purpose are
* listed in mix_defs.h.
*/
virtual int eosType() const {
return 0;
}
//! This method returns the convention used in specification
//! of the standard state, of which there are currently two,

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

@ -223,16 +223,6 @@ public:
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h. The MolalityVPSSTP class also returns
* zero, as it is a non-complete class.
*/
virtual int eosType() const;
//! Set the pH scale, which determines the scale for single-ion activity
//! coefficients.
/*!

14
include/cantera/thermo/MolarityIonicVPSSTP.h
View file

@ -109,21 +109,7 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h. The MolalityVPSSTP class also returns
* zero, as it is a non-complete class.
*/
virtual int eosType() const;
/**
* @}
* @name Activities, Standard States, and Activity Concentrations
*
* The activity \f$a_k\f$ of a species in solution is

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

@ -96,20 +96,7 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h.
*/
virtual int eosType() const;
/**
* @}
* @name Activities, Standard States, and Activity Concentrations
*
* The activity \f$a_k\f$ of a species in solution is

13
include/cantera/thermo/RedlichKisterVPSSTP.h
View file

@ -315,19 +315,6 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! @name Utilities
//! @{
//! Equation of state type flag.
/*!
* The ThermoPhase base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Known constants defined for this purpose are
* listed in mix_defs.h.
*/
virtual int eosType() const;
//! @}
//! @name Molar Thermodynamic Properties
//! @{

9
include/cantera/thermo/VPStandardStateTP.h
View file

@ -86,15 +86,6 @@ public:
//@}
//! @name Utilities (VPStandardStateTP)
//@{
/**
* Equation of state type flag. The base class returns
* zero. Subclasses should define this to return a unique
* non-zero value. Constants defined for this purpose are
* listed in mix_defs.h.
*/
virtual int eosType() const {
return 0;
}
//! This method returns the convention used in specification
//! of the standard state, of which there are currently two,

5
src/thermo/GibbsExcessVPSSTP.cpp
View file

@ -109,11 +109,6 @@ void GibbsExcessVPSSTP::setConcentrations(const doublereal* const c)
getMoleFractions(DATA_PTR(moleFractions_));
}
int GibbsExcessVPSSTP::eosType() const
{
return 0;
}
/*
* ------------ Mechanical Properties ------------------------------
*/

9
src/thermo/MargulesVPSSTP.cpp
View file

@ -146,15 +146,6 @@ MargulesVPSSTP::MargulesVPSSTP(int testProb) :
m_pSpecies_A_ij[0] = iKCl;
}
/*
* -------------- Utilities -------------------------------
*/
int MargulesVPSSTP::eosType() const
{
return 0;
}
/*
* - Activities, Standard States, Activity Concentrations -----------
*/

9
src/thermo/MixedSolventElectrolyte.cpp
View file

@ -149,15 +149,6 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(int testProb) :
m_pSpecies_A_ij[0] = iKCl;
}
/*
* -------------- Utilities -------------------------------
*/
int MixedSolventElectrolyte::eosType() const
{
return 0;
}
/*
* - Activities, Standard States, Activity Concentrations -----------
*/

5
src/thermo/MolalityVPSSTP.cpp
View file

@ -81,11 +81,6 @@ ThermoPhase* MolalityVPSSTP::duplMyselfAsThermoPhase() const
* -------------- Utilities -------------------------------
*/
int MolalityVPSSTP::eosType() const
{
return 0;
}
void MolalityVPSSTP::setpHScale(const int pHscaleType)
{
m_pHScalingType = pHscaleType;

9
src/thermo/MolarityIonicVPSSTP.cpp
View file

@ -108,15 +108,6 @@ MolarityIonicVPSSTP::duplMyselfAsThermoPhase() const
return new MolarityIonicVPSSTP(*this);
}
/*
* -------------- Utilities -------------------------------
*/
int MolarityIonicVPSSTP::eosType() const
{
return 0;
}
/*
* - Activities, Standard States, Activity Concentrations -----------
*/

5
src/thermo/PseudoBinaryVPSSTP.cpp
View file

@ -84,11 +84,6 @@ PseudoBinaryVPSSTP::duplMyselfAsThermoPhase() const
return new PseudoBinaryVPSSTP(*this);
}
int PseudoBinaryVPSSTP::eosType() const
{
return 0;
}
doublereal PseudoBinaryVPSSTP::standardConcentration(size_t k) const
{
err("standardConcentration");

5
src/thermo/RedlichKisterVPSSTP.cpp
View file

@ -157,11 +157,6 @@ ThermoPhase* RedlichKisterVPSSTP::duplMyselfAsThermoPhase() const
return new RedlichKisterVPSSTP(*this);
}
int RedlichKisterVPSSTP::eosType() const
{
return 0;
}
/*
* - Activities, Standard States, Activity Concentrations -----------
*/