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

Switch PureFluidPhase to use double instead of doublereal

Browse source
This commit is contained in:
Bryan W. Weber 2016-01-22 16:41:02 -05:00
parent 9970b4bcc5
commit 31316b7079
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/cantera/thermo/PureFluidPhase.h
View file

@ -27,7 +27,7 @@ namespace Cantera
*
* @ingroup thermoprops
*/
class PureFluidPhase : public ThermoPhase
class PureFluidPhase : public ThermoPhase
{
public:
//! Empty Base Constructor
@ -122,17 +122,10 @@ public:
* @{
*/
virtual void setState_HP(doublereal h, doublereal p,
doublereal tol = 1.e-8);
virtual void setState_UV(doublereal u, doublereal v,
doublereal tol = 1.e-8);
virtual void setState_SV(doublereal s, doublereal v,
doublereal tol = 1.e-8);
virtual void setState_SP(doublereal s, doublereal p,
doublereal tol = 1.e-8);
virtual void setState_HP(double h, double p, double tol = 1.e-8);
virtual void setState_UV(double u, double v, double tol = 1.e-8);
virtual void setState_SV(double s, double v, double tol = 1.e-8);
virtual void setState_SP(double s, double p, double tol = 1.e-8);
//@}
//! @name Critical State Properties

12
src/thermo/PureFluidPhase.cpp
View file

@ -284,29 +284,25 @@ doublereal PureFluidPhase::satTemperature(doublereal p) const
return m_sub->Tsat(p);
}
void PureFluidPhase::setState_HP(doublereal h, doublereal p,
doublereal tol)
void PureFluidPhase::setState_HP(double h, double p, double tol)
{
Set(tpx::PropertyPair::HP, h, p);
setState_TR(m_sub->Temp(), 1.0/m_sub->v());
}
void PureFluidPhase::setState_UV(doublereal u, doublereal v,
doublereal tol)
void PureFluidPhase::setState_UV(double u, double v, double tol)
{
Set(tpx::PropertyPair::UV, u, v);
setState_TR(m_sub->Temp(), 1.0/m_sub->v());
}
void PureFluidPhase::setState_SV(doublereal s, doublereal v,
doublereal tol)
void PureFluidPhase::setState_SV(double s, double v, double tol)
{
Set(tpx::PropertyPair::SV, s, v);
setState_TR(m_sub->Temp(), 1.0/m_sub->v());
}
void PureFluidPhase::setState_SP(doublereal s, doublereal p,
doublereal tol)
void PureFluidPhase::setState_SP(double s, double p, double tol)
{
Set(tpx::PropertyPair::SP, s, p);
setState_TR(m_sub->Temp(), 1.0/m_sub->v());