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

[Thermo] Deprecate unused method 'getUnitsStandardConc'

Browse source 
First step in resolving Issue #96
This commit is contained in:
Ray Speth 2015-04-14 15:18:20 -04:00
parent df971368a9
commit 1dd7b214b5
28 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -869,6 +869,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/FixedChemPotSSTP.h
View file

@ -348,6 +348,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(doublereal* uA, int k = 0,
int sizeUA = 6) const;

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

@ -252,6 +252,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

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

@ -1670,6 +1670,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

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

@ -383,6 +383,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/IdealSolidSolnPhase.h
View file

@ -440,6 +440,7 @@ public:
* kmol/m3 holds for standard concentration units. For
* cIdealSolidSolnPhase0 type, the standard concentration is
* unitless.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

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

@ -189,6 +189,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/MetalSHEelectrons.h
View file

@ -361,6 +361,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(doublereal* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/MineralEQ3.h
View file

@ -277,6 +277,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(doublereal* uA, int k = 0,
int sizeUA = 6) const;

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

@ -442,6 +442,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

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

@ -279,6 +279,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0, int sizeUA = 6) const;

1
include/cantera/thermo/StoichSubstance.h
View file

@ -181,6 +181,7 @@ public:
* uA[3] = Pa(pressure) units - default = 0;
* uA[4] = Temperature units - default = 0;
* uA[5] = time units - default = 0
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/StoichSubstanceSSTP.h
View file

@ -340,6 +340,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(doublereal* uA, int k = 0,
int sizeUA = 6) const;

1
include/cantera/thermo/ThermoPhase.h
View file

@ -484,6 +484,7 @@ public:
* @param k species index. Defaults to 0.
* @param sizeUA output int containing the size of the vector.
* Currently, this is equal to 6.
* @deprecated To be removed after Cantera 2.2.
*/
virtual void getUnitsStandardConc(double* uA, int k = 0,
int sizeUA = 6) const;

2
src/thermo/DebyeHuckel.cpp
View file

@ -323,6 +323,8 @@ doublereal DebyeHuckel::standardConcentration(size_t k) const
void DebyeHuckel::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("DebyeHuckel::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < sizeUA; i++) {
if (i == 0) {
uA[0] = 1.0;

2
src/thermo/FixedChemPotSSTP.cpp
View file

@ -191,6 +191,8 @@ doublereal FixedChemPotSSTP::logStandardConc(size_t k) const
void FixedChemPotSSTP::getUnitsStandardConc(doublereal* uA, int k,
int sizeUA) const
{
warn_deprecated("FixedChemPotSSTP::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < 6; i++) {
uA[i] = 0;
}

2
src/thermo/GibbsExcessVPSSTP.cpp
View file

@ -232,6 +232,8 @@ double GibbsExcessVPSSTP::checkMFSum(const doublereal* const x) const
void GibbsExcessVPSSTP::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("GibbsExcessVPSSTP::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
//
// We assume here that the units of the standard concentration is unitless. In other words activities are
// used unchanged in kinetics expressions. This may be changed in implementations of child classes.

2
src/thermo/HMWSoln.cpp
View file

@ -626,6 +626,8 @@ doublereal HMWSoln::standardConcentration(size_t k) const
void HMWSoln::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("HMWSoln::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < sizeUA; i++) {
if (i == 0) {
uA[0] = 1.0;

3
src/thermo/IdealMolalSoln.cpp
View file

@ -267,6 +267,9 @@ doublereal IdealMolalSoln::standardConcentration(size_t k) const
void IdealMolalSoln::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("IdealMolalSoln::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
int eos = eosType();
if (eos == 0) {
for (int i = 0; i < sizeUA; i++) {

2
src/thermo/IdealSolidSolnPhase.cpp
View file

@ -284,6 +284,8 @@ doublereal IdealSolidSolnPhase::logStandardConc(size_t k) const
void IdealSolidSolnPhase::getUnitsStandardConc(double* uA, int, int sizeUA) const
{
warn_deprecated("IdealSolidSolnPhase::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
int eos = eosType();
if (eos == cIdealSolidSolnPhase0) {
for (int i = 0; i < sizeUA; i++) {

3
src/thermo/IdealSolnGasVPSS.cpp
View file

@ -197,6 +197,9 @@ doublereal IdealSolnGasVPSS::standardConcentration(size_t k) const
void IdealSolnGasVPSS::getUnitsStandardConc(double* uA, int, int sizeUA) const
{
warn_deprecated("IdealSolnGasVPSS::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
if (eosType() == cIdealSolnGasPhase0) {
for (int i = 0; i < sizeUA; i++) {
uA[i] = 0.0;

3
src/thermo/MetalSHEelectrons.cpp
View file

@ -159,6 +159,9 @@ doublereal MetalSHEelectrons::logStandardConc(size_t k) const
void MetalSHEelectrons::getUnitsStandardConc(doublereal* uA, int k,
int sizeUA) const
{
warn_deprecated("MetalSHEelectrons::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < 6; i++) {
uA[i] = 0;
}

3
src/thermo/MineralEQ3.cpp
View file

@ -146,6 +146,9 @@ doublereal MineralEQ3::logStandardConc(size_t k) const
void MineralEQ3::getUnitsStandardConc(doublereal* uA, int k, int sizeUA) const
{
warn_deprecated("MineralEQ3::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < 6; i++) {
uA[i] = 0;
}

3
src/thermo/MolalityVPSSTP.cpp
View file

@ -331,6 +331,9 @@ void MolalityVPSSTP::getElectrochemPotentials(doublereal* mu) const
void MolalityVPSSTP::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("MolalityVPSSTP::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < sizeUA; i++) {
if (i == 0) {
uA[0] = 1.0;

3
src/thermo/RedlichKwongMFTP.cpp
View file

@ -304,6 +304,9 @@ doublereal RedlichKwongMFTP::standardConcentration(size_t k) const
void RedlichKwongMFTP::getUnitsStandardConc(double* uA, int, int sizeUA) const
{
warn_deprecated("RedlichKwongMFTP::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
//int eos = eosType();
for (int i = 0; i < sizeUA; i++) {

2
src/thermo/StoichSubstance.cpp
View file

@ -138,6 +138,8 @@ void StoichSubstance::getStandardChemPotentials(doublereal* mu0) const
void StoichSubstance::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("StoichSubstance::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < sizeUA; i++) {
uA[i] = 0.0;
}

2
src/thermo/StoichSubstanceSSTP.cpp
View file

@ -131,6 +131,8 @@ doublereal StoichSubstanceSSTP::logStandardConc(size_t k) const
void StoichSubstanceSSTP::getUnitsStandardConc(doublereal* uA, int k, int sizeUA) const
{
warn_deprecated("StoichSubstanceSSTP::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < 6; i++) {
uA[i] = 0;
}

2
src/thermo/ThermoPhase.cpp
View file

@ -587,6 +587,8 @@ void ThermoPhase::setState_SPorSV(doublereal Starget, doublereal p,
void ThermoPhase::getUnitsStandardConc(double* uA, int k, int sizeUA) const
{
warn_deprecated("ThermoPhase::getUnitsStandardConc",
"To be removed after Cantera 2.2.");
for (int i = 0; i < sizeUA; i++) {
if (i == 0) {
uA[0] = 1.0;