diff --git a/Cantera/src/thermo/ThermoFactory.h b/Cantera/src/thermo/ThermoFactory.h index 272cb1261..f107d897c 100644 --- a/Cantera/src/thermo/ThermoFactory.h +++ b/Cantera/src/thermo/ThermoFactory.h @@ -278,7 +278,7 @@ namespace Cantera { * exist in 'p'. If rule != 0, quietly skip * this species if some elements are undeclared; * otherwise, throw an exception - * @param factor Pointer to the SpeciesThermoFactory . + * @param factory Pointer to the SpeciesThermoFactory . * * @return * Returns true if everything is ok, false otherwise. diff --git a/Cantera/src/thermo/WaterPropsIAPWS.cpp b/Cantera/src/thermo/WaterPropsIAPWS.cpp index 85ce72f84..b1d6e5aa8 100644 --- a/Cantera/src/thermo/WaterPropsIAPWS.cpp +++ b/Cantera/src/thermo/WaterPropsIAPWS.cpp @@ -18,12 +18,17 @@ #include #include /* - * Critical Point values in mks units + * Critical Point values of water in mks units */ - const double T_c = 647.096; // Kelvin -static const double P_c = 22.064E6; // Pascals - const double Rho_c = 322.; // kg m-3 -static const double M_water = 18.015268; // kg kmol-1 +//! Critical Temperature value (kelvin) +const double T_c = 647.096; +//! Critical Pressure (Pascals) +static const double P_c = 22.064E6; +//! Value of the Density at the critical point (kg m-3) +const double Rho_c = 322.; +//! Molecular Weight of water that is consistent with the paper (kg kmol-1) +static const double M_water = 18.015268; + /* * Note, this is the Rgas value quoted in the paper. For consistency * we have to use that value and not the updated value diff --git a/Cantera/src/thermo/WaterPropsIAPWS.h b/Cantera/src/thermo/WaterPropsIAPWS.h index 81a590c34..4eef0d3eb 100644 --- a/Cantera/src/thermo/WaterPropsIAPWS.h +++ b/Cantera/src/thermo/WaterPropsIAPWS.h @@ -136,10 +136,16 @@ public: WaterPropsIAPWS(); //! Copy constructor - WaterPropsIAPWS(const WaterPropsIAPWS &b); + /*! + * @param right Object to be copied + */ + WaterPropsIAPWS(const WaterPropsIAPWS &right); //! assignment constructor - WaterPropsIAPWS & operator=(const WaterPropsIAPWS &b); + /*! + * @param right Object to be copied + */ + WaterPropsIAPWS & operator=(const WaterPropsIAPWS &right); //! destructor ~WaterPropsIAPWS();