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

Added constructor info to prevent segfaults

Browse source 
However, need to flesh the whole class out to be useful in Electrode objects.
This commit is contained in:
Harry Moffat 2014-03-06 17:03:23 +00:00
parent a58fc91f01
commit 7078ac4d18
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/thermo/MaskellSolidSolnPhase.cpp
View file

@ -19,25 +19,34 @@
namespace Cantera
{
//=====================================================================================================
MaskellSolidSolnPhase::MaskellSolidSolnPhase() :
ThermoPhase(),
m_Pref(OneAtm),
m_Pcurrent(OneAtm),
m_tlast(-1),
m_tlast(-1.0),
m_h0_RT(2),
m_cp0_R(2),
m_g0_RT(2),
m_s0_R(2),
h_mixing(0.)
h_mixing(0.0)
{
}
MaskellSolidSolnPhase::MaskellSolidSolnPhase(const MaskellSolidSolnPhase& b)
//=====================================================================================================
MaskellSolidSolnPhase::MaskellSolidSolnPhase(const MaskellSolidSolnPhase& b) :
ThermoPhase(),
m_Pref(OneAtm),
m_Pcurrent(OneAtm),
m_tlast(-1.0),
m_h0_RT(2),
m_cp0_R(2),
m_g0_RT(2),
m_s0_R(2),
h_mixing(0.0)
{
*this = b;
}
//=====================================================================================================
MaskellSolidSolnPhase& MaskellSolidSolnPhase::
operator=(const MaskellSolidSolnPhase& b)
{
@ -46,16 +55,16 @@ operator=(const MaskellSolidSolnPhase& b)
}
return *this;
}
//=====================================================================================================
ThermoPhase* MaskellSolidSolnPhase::duplMyselfAsThermoPhase() const
{
return new MaskellSolidSolnPhase(*this);
}
//=====================================================================================================
/********************************************************************
* Molar Thermodynamic Properties of the Solution
********************************************************************/
//=====================================================================================================
doublereal MaskellSolidSolnPhase::
enthalpy_mole() const
{
@ -65,7 +74,7 @@ enthalpy_mole() const
const doublereal fmval = fm(r);
return h0 + r * fmval * h_mixing;
}
//=====================================================================================================
doublereal xlogx(doublereal x)
{
return x * std::log(x);
@ -119,6 +128,8 @@ void MaskellSolidSolnPhase::setMolarDensity(const doublereal n)
void MaskellSolidSolnPhase::
getActivityCoefficients(doublereal* ac) const
{
// throw CanteraError("MaskellSolidSolnPhase::getActivityCoefficients()",
// "needs to be implemented");
}
void MaskellSolidSolnPhase::