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

[Thermo] Deprecate ThermoPhase::setSpeciesThermo

Browse source
This commit is contained in:
Ray Speth 2016-11-09 19:01:33 -05:00
parent 67ac725731
commit d34b94230f
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1442,7 +1442,8 @@ public:
* @param spthermo input pointer to the species thermodynamic property
* manager.
*
* @internal
* @internal
* @deprecated Unused. To be removed after Cantera 2.3.
*/
void setSpeciesThermo(MultiSpeciesThermo* spthermo);

1
src/thermo/ThermoFactory.cpp
View file

@ -366,7 +366,6 @@ void importPhase(XML_Node& phase, ThermoPhase* th)
if (ssConvention == cSS_CONVENTION_VPSS) {
VPSSMgr* vp_spth = newVPSSMgr(vpss_ptr, &phase, spDataNodeList);
vpss_ptr->setVPSSMgr(vp_spth);
th->setSpeciesThermo(vp_spth->SpeciesThermoMgr());
}
size_t nsp = spDataNodeList.size();

2
src/thermo/ThermoPhase.cpp
View file

@ -635,6 +635,8 @@ void ThermoPhase::setState_SPorSV(double Starget, double p,
void ThermoPhase::setSpeciesThermo(MultiSpeciesThermo* spthermo)
{
warn_deprecated("ThermoPhase::setSpeciesThermo",
"Unused. To be removed after Cantera 2.3.");
if (m_spthermo && m_spthermo != spthermo) {
delete m_spthermo;
}

3
src/thermo/VPSSMgrFactory.cpp
View file

@ -254,8 +254,7 @@ VPSSMgr* VPSSMgrFactory::newVPSSMgr(VPStandardStateTP* vp_ptr,
}
// first get the reference state handler.
MultiSpeciesThermo* spth = new MultiSpeciesThermo();
vp_ptr->setSpeciesThermo(spth);
MultiSpeciesThermo* spth = &vp_ptr->speciesThermo();
// Next, if we have specific directions, use them to get the VPSSSMgr object
// and return immediately