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

Deprecate report/modifyParameters methods of SpeciesThermoInterpType

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

3
include/cantera/thermo/AdsorbateThermo.h
View file

@ -12,6 +12,7 @@
#define CT_ADSORBATE_H
#include "SpeciesThermoInterpType.h"
#include "cantera/base/global.h"
namespace Cantera
{
@ -118,10 +119,12 @@ public:
s_R[m_index] = h_RT[m_index] - _free_energy_RT(temp);
}
//! @deprecated
void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
warn_deprecated("AdsorbateThermo::reportParameters");
n = m_index;
type = ADSORBATE;
tlow = m_lowT;

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

@ -148,6 +148,7 @@ public:
doublereal* cp_R,
doublereal* h_RT,
doublereal* s_R) const ;
//! @deprecated
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,

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

@ -173,6 +173,7 @@ public:
* coeffs[1] is min temperature
* coeffs[2] is max temperature
* coeffs[3+i] from i =0,9 are the coefficients themselves
* @deprecated
*/
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
@ -183,6 +184,7 @@ public:
/*!
* @param coeffs Vector of coefficients used to set the
* parameters for the standard state.
* @deprecated
*/
virtual void modifyParameters(doublereal* coeffs);

4
include/cantera/thermo/NasaPoly1.h
View file

