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

Fixed error in the assignment operator.

Browse source
This commit is contained in:
Harry Moffat 2009-12-06 18:00:18 +00:00
parent 646d31f8be
commit fe6f8a29d0
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
View file

@ -155,6 +155,26 @@ namespace Cantera {
if (&b == this) { if (&b == this) {
return *this; return *this;
} }
/*
* If we own the underlying neutral molecule phase, then we do a deep
* copy. If not, we do a shallow copy. We get a valid pointer for
* neutralMoleculePhase_ first, because we need it to assign the pointers
* within the PDSS_IonsFromNeutral object. which is done in the
* GibbsExcessVPSSTP::operator=(b) step.
*/
if (IOwnNThermoPhase_) {
if (b.neutralMoleculePhase_) {
if (neutralMoleculePhase_) {
delete neutralMoleculePhase_;
}
neutralMoleculePhase_ = (b.neutralMoleculePhase_)->duplMyselfAsThermoPhase();
} else {
neutralMoleculePhase_ = 0;
}
} else {
neutralMoleculePhase_ = b.neutralMoleculePhase_;
}
GibbsExcessVPSSTP::operator=(b); GibbsExcessVPSSTP::operator=(b);
@ -172,23 +192,6 @@ namespace Cantera {
passThroughList_ = b.passThroughList_; passThroughList_ = b.passThroughList_;
numPassThroughSpecies_ = b.numPassThroughSpecies_; numPassThroughSpecies_ = b.numPassThroughSpecies_;
/*
* If we own the underlying neutral molecule phase, then we do a deep
* copy. If not, we do a shallow copy.
*/
if (IOwnNThermoPhase_) {
if (b.neutralMoleculePhase_) {
if (neutralMoleculePhase_) {
delete neutralMoleculePhase_;
}
neutralMoleculePhase_ = (b.neutralMoleculePhase_)->duplMyselfAsThermoPhase();
} else {
neutralMoleculePhase_ = 0;
}
} else {
neutralMoleculePhase_ = b.neutralMoleculePhase_;
}
IOwnNThermoPhase_ = b.IOwnNThermoPhase_; IOwnNThermoPhase_ = b.IOwnNThermoPhase_;
moleFractionsTmp_ = b.moleFractionsTmp_; moleFractionsTmp_ = b.moleFractionsTmp_;
muNeutralMolecule_ = b.muNeutralMolecule_; muNeutralMolecule_ = b.muNeutralMolecule_;
@ -824,21 +827,21 @@ namespace Cantera {
neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_)); neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_));
} }
void IonsFromNeutralVPSSTP::setMoleFractions(const doublereal* const y) { void IonsFromNeutralVPSSTP::setMoleFractions(const doublereal* const x) {
GibbsExcessVPSSTP::setMoleFractions(y); GibbsExcessVPSSTP::setMoleFractions(x);
calcNeutralMoleculeMoleFractions(); calcNeutralMoleculeMoleFractions();
neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_)); neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_));
} }
void IonsFromNeutralVPSSTP::setMoleFractions_NoNorm(const doublereal* const y) { void IonsFromNeutralVPSSTP::setMoleFractions_NoNorm(const doublereal* const x) {
GibbsExcessVPSSTP::setMoleFractions_NoNorm(y); GibbsExcessVPSSTP::setMoleFractions_NoNorm(x);
calcNeutralMoleculeMoleFractions(); calcNeutralMoleculeMoleFractions();
neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_)); neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_));
} }
void IonsFromNeutralVPSSTP::setConcentrations(const doublereal* const y) { void IonsFromNeutralVPSSTP::setConcentrations(const doublereal* const c) {
GibbsExcessVPSSTP::setConcentrations(y); GibbsExcessVPSSTP::setConcentrations(c);
calcNeutralMoleculeMoleFractions(); calcNeutralMoleculeMoleFractions();
neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_)); neutralMoleculePhase_->setMoleFractions(DATA_PTR(NeutralMolecMoleFractions_));
} }