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

Fixed a umr in the VPSSMgr_Water_HKFT.h module.

Browse source
This commit is contained in:
Harry Moffat 2008-09-08 22:04:27 +00:00
parent 10a5a98d31
commit 7c615c9529
5 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp
View file

@ -62,7 +62,6 @@ namespace Cantera {
{
if (&b == this) return *this;
VPSSMgr::operator=(b);
//if (m_waterSS) delete m_waterSS;
return *this;
}
@ -208,7 +207,6 @@ namespace Cantera {
const vector<string>&sss = m_vptp_ptr->speciesNames();
m_waterSS = dynamic_cast<PDSS_Water *>(m_vptp_ptr->providePDSS(0));
if (!m_waterSS) {
throw CanteraError("VPSSMgr_Water_ConstVol::initThermoXML",
"bad dynamic cast");

3
Cantera/src/thermo/VPSSMgr_Water_ConstVol.h
View file

@ -293,8 +293,7 @@ namespace Cantera {
*/
virtual void initAllPtrs(VPStandardStateTP *vp_ptr, SpeciesThermo *sp_ptr);
protected:
private:
//! Pointer to the Water PDSS object.
/*!

12
Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp
View file

@ -41,7 +41,6 @@ namespace Cantera {
{
m_useTmpRefStateStorage = true;
m_useTmpStandardStateStorage = true;
m_waterSS = new PDSS_Water();
}
@ -51,11 +50,11 @@ namespace Cantera {
}
VPSSMgr_Water_HKFT::VPSSMgr_Water_HKFT(const VPSSMgr_Water_HKFT &right) :
VPSSMgr(right.m_vptp_ptr, right.m_spthermo)
VPSSMgr(right.m_vptp_ptr, right.m_spthermo),
m_waterSS(0)
{
m_useTmpRefStateStorage = true;
m_useTmpStandardStateStorage = true;
m_waterSS = new PDSS_Water();
*this = right;
}
@ -65,8 +64,7 @@ namespace Cantera {
{
if (&b == this) return *this;
VPSSMgr::operator=(b);
if (m_waterSS) delete m_waterSS;
m_waterSS = new PDSS_Water(*(b.m_waterSS));
m_waterSS = (PDSS_Water *) m_vptp_ptr->providePDSS(0);
return *this;
}
@ -76,7 +74,6 @@ namespace Cantera {
return (VPSSMgr *) vpm;
}
void
VPSSMgr_Water_HKFT::getEnthalpy_RT_ref(doublereal *hrt) const{
// Everything should be OK except for the water SS
@ -211,8 +208,6 @@ namespace Cantera {
&phaseNode.root());
const vector<string>&sss = m_vptp_ptr->speciesNames();
if (m_waterSS) delete m_waterSS;
m_waterSS = new PDSS_Water(m_vptp_ptr, 0);
m_waterSS->setState_TP(300., OneAtm);
m_Vss[0] = (m_waterSS->density()) / m_vptp_ptr->molecularWeight(0);
@ -232,7 +227,6 @@ namespace Cantera {
throw CanteraError("VPSSMgr_Water_HKFT::initThermoXML",
"standardState model for species isn't hkft: " + s->name());
}
// m_Vss[k] = getFloat(*ss, "molarVolume", "-");
}
}

2
Cantera/src/thermo/VPSSMgr_Water_HKFT.h
View file

@ -321,7 +321,7 @@ namespace Cantera {
//@}
protected:
private:
//! Shallow pointer to the water object
PDSS_Water *m_waterSS;

2
Cantera/src/thermo/VPStandardStateTP.cpp
View file

@ -378,7 +378,7 @@ namespace Cantera {
if (m_PDSS_storage[k] != 0) {
delete m_PDSS_storage[k] ;
}
m_PDSS_storage[k] = m_VPSS_ptr->createInstallPDSS(k, s, phaseNode_ptr);
m_PDSS_storage[k] = m_VPSS_ptr->createInstallPDSS(k, s, phaseNode_ptr);
}
PDSS *