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

Deprecate SpeciesThermo::reportParams

Browse source
This commit is contained in:
Ray Speth 2013-06-24 15:22:00 +00:00
parent d060cba434
commit f7ed3c17f8
11 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/thermo/GeneralSpeciesThermo.h
View file

@ -116,6 +116,8 @@ public:
virtual doublereal maxTemp(size_t k=npos) const;
virtual doublereal refPressure(size_t k=npos) const;
virtual int reportType(size_t index) const;
//! @deprecated
virtual void reportParams(size_t index, int& type,
doublereal* const c,
doublereal& minTemp,

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

@ -532,6 +532,7 @@ public:
* @param minTemp output - Minimum temperature
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
* @deprecated
*/
virtual void reportParams(size_t& kindex, int& type, doublereal* const c,
doublereal& minTemp, doublereal& maxTemp,

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

@ -228,6 +228,7 @@ public:
* @param minTemp output - Minimum temperature
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
* @deprecated
*/
virtual void reportParams(size_t& kindex, int& type, doublereal* const c,
doublereal& minTemp, doublereal& maxTemp,

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

@ -244,6 +244,7 @@ public:
* @param minTemp_ output - Minimum temperature
* @param maxTemp_ output - Maximum temperature
* @param refPressure_ output - reference pressure (Pa).
* @deprecated
*/
virtual void reportParams(size_t index, int& type,
doublereal* const c,

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

@ -302,6 +302,7 @@ public:
* @param minTemp output - Minimum temperature
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
* @deprecated
*/
virtual void reportParams(size_t index, int& type,
doublereal* const c,

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

@ -101,6 +101,7 @@ public:
virtual int reportType(size_t k) const;
//! @deprecated
virtual void reportParams(size_t index, int& type,
doublereal* const c,
doublereal& minTemp,

1
src/thermo/GeneralSpeciesThermo.cpp
View file

@ -246,6 +246,7 @@ void GeneralSpeciesThermo::
reportParams(size_t index, int& type, doublereal* const c,
doublereal& minTemp_, doublereal& maxTemp_, doublereal& refPressure_) const
{
warn_deprecated("GeneralSpeciesThermo::reportParams");
SpeciesThermoInterpType* sp = m_sp[index];
size_t n;
if (sp) {

1
src/thermo/NasaThermo.cpp
View file

@ -179,6 +179,7 @@ void NasaThermo::reportParams(size_t index, int& type,
doublereal& maxTemp,
doublereal& refPressure) const
{
warn_deprecated("NasaThermo::reportParams");
type = reportType(index);
if (type == NASA) {
size_t grp = m_group_map[index];

1
src/thermo/NasaThermo.h
View file

@ -138,6 +138,7 @@ public:
* @param minTemp output - Minimum temperature
* @param maxTemp output - Maximum temperature
* @param refPressure output - reference pressure (Pa).
* @deprecated
*/
virtual void reportParams(size_t index, int& type,
doublereal* const c,

1
src/thermo/PDSS_HKFT.cpp
View file

@ -1167,6 +1167,7 @@ void PDSS_HKFT::reportParams(size_t& kindex, int& type,
doublereal& maxTemp_,
doublereal& refPressure_) const
{
warn_deprecated("PDSS_HKFT::reportParams");
// Fill in the first part
PDSS::reportParams(kindex, type, c, minTemp_, maxTemp_,
refPressure_);

2
src/thermo/ShomateThermo.h
View file

@ -289,11 +289,13 @@ public:
return SHOMATE;
}
//! @deprecated
virtual void reportParams(size_t index, int& type,
doublereal* const c,
doublereal& minTemp,
doublereal& maxTemp,
doublereal& refPressure) const {
warn_deprecated("ShomateThermo::reportParams");
type = reportType(index);
if (type == SHOMATE) {
size_t grp = m_group_map[index];