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

[Thermo] Deprecate SpeciesThermo::install

Browse source 
The install_STIT method should be used instead.
This commit is contained in:
Ray Speth 2015-02-27 18:01:19 -05:00
parent a1599ac921
commit 35dbe37bf7
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,8 +73,8 @@ public:
* @param refPressure standard-state pressure for this parameterization.
* @see speciesThermoTypes.h
*
* @todo Create a factory method for SpeciesThermoInterpType.
* That's basically what we are doing here.
* @deprecated Use newSpeciesThermoInterpType and
* GeneralSpeciesThermo::install_STIT. To be removed after Cantera 2.2.
*/
virtual void install(const std::string& name, size_t index, int type,
const doublereal* c,

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

@ -189,6 +189,8 @@ public:
* is valid.
* @param refPressure standard-state pressure for this
* parameterization.
* @deprecated Use newSpeciesThermoInterpType and
* GeneralSpeciesThermo::install_STIT. To be removed after Cantera 2.2.
*/
virtual void install(const std::string& name, size_t index, int type,
const doublereal* c,

7
src/thermo/FixedChemPotSSTP.cpp
View file

@ -14,8 +14,9 @@
#include "cantera/thermo/mix_defs.h"
#include "cantera/thermo/FixedChemPotSSTP.h"
#include "cantera/thermo/ThermoFactory.h"
#include "cantera/thermo/SimpleThermo.h"
#include "cantera/thermo/SpeciesThermoFactory.h"
#include "cantera/base/ctml.h"
#include "cantera/base/stringUtils.h"
namespace Cantera
{
@ -91,7 +92,9 @@ FixedChemPotSSTP::FixedChemPotSSTP(const std::string& Ename, doublereal val) :
c[1] = val;
c[2] = 0.0;
c[3] = 0.0;
m_spthermo->install(pname, 0, SIMPLE, c, 0.1, 1.0E30, OneAtm);
SpeciesThermoInterpType* stit =
newSpeciesThermoInterpType("const_cp", 0.1, 1e30, OneAtm, c);
m_spthermo->install_STIT(0, stit);
initThermo();
m_p0 = OneAtm;
m_tlast = 298.15;

3
src/thermo/GeneralSpeciesThermo.cpp
View file

@ -97,6 +97,9 @@ void GeneralSpeciesThermo::install(const std::string& name,
doublereal maxTemp_,
doublereal refPressure_)
{
warn_deprecated("GeneralSpeciesThermo::install",
"Use newSpeciesThermoInterpType and "
"GeneralSpeciesThermo::install_STIT instead");
if (minTemp_ <= 0.0) {
throw CanteraError("GeneralSpeciesThermo::install",
"T_min must be positive");