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

Fixed incorrectly defined duplication method of ConstDensityThermo

Browse source
This commit is contained in:
Ray Speth 2012-10-24 15:46:22 +00:00
parent c9ba50ecc6
commit 5e34beb4a8
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/cantera/thermo/ConstDensityThermo.h
View file

@ -68,17 +68,13 @@ public:
*/
ConstDensityThermo& operator=(const ConstDensityThermo& right);
//! Duplication routine for objects which inherit from
//! %SpeciesThermo
//! Duplication routine for objects which inherit from %ThermoPhase
/*!
* This virtual routine can be used to duplicate %SpeciesThermo objects
* inherited from %SpeciesThermo even if the application only has
* a pointer to %SpeciesThermo to work with.
* ->commented out because we first need to add copy constructors
* and assignment operators to all of the derived classes.
* This virtual routine can be used to duplicate %ThermoPhase objects
* inherited from %ThermoPhase even if the application only has
* a pointer to %ThermoPhase to work with.
*/
virtual SpeciesThermo* duplMyselfAsSpeciesThermo() const;
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! overloaded methods of class ThermoPhase
virtual int eosType() const;

6
src/thermo/ConstDensityThermo.cpp
View file

@ -50,11 +50,11 @@ ConstDensityThermo& ConstDensityThermo::operator=(const ConstDensityThermo& righ
}
SpeciesThermo* ConstDensityThermo::duplMyselfAsSpeciesThermo() const
ThermoPhase* ConstDensityThermo::duplMyselfAsThermoPhase() const
{
ConstDensityThermo* cdt = new ConstDensityThermo(*this);
return (SpeciesThermo*) cdt;
return new ConstDensityThermo(*this);
}
int ConstDensityThermo::
eosType() const
{