@ -186,10 +186,12 @@ public:
updateProperties(tPoly, cp_R, h_RT, s_R);
}
//! @deprecated
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
warn_deprecated("NasaPoly1::reportParameters");
n = m_index;
type = NASA1;
tlow = m_lowT;
@ -206,8 +208,10 @@ public:
/*!
* @param coeffs Vector of coefficients used to set the
* parameters for the standard state.
* @deprecated
*/
virtual void modifyParameters(doublereal* coeffs) {
warn_deprecated("NasaPoly1::modifyParameters");
m_coeff[0] = coeffs[5];
m_coeff[1] = coeffs[6];
for (int i = 0; i < 5; i++) {

4
include/cantera/thermo/SpeciesThermoInterpType.h
View file

@ -235,6 +235,7 @@ public:
* @param refPressure output - reference pressure (Pa).
* @param coeffs Vector of coefficients used to set the
* parameters for the standard state.
* @deprecated
*/
virtual void reportParameters(size_t& index, int& type,
doublereal& minTemp, doublereal& maxTemp,
@ -245,6 +246,7 @@ public:
/*!
* @param coeffs Vector of coefficients used to set the
* parameters for the standard state.
* @deprecated
*/
virtual void modifyParameters(doublereal* coeffs) {}
@ -356,11 +358,13 @@ public:
doublereal* h_RT,
doublereal* s_R) const;
//! @deprecated
virtual void reportParameters(size_t& index, int& type,
doublereal& minTemp, doublereal& maxTemp,
doublereal& refPressure,
doublereal* const coeffs) const;
//! @deprecated
virtual void modifyParameters(doublereal* coeffs);
private:

1
src/thermo/Mu0Poly.cpp
View file

@ -128,6 +128,7 @@ void Mu0Poly::reportParameters(size_t& n, int& type,
doublereal& pref,
doublereal* const coeffs) const
{
warn_deprecated("Mu0Poly::reportParameters");
n = m_index;
type = MU0_INTERP;
tlow = m_lowT;

2
src/thermo/Nasa9Poly1.cpp
View file

@ -137,6 +137,7 @@ void Nasa9Poly1::reportParameters(size_t& n, int& type,
doublereal& pref,
doublereal* const coeffs) const
{
warn_deprecated("Nasa9Poly1::reportParameters");
n = m_index;
type = NASA9;
tlow = m_lowT;
@ -152,6 +153,7 @@ void Nasa9Poly1::reportParameters(size_t& n, int& type,
void Nasa9Poly1::modifyParameters(doublereal* coeffs)
{
warn_deprecated("Nasa9Poly1::modifyParameters");
for (int i = 0; i < 9; i++) {
m_coeff[i] = coeffs[i];
}

2
src/thermo/Nasa9PolyMultiTempRegion.cpp
View file

@ -204,6 +204,7 @@ void Nasa9PolyMultiTempRegion::reportParameters(size_t& n, int& type,
doublereal& pref,
doublereal* const coeffs) const
{
warn_deprecated("Nasa9PolyMultiTempRegion::reportParameters");
n = m_index;
type = NASA9MULTITEMP;
tlow = m_lowT;
@ -229,6 +230,7 @@ void Nasa9PolyMultiTempRegion::reportParameters(size_t& n, int& type,
void Nasa9PolyMultiTempRegion::modifyParameters(doublereal* coeffs)
{
warn_deprecated("Nasa9PolyMultiTempRegion::modifyParameters");
int index = 3;
for (size_t iReg = 0; iReg < m_numTempRegions; iReg++) {
m_regionPts[iReg]->modifyParameters(coeffs + index);

2
src/thermo/Nasa9PolyMultiTempRegion.h
View file

@ -179,6 +179,7 @@ public:
* coeffs[index] = minTempZone
* coeffs[index+1] = maxTempZone
* coeffs[index+2+i] from i =0,9 are the coefficients themselves
* @deprecated
*/
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
@ -189,6 +190,7 @@ public:
/*!
* @param coeffs Vector of coefficients used to set the
* parameters for the standard state.
* @deprecated
*/
virtual void modifyParameters(doublereal* coeffs);

2
src/thermo/NasaPoly2.h
View file

@ -180,10 +180,12 @@ public:
}
}
//! @deprecated
void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
warn_deprecated("NasaPoly2::reportParameters");
n = m_index;
type = NASA2;
tlow = m_lowT;

7
src/thermo/ShomatePoly.h
View file

@ -13,6 +13,7 @@
#define CT_SHOMATEPOLY1_H
#include "cantera/thermo/SpeciesThermoInterpType.h"
#include "cantera/base/global.h"
namespace Cantera
{
@ -216,10 +217,12 @@ public:
updateProperties(tPoly, cp_R, h_RT, s_R);
}
//! @deprecated
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
warn_deprecated("ShomatePoly::reportParameters");
n = m_index;
type = SHOMATE;
tlow = m_lowT;
@ -236,6 +239,7 @@ public:
* parameters for the standard state.
*/
virtual void modifyParameters(doublereal* coeffs) {
warn_deprecated("ShomatePoly::modifyParameters");
if (m_coeff.size() != 7) {
throw CanteraError("modifyParameters",
"modifying something that hasn't been initialized");
@ -495,10 +499,12 @@ public:
}
}
//! @deprecated
virtual void reportParameters(size_t& n, int& type,
doublereal& tlow, doublereal& thigh,
doublereal& pref,
doublereal* const coeffs) const {
warn_deprecated("ShomatePoly2::reportParameters");
n = m_index;
type = SHOMATE2;
tlow = m_lowT;
@ -517,6 +523,7 @@ public:
* parameters for the standard state.
*/
virtual void modifyParameters(doublereal* coeffs) {
warn_deprecated("ShomatePoly2::modifyParameters");
delete msp_low;
delete msp_high;
std::copy(coeffs, coeffs + 15, m_coeff.begin());

3
src/thermo/SpeciesThermoInterpType.cpp
View file

@ -8,6 +8,7 @@
#include "cantera/thermo/VPSSMgr.h"
#include "cantera/thermo/PDSS.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/global.h"
namespace Cantera
{
@ -128,6 +129,7 @@ void STITbyPDSS::reportParameters(size_t& index, int& type,
doublereal& refPressure,
doublereal* const coeffs) const
{
warn_deprecated("STITbyPDSS::reportParameters");
index = m_speciesIndex;
type = PDSS_TYPE;
minTemp = m_vpssmgr_ptr->minTemp(m_speciesIndex);
@ -137,6 +139,7 @@ void STITbyPDSS::reportParameters(size_t& index, int& type,
void STITbyPDSS::modifyParameters(doublereal* coeffs)
{
warn_deprecated("STITbyPDSS::modifyParameters");
}
}

1
src/thermo/StatMech.cpp
View file

@ -641,6 +641,7 @@ void StatMech::reportParameters(size_t& n, int& type,
doublereal& pref,
doublereal* const coeffs) const
{
warn_deprecated("StatMech::reportParameters");
species* s;
n = m_index;