Use override on tpx::Substance classes

Cantera · Aug 15, 2023 · 15ba2d8 · 15ba2d8
1 parent 1492c8f
commit 15ba2d8
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 94 deletions.
diff --git a/src/tpx/CarbonDioxide.h b/src/tpx/CarbonDioxide.h
@@ -21,33 +21,33 @@ class CarbonDioxide : public Substance
         m_formula="CO2";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
     //! Pressure. Equation P-3 in Reynolds. P(rho, T).
-    double Pp();
+    double Pp() override;
 
     /**
      * internal energy. See Reynolds eqn (15) section 2
      *
      *  u = (the integral from T to To of co(T)dT) +
      *         sum from i to N ([C(i) - T*Cprime(i)] + uo
      */
-    double up();
+    double up() override;
 
     //! entropy. See Reynolds eqn (16) section 2
-    double sp();
+    double sp() override;
 
     //! Pressure at Saturation. Equation S-2 in Reynolds.
-    double Psat();
+    double Psat() override;
 
 private:
     //! Liquid density. Equation D2 in Reynolds.
-    double ldens();
+    double ldens() override;
 
     /**
      * C returns a multiplier in each term of the sum in P-3, used in

diff --git a/src/tpx/HFC134a.h b/src/tpx/HFC134a.h
@@ -22,22 +22,23 @@ class HFC134a : public Substance
         m_formula = "C2F4H2";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
-    double Pp();
+    double Pp() override;
     double fp();
-    double up();
-    double sp() {
+    double up() override;
+    double sp() override {
         return ((up() - m_energy_offset) - fp())/T + m_entropy_offset;
     }
-    double Psat();
-private:
-    double ldens();
+    double Psat() override;
+
+protected:
+    double ldens() override;
 };
 }
 #endif // ! HFC134_H
diff --git a/src/tpx/Heptane.h b/src/tpx/Heptane.h
@@ -20,33 +20,33 @@ class Heptane : public Substance
         m_formula = "C7H16";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
     //! Pressure. Equation P-2 in Reynolds.
-    double Pp();
+    double Pp() override;
 
     /**
      * Internal energy.
      * See Reynolds eqn (15) section 2
      *  u = (the integral from T to To of co(T)dT) +
      *         sum from i to N ([C(i) - T*Cprime(i)] + uo
      */
-    double up();
+    double up() override;
 
     //! Entropy. See Reynolds eqn (16) section 2
-    double sp();
+    double sp() override;
 
     //! Pressure at Saturation. Equation S-2 in Reynolds.
-    double Psat();
+    double Psat() override;
 
 private:
     //! liquid density. Equation D2 in Reynolds.
-    double ldens();
+    double ldens() override;
 
     /**
      * C returns a multiplier in each term of the sum

diff --git a/src/tpx/Hydrogen.h b/src/tpx/Hydrogen.h
@@ -21,23 +21,25 @@ class hydrogen : public Substance
         m_formula = "H2";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
-    double Pp();
-    double up();
-    double sp();
+    double Pp() override;
+    double up() override;
+    double sp() override;
 
     //! Saturation pressure. Equation s3 in Reynolds TPSI.
-    double Psat();
+    double Psat() override;
 
-private:
+protected:
     //! Liquid density. Equation D4 in Reynolds TPSI.
-    double ldens();
+    double ldens() override;
+
+private:
     double C(int i, double rt, double rt2);
     double Cprime(int i, double rt, double rt2, double rt3);
     double I(int i, double egrho);

diff --git a/src/tpx/Methane.h b/src/tpx/Methane.h
@@ -21,24 +21,25 @@ class methane : public Substance
         m_formula = "CH4";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
-    double Pp();
-    double up();
-    double sp();
+    double Pp() override;
+    double up() override;
+    double sp() override;
 
     //! Saturation pressure. Equation S3 from Reynolds TPSI.
-    double Psat();
+    double Psat() override;
 
-private:
+protected:
     //! Liquid density. Equation D3 from Reynolds TPSI.
-    double ldens();
+    double ldens() override;
 
+private:
     double C(int i, double rt, double rt2);
     double Cprime(int i, double rt, double rt2, double rt3);
     double I(int i, double egrho);

diff --git a/src/tpx/Nitrogen.h b/src/tpx/Nitrogen.h
@@ -21,24 +21,25 @@ class nitrogen : public Substance
         m_formula = "N2";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
-    double Pp();
-    double up();
-    double sp();
+    double Pp() override;
+    double up() override;
+    double sp() override;
 
     //! Saturation pressure. Equation S4 from Reynolds TPSI.
-    double Psat();
+    double Psat() override;
 
-private:
+protected:
     //! Liquid density. Equation D2 from Reynolds TPSI.
-    double ldens();
+    double ldens() override;
 
+private:
     //! Equation P4 from Reynolds TPSI.
     double C(int i, double rt, double rt2);
     double Cprime(int i, double rt, double rt2, double rt3);

diff --git a/src/tpx/Oxygen.h b/src/tpx/Oxygen.h
@@ -20,24 +20,25 @@ class oxygen : public Substance
         m_formula="O2";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
 
-    double Pp();
-    double up();
-    double sp();
+    double Pp() override;
+    double up() override;
+    double sp() override;
 
     //! Saturation pressure. Equation S4 from Reynolds TPSI.
-    double Psat();
+    double Psat() override;
 
-private:
+protected:
     //! Liquid density. Equation D2 from Reynolds TPSI.
-    double ldens();
+    double ldens() override;
 
+private:
     //! Equation P4 from Reynolds TPSI.
     double C(int i, double rt, double rt2);
     double Cprime(int i, double rt, double rt2, double rt3);

diff --git a/src/tpx/Water.h b/src/tpx/Water.h
@@ -20,21 +20,23 @@ class water : public Substance
         m_formula = "H2O";
     }
 
-    double MolWt();
-    double Tcrit();
-    double Pcrit();
-    double Vcrit();
-    double Tmin();
-    double Tmax();
-
-    double Pp();
-    double up();
-    double sp();
-    double Psat();
+    double MolWt() override;
+    double Tcrit() override;
+    double Pcrit() override;
+    double Vcrit() override;
+    double Tmin() override;
+    double Tmax() override;
+
+    double Pp() override;
+    double up() override;
+    double sp() override;
+    double Psat() override;
     double dPsatdT();
 
+protected:
+    double ldens() override;
+
 private:
-    double ldens();
     double C(int i);
     double Cprime(int i);
     double I(int i);