Fix copy constructor and assignment operator for SpeciesThermo classes
This commit is contained in:
parent
926b78cc7d
commit
4bcbe862a9
6 changed files with 8 additions and 16 deletions
|
|
@ -69,6 +69,7 @@ public:
|
||||||
* @param right Object to be copied
|
* @param right Object to be copied
|
||||||
*/
|
*/
|
||||||
SimpleThermo(const SimpleThermo& right) :
|
SimpleThermo(const SimpleThermo& right) :
|
||||||
|
SpeciesThermo(right),
|
||||||
ID(SIMPLE),
|
ID(SIMPLE),
|
||||||
m_tlow_max(0.0),
|
m_tlow_max(0.0),
|
||||||
m_thigh_min(1.e30),
|
m_thigh_min(1.e30),
|
||||||
|
|
@ -92,6 +93,7 @@ public:
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SpeciesThermo::operator=(right);
|
||||||
m_loc = right.m_loc;
|
m_loc = right.m_loc;
|
||||||
m_index = right.m_index;
|
m_index = right.m_index;
|
||||||
m_tlow_max = right.m_tlow_max;
|
m_tlow_max = right.m_tlow_max;
|
||||||
|
|
|
||||||
|
|
@ -161,22 +161,6 @@ public:
|
||||||
//! Destructor
|
//! Destructor
|
||||||
virtual ~SpeciesThermo() {}
|
virtual ~SpeciesThermo() {}
|
||||||
|
|
||||||
//! Copy Constructor for the %SpeciesThermo object.
|
|
||||||
/*!
|
|
||||||
* @param right Reference to %SpeciesThermo object to be copied into the
|
|
||||||
* current one.
|
|
||||||
*/
|
|
||||||
SpeciesThermo(const SpeciesThermo& right) {}
|
|
||||||
|
|
||||||
//! Assignment operator for the %SpeciesThermo object
|
|
||||||
/*!
|
|
||||||
* @param right Reference to %SpeciesThermo object to be copied into the
|
|
||||||
* current one.
|
|
||||||
*/
|
|
||||||
SpeciesThermo& operator=(const SpeciesThermo& right) {
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Duplication routine for objects derived from SpeciesThermo
|
//! Duplication routine for objects derived from SpeciesThermo
|
||||||
/*!
|
/*!
|
||||||
* This function can be used to duplicate objects derived from
|
* This function can be used to duplicate objects derived from
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,7 @@ SpeciesThermoDuo<T1, T2>::operator=(const SpeciesThermoDuo& right)
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SpeciesThermo::operator=(right);
|
||||||
m_thermo1 = right.m_thermo1;
|
m_thermo1 = right.m_thermo1;
|
||||||
m_thermo2 = right.m_thermo2;
|
m_thermo2 = right.m_thermo2;
|
||||||
m_p0 = right.m_p0;
|
m_p0 = right.m_p0;
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ GeneralSpeciesThermo::GeneralSpeciesThermo() :
|
||||||
}
|
}
|
||||||
|
|
||||||
GeneralSpeciesThermo::GeneralSpeciesThermo(const GeneralSpeciesThermo& b) :
|
GeneralSpeciesThermo::GeneralSpeciesThermo(const GeneralSpeciesThermo& b) :
|
||||||
|
SpeciesThermo(b),
|
||||||
m_tpoly(b.m_tpoly),
|
m_tpoly(b.m_tpoly),
|
||||||
m_tlow_max(b.m_tlow_max),
|
m_tlow_max(b.m_tlow_max),
|
||||||
m_thigh_min(b.m_thigh_min),
|
m_thigh_min(b.m_thigh_min),
|
||||||
|
|
@ -43,6 +44,8 @@ GeneralSpeciesThermo::operator=(const GeneralSpeciesThermo& b)
|
||||||
if (&b == this) {
|
if (&b == this) {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SpeciesThermo::operator=(b);
|
||||||
clear();
|
clear();
|
||||||
// Copy SpeciesThermoInterpType objects from 'b'
|
// Copy SpeciesThermoInterpType objects from 'b'
|
||||||
for (STIT_map::const_iterator iter = b.m_sp.begin();
|
for (STIT_map::const_iterator iter = b.m_sp.begin();
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ NasaThermo& NasaThermo::operator=(const NasaThermo& right)
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SpeciesThermo::operator=(right);
|
||||||
m_high = right.m_high;
|
m_high = right.m_high;
|
||||||
m_low = right.m_low;
|
m_low = right.m_low;
|
||||||
m_index = right.m_index;
|
m_index = right.m_index;
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@ public:
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SpeciesThermo::operator=(right);
|
||||||
m_high = right.m_high;
|
m_high = right.m_high;
|
||||||
m_low = right.m_low;
|
m_low = right.m_low;
|
||||||
m_index = right.m_index;
|
m_index = right.m_index;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue