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

changes in comments.

Browse source
This commit is contained in:
Harry Moffat 2009-12-06 18:01:43 +00:00
parent fe6f8a29d0
commit 1756f4a65e
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Cantera/src/thermo/VPSSMgr.cpp
View file

@ -74,12 +74,30 @@ namespace Cantera {
*this = right;
}
//====================================================================================================================
/*
* Assigment operator
* We use a shallow copy strategy here. Note, this will have to be fixed up later.
*/
VPSSMgr&
VPSSMgr::operator=(const VPSSMgr &right) {
if (&right == this) {
return *this;
}
m_kk = right.m_kk;
/*
* What we are doing here is to make a shallow copy of the VPStandardStateTP
* pointer in the "new" VPSSMgr object using the value from the "old"
* VPSSMgr object. This is not appropriate if we are making a copy of a ThermoPhase
* object and the VPSSMgr objects are owned by the ThermoPhase object.
*
* The new object will want to have a different value of m_vptp_ptr than the
* value this is being copied here. It will want to refer to the copy of the
* VPStandardStateTP object being made that will own the new VPSSMgr object.
* However, the assignment object is not the place to carry out this fixup.
*
* We will have to "fix" up the shallow copies later.
*/
m_vptp_ptr = right.m_vptp_ptr;
m_spthermo = right.m_spthermo;
m_tlast = -1.0;
@ -113,13 +131,12 @@ namespace Cantera {
return *this;
}
//====================================================================================================================
VPSSMgr *VPSSMgr::duplMyselfAsVPSSMgr() const {
VPSSMgr *vp = new VPSSMgr(*this);
return vp;
}
//====================================================================================================================
void VPSSMgr::initAllPtrs(VPStandardStateTP *vp_ptr,
SpeciesThermo *sp_ptr) {
m_vptp_ptr = vp_ptr;
@ -141,8 +158,7 @@ namespace Cantera {
}
}
/*****************************************************************/
//====================================================================================================================
// Standard States
void

4
Cantera/src/thermo/VPSSMgr.h
View file

@ -772,11 +772,11 @@ namespace Cantera {
const XML_Node * const phaseNode_ptr);
//! Initialize the internal pointers in this object
//! Initialize the internal shallow pointers in this object
/*!
* There are a bunch of internal shallow pointers that point to the owning
* VPStandardStateTP and SpeciesThermo objects. This function reinitializes
* them.
* them. This function is called like an onion.
*
* @param vp_ptr Pointer to the VPStandardStateTP standard state
* @param sp_ptr Poitner to the SpeciesThermo standard state