Switch PureFluidPhase to use double instead of doublereal

Cantera · Jan 25, 2016 · 31316b7 · 31316b7
1 parent 9970b4b
commit 31316b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/include/cantera/thermo/PureFluidPhase.h b/include/cantera/thermo/PureFluidPhase.h
@@ -27,7 +27,7 @@ namespace Cantera
  *
  * @ingroup thermoprops
  */
-class PureFluidPhase  : public ThermoPhase
+class PureFluidPhase : public ThermoPhase
 {
 public:
     //! Empty Base Constructor
@@ -122,17 +122,10 @@ class PureFluidPhase  : public ThermoPhase
      * @{
      */
 
-    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

diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp
@@ -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());