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

[Thermo] Deprecate numerical constants for VPSSMgr types

Browse source
This commit is contained in:
Ray Speth 2016-07-05 22:49:56 -04:00
parent 62524e8820
commit 39c234ac4b
9 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -572,6 +572,7 @@ public:
/*!
* @returns an enum type called VPSSMgr_enumType, which is a list of the
* known VPSSMgr objects
* @deprecated Unused. To be removed after Cantera 2.3.
*/
virtual VPSSMgr_enumType reportVPSSMgrType() const;

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

@ -129,6 +129,7 @@ enum PDSS_enumType {
//! enum for VPSSMgr types that are responsible for calculating the species
//! standard state and reference-state thermodynamic properties.
//! @deprecated Unused. To be removed after Cantera 2.3.
enum VPSSMgr_enumType {
cVPSSMGR_UNDEF = 1000,
//! Variable pressures SS calculator for ideal gas phases

6
src/thermo/VPSSMgrFactory.cpp
View file

@ -212,6 +212,8 @@ void VPSSMgrFactory::deleteFactory()
VPSSMgr_enumType
VPSSMgrFactory::VPSSMgr_StringConversion(const std::string& ssModel) const
{
warn_deprecated("VPSSMgrFactory::VPSSMgr_StringConversion",
"To be removed after Cantera 2.3.");
std::string lssModel = lowercase(ssModel);
VPSSMgr_enumType type;
if (lssModel == "idealgas") {
@ -310,6 +312,8 @@ VPSSMgr* VPSSMgrFactory::newVPSSMgr(VPStandardStateTP* vp_ptr,
VPSSMgr* VPSSMgrFactory::newVPSSMgr(VPSSMgr_enumType type,
VPStandardStateTP* vp_ptr)
{
warn_deprecated("VPSSMgrFactory::newVPSSMgr(VPSSMgr_enumType, VPStandardStateTP*)",
"To be removed after Cantera 2.3.");
static unordered_map<int, std::string> types {
{cVPSSMGR_IDEALGAS, "idealgas"},
{cVPSSMGR_CONSTVOL, "constvol"},
@ -325,6 +329,8 @@ VPSSMgr* VPSSMgrFactory::newVPSSMgr(VPSSMgr_enumType type,
VPSSMgr* newVPSSMgr(VPSSMgr_enumType type, VPStandardStateTP* vp_ptr,
Cantera::VPSSMgrFactory* f)
{
warn_deprecated("newVPSSMgr(VPSSMgr_enumType, VPStandardStateTP*, VPSSMgrFactory*)",
"To be removed after Cantera 2.3.");
if (f == 0) {
f = VPSSMgrFactory::factory();
}

2
src/thermo/VPSSMgrFactory.h
View file

@ -91,6 +91,7 @@ public:
* standardState model attribute and converted to a VPSSMgr_enumType type.
*
* @param ssModel String representing the VPSSMGr object
* @deprecated Unused. To be removed after Cantera 2.3.
*/
virtual VPSSMgr_enumType
VPSSMgr_StringConversion(const std::string& ssModel) const;
@ -154,6 +155,7 @@ private:
* that will be the owner.
* @param f Pointer to a VPSSMgrFactory. optional parameter.
* Defaults to NULL.
* @deprecated Unused. To be removed after Cantera 2.3.
*/
VPSSMgr* newVPSSMgr(VPSSMgr_enumType type,
VPStandardStateTP* vp_ptr, VPSSMgrFactory* f=0);

2
src/thermo/VPSSMgr_ConstVol.cpp
View file

@ -146,6 +146,8 @@ PDSS_enumType VPSSMgr_ConstVol::reportPDSSType(int k) const
VPSSMgr_enumType VPSSMgr_ConstVol::reportVPSSMgrType() const
{
warn_deprecated("VPSSMgr_ConstVol::reportVPSSMgrType",
"To be removed after Cantera 2.3.");
return cVPSSMGR_CONSTVOL;
}
}

2
src/thermo/VPSSMgr_General.cpp
View file

@ -206,6 +206,8 @@ PDSS_enumType VPSSMgr_General::reportPDSSType(int k) const
VPSSMgr_enumType VPSSMgr_General::reportVPSSMgrType() const
{
warn_deprecated("VPSSMgr_General::reportVPSSMgrType",
"To be removed after Cantera 2.3.");
return cVPSSMGR_GENERAL;
}
}

2
src/thermo/VPSSMgr_IdealGas.cpp
View file

@ -111,6 +111,8 @@ PDSS_enumType VPSSMgr_IdealGas::reportPDSSType(int k) const
VPSSMgr_enumType VPSSMgr_IdealGas::reportVPSSMgrType() const
{
warn_deprecated("VPSSMgr_IdealGas::reportVPSSMgrType",
"To be removed after Cantera 2.3.");
return cVPSSMGR_IDEALGAS;
}

2
src/thermo/VPSSMgr_Water_ConstVol.cpp
View file

@ -273,6 +273,8 @@ PDSS_enumType VPSSMgr_Water_ConstVol::reportPDSSType(int k) const
VPSSMgr_enumType VPSSMgr_Water_ConstVol::reportVPSSMgrType() const
{
warn_deprecated("VPSSMgr_Water_ConstVol::reportVPSSMgrType",
"To be removed after Cantera 2.3.");
return cVPSSMGR_WATER_CONSTVOL;
}
}

2
src/thermo/VPSSMgr_Water_HKFT.cpp
View file

@ -274,6 +274,8 @@ PDSS_enumType VPSSMgr_Water_HKFT::reportPDSSType(int k) const
VPSSMgr_enumType VPSSMgr_Water_HKFT::reportVPSSMgrType() const
{
warn_deprecated("VPSSMgr_Water_HKFT::reportVPSSMgrType",
"To be removed after Cantera 2.3.");
return cVPSSMGR_WATER_HKFT;
}
}