[thermo] Make intEnergy_mole consistent

include/cantera/thermo/HMWSoln.h

@@ -821,6 +821,7 @@ class HMWSoln : public MolalityVPSSTP
      */
     virtual double relative_molal_enthalpy() const;
 
+    double intEnergy_mole() const override;
     double cv_mole() const override;
 
     //! @}

include/cantera/thermo/IdealMolalSoln.h

@@ -86,22 +86,6 @@ class IdealMolalSoln : public MolalityVPSSTP
         return true;
     }
 
-    //! @name  Molar Thermodynamic Properties of the Solution
-    //! @{
-
-    //! Molar internal energy of the solution: Units: J/kmol.
-    /*!
-     * Returns the amount of internal energy per mole of solution. For an ideal
-     * molal solution,
-     * @f[
-     * \bar{u}(T, P, X_k) = \sum_k X_k \bar{u}_k(T)
-     * @f]
-     * The formula is written in terms of the partial molar internal energy.
-     * @f$ \bar{u}_k(T, p, m_k) @f$.
-     */
-    double intEnergy_mole() const override;
-
-    //! @}
     //! @name Mechanical Equation of State Properties
     //!
     //! In this equation of state implementation, the density is a function only

include/cantera/thermo/IdealSolidSolnPhase.h

@@ -70,6 +70,8 @@ class IdealSolidSolnPhase : public ThermoPhase
     //! @name Molar Thermodynamic Properties of the Solution
     //! @{
 
+    double intEnergy_mole() const override;
+
     /**
      * Molar entropy of the solution. Units: J/kmol/K. For an ideal, constant
      * partial molar volume solution mixture with pure species phases which

include/cantera/thermo/LatticePhase.h

@@ -222,6 +222,8 @@ class LatticePhase : public ThermoPhase
      */
     double enthalpy_mole() const override;
 
+    double intEnergy_mole() const override;
+
     //! Molar entropy of the solution. Units: J/kmol/K
     /*!
      * For an ideal, constant partial molar volume solution mixture with

include/cantera/thermo/MargulesVPSSTP.h

@@ -230,6 +230,7 @@ class MargulesVPSSTP : public GibbsExcessVPSSTP
     //! @name  Molar Thermodynamic Properties
     //! @{
 
+    double intEnergy_mole() const override;
     double cv_mole() const override;
 
     //! @}

include/cantera/thermo/MixtureFugacityTP.h

@@ -111,6 +111,7 @@ class MixtureFugacityTP : public ThermoPhase
     //! @{
 
     double enthalpy_mole() const override;
+    double intEnergy_mole() const override;
     double entropy_mole() const override;
 
     //! @}

include/cantera/thermo/ThermoPhase.h

@@ -539,8 +539,19 @@ class ThermoPhase : public Phase
     }
 
     //! Molar internal energy. Units: J/kmol.
+    /*!
+     * Returns the amount of internal energy per mole of solution. For an ideal
+     * molal solution,
+     * @f[
+     * \bar{u}(T, P, X_k) = \sum_k X_k \bar{u}_k(T)
+     * @f]
+     * The formula is written in terms of the partial molar internal energy.
+     * @f$ \bar{u}_k(T, p, m_k) @f$.
+     * @relates getPartialMolarIntEnergies
+     */
     virtual double intEnergy_mole() const {
-        return enthalpy_mole() - pressure()* molarVolume();
+        getPartialMolarIntEnergies(m_tmpV.data());
+        return mean_X(m_tmpV);
     }
 
     //! Molar entropy. Units: J/kmol/K.

src/thermo/HMWSoln.cpp

@@ -103,6 +103,11 @@ double HMWSoln::relative_molal_enthalpy() const
     return L / xuse;
 }
 
+double HMWSoln::intEnergy_mole() const
+{
+    return enthalpy_mole() - pressure() * molarVolume();
+}
+
 double HMWSoln::cv_mole() const
 {
     double kappa_t = isothermalCompressibility();

src/thermo/IdealMolalSoln.cpp

@@ -45,12 +45,6 @@ IdealMolalSoln::IdealMolalSoln(const string& inputFile, const string& id_) :
     initThermoFile(inputFile, id_);
 }
 
-double IdealMolalSoln::intEnergy_mole() const
-{
-    getPartialMolarIntEnergies(m_tmpV.data());
-    return mean_X(m_tmpV);
-}
-
 // ------- Mechanical Equation of State Properties ------------------------
 
 double IdealMolalSoln::isothermalCompressibility() const

src/thermo/IdealSolidSolnPhase.cpp

@@ -24,6 +24,11 @@ IdealSolidSolnPhase::IdealSolidSolnPhase(const string& inputFile, const string&
 
 // Molar Thermodynamic Properties of the Solution
 
+double IdealSolidSolnPhase::intEnergy_mole() const
+{
+    return enthalpy_mole() - pressure() * molarVolume();
+}
+
 double IdealSolidSolnPhase::entropy_mole() const
 {
     return GasConstant * (mean_X(entropy_R_ref()) - sum_xlogx());

src/thermo/LatticePhase.cpp

@@ -34,6 +34,11 @@ double LatticePhase::entropy_mole() const
     return GasConstant * (mean_X(entropy_R_ref()) - sum_xlogx());
 }
 
+double LatticePhase::intEnergy_mole() const
+{
+    return enthalpy_mole() - pressure() * molarVolume();
+}
+
 double LatticePhase::gibbs_mole() const {
     return enthalpy_mole() - temperature() * entropy_mole();
 }

src/thermo/MargulesVPSSTP.cpp

@@ -49,6 +49,11 @@ void MargulesVPSSTP::getChemPotentials(double* mu) const
     }
 }
 
+double MargulesVPSSTP::intEnergy_mole() const
+{
+    return enthalpy_mole() - pressure() * molarVolume();
+}
+
 double MargulesVPSSTP::cv_mole() const
 {
     return cp_mole() - GasConstant;

src/thermo/MixtureFugacityTP.cpp

@@ -47,6 +47,12 @@ double MixtureFugacityTP::enthalpy_mole() const
 }
 
 
+double MixtureFugacityTP::intEnergy_mole() const
+{
+    return enthalpy_mole() - pressure() * molarVolume();
+}
+
+
 double MixtureFugacityTP::entropy_mole() const
 {
     double s_ideal = GasConstant * (mean_X(m_s0_R) - sum_xlogx()