From f7ed3c17f88980d171a11829c92dcf17f5f41cce Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 24 Jun 2013 15:22:00 +0000 Subject: [PATCH] Deprecate SpeciesThermo::reportParams --- include/cantera/thermo/GeneralSpeciesThermo.h | 2 ++ include/cantera/thermo/PDSS.h | 1 + include/cantera/thermo/PDSS_HKFT.h | 1 + include/cantera/thermo/SimpleThermo.h | 1 + include/cantera/thermo/SpeciesThermo.h | 1 + include/cantera/thermo/SpeciesThermoMgr.h | 1 + src/thermo/GeneralSpeciesThermo.cpp | 1 + src/thermo/NasaThermo.cpp | 1 + src/thermo/NasaThermo.h | 1 + src/thermo/PDSS_HKFT.cpp | 1 + src/thermo/ShomateThermo.h | 2 ++ 11 files changed, 13 insertions(+) diff --git a/include/cantera/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h index 885bdafe7..2cb714bb8 100644 --- a/include/cantera/thermo/GeneralSpeciesThermo.h +++ b/include/cantera/thermo/GeneralSpeciesThermo.h @@ -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, diff --git a/include/cantera/thermo/PDSS.h b/include/cantera/thermo/PDSS.h index 51ce6ebb7..4e8c402a5 100644 --- a/include/cantera/thermo/PDSS.h +++ b/include/cantera/thermo/PDSS.h @@ -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, diff --git a/include/cantera/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h index df1fcfa78..b9a1c2d07 100644 --- a/include/cantera/thermo/PDSS_HKFT.h +++ b/include/cantera/thermo/PDSS_HKFT.h @@ -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, diff --git a/include/cantera/thermo/SimpleThermo.h b/include/cantera/thermo/SimpleThermo.h index 21431a0d2..56328a6ab 100644 --- a/include/cantera/thermo/SimpleThermo.h +++ b/include/cantera/thermo/SimpleThermo.h @@ -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, diff --git a/include/cantera/thermo/SpeciesThermo.h b/include/cantera/thermo/SpeciesThermo.h index 10f8f7fb7..faa21566f 100644 --- a/include/cantera/thermo/SpeciesThermo.h +++ b/include/cantera/thermo/SpeciesThermo.h @@ -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, diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index e9aa42580..3733de537 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -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, diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index 632b4d8fb..5b402c128 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -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) { diff --git a/src/thermo/NasaThermo.cpp b/src/thermo/NasaThermo.cpp index 0b22c0e59..3ef7e1aa7 100644 --- a/src/thermo/NasaThermo.cpp +++ b/src/thermo/NasaThermo.cpp @@ -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]; diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index 037eb52b1..949798c3d 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -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, diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index a9b0c3449..5a1826be3 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -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_); diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index 53c284a33..9f39da564 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -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];