Make use of 'override' specifier

.github/workflows/main.yml

@@ -148,6 +148,7 @@ jobs:
       run: python3 `which scons` build env_vars=all
         CXX=clang++-12 CC=clang-12 f90_interface=n extra_lib_dirs=/usr/lib/llvm/lib
         -j2 debug=n --debug=time hdf_libdir=$HDF5_LIBDIR hdf_include=$HDF5_INCLUDEDIR
+        warning_flags='-Wall -Werror -Wsuggest-override'
     - name: Test Cantera
       run:
         python3 `which scons` test show_long_tests=yes verbose_tests=yes --debug=time

include/cantera/base/AnyMap.h

@@ -767,7 +767,7 @@ class InputFileError : public CanteraError
         {
         }
 
-    virtual string getClass() const {
+    string getClass() const override {
         return "InputFileError";
     }
 protected:

include/cantera/base/Array.h

@@ -86,7 +86,7 @@ class Array2D
      * @param m  This is the number of columns in the new matrix
      * @param v  Default fill value -> defaults to zero.
      */
-    void resize(size_t n, size_t m, double v=0.0);
+    virtual void resize(size_t n, size_t m, double v=0.0);
 
     //! Append a column to the existing matrix using a std vector
     /*!

include/cantera/base/ExtensionManagerFactory.h

@@ -24,7 +24,7 @@ class ExtensionManagerFactory : public Factory<ExtensionManager>
     }
 
     //! Delete the static instance of this factory
-    virtual void deleteFactory();
+    void deleteFactory() override;
 
     //! Static function that returns the static instance of the factory, creating it
     //! if necessary.

include/cantera/base/NoExitLogger.h

@@ -14,10 +14,8 @@
 class NoExitLogger : public Logger {
 public:
     NoExitLogger() {}
-    virtual ~NoExitLogger() {}
 
-    virtual void error(const string& msg)
-    {
+    void error(const string& msg) override {
        std::cerr << msg << std::endl;
     }
 };

include/cantera/base/ctexceptions.h

@@ -94,7 +94,7 @@
     virtual ~CanteraError() throw() {};
 
     //! Get a description of the error
-    const char* what() const throw();
+    const char* what() const throw() override;
 
     //! Method overridden by derived classes to format the error message
     virtual string getMessage() const;
@@ -147,8 +147,8 @@
     ArraySizeError(const string& procedure, size_t sz, size_t reqd) :
         CanteraError(procedure), sz_(sz), reqd_(reqd) {}
 
-    virtual string getMessage() const;
-    virtual string getClass() const {
+    string getMessage() const override;
+    string getClass() const override {
         return "ArraySizeError";
     }
 
@@ -178,9 +178,9 @@
     IndexError(const string& func, const string& arrayName, size_t m, size_t mmax) :
         CanteraError(func), arrayName_(arrayName), m_(m), mmax_(mmax) {}
 
-    virtual ~IndexError() throw() {};
-    virtual string getMessage() const;
-    virtual string getClass() const {
+    ~IndexError() throw() override {};
+    string getMessage() const override;
+    string getClass() const override {
         return "IndexError";
     }
 
@@ -204,7 +204,7 @@
     NotImplementedError(const string& func, const string& msg, const Args&... args) :
         CanteraError(func, msg, args...) {}
 
-    virtual string getClass() const {
+    string getClass() const override {
         return "NotImplementedError";
     }
 };

include/cantera/cython/funcWrapper.h

@@ -100,7 +100,7 @@ class CallbackError : public Cantera::CanteraError
         Py_XDECREF(m_value);
     }
 
-    std::string getMessage() const {
+    std::string getMessage() const override {
         std::string msg;
 
         PyObject* name = PyObject_GetAttrString(m_type, "__name__");
@@ -130,7 +130,7 @@ class CallbackError : public Cantera::CanteraError
         return msg;
     }
 
-    virtual std::string getClass() const {
+    std::string getClass() const override {
         return "Exception";
     }
 
@@ -148,7 +148,7 @@ class Func1Py : public Cantera::Func1
         m_pyobj(pyobj) {
     }
 
-    double eval(double t) const {
+    double eval(double t) const override {
         void* err[2] = {0, 0};
         double y = m_callback(t, m_pyobj, err);
         if (err[0]) {

include/cantera/cython/utils_utils.h

@@ -50,7 +50,7 @@
 class PythonLogger : public Cantera::Logger
 {
 public:
-    virtual void write(const std::string& s) {
+    void write(const std::string& s) override {
         // 1000 bytes is the maximum size permitted by PySys_WriteStdout
         static const size_t N = 999;
         for (size_t i = 0; i < s.size(); i+=N) {
@@ -59,12 +59,12 @@
         std::cout.flush();
     }
 
-    virtual void writeendl() {
+    void writeendl() override {
         PySys_WriteStdout("%s", "\n");
         std::cout.flush();
     }
 
-    virtual void warn(const std::string& warning, const std::string& msg) {
+    void warn(const std::string& warning, const std::string& msg) override {
         if (mapped_PyWarnings.find(warning) != mapped_PyWarnings.end()) {
             PyErr_WarnEx(mapped_PyWarnings[warning], msg.c_str(), 1);
         } else {
@@ -73,7 +73,7 @@
         }
     }
 
-    virtual void error(const std::string& msg) {
+    void error(const std::string& msg) override {
         PyErr_SetString(PyExc_RuntimeError, msg.c_str());
     }
 };

include/cantera/extensions/PythonExtensionManager.h

@@ -25,7 +25,7 @@ namespace Cantera
 class PythonExtensionManager : public ExtensionManager
 {
 public:
-    virtual void registerRateBuilders(const string& extensionName) override;
+    void registerRateBuilders(const string& extensionName) override;
 
     void registerRateBuilder(const string& moduleName,
         const string& className, const string& rateName) override;

include/cantera/kinetics/Arrhenius.h

@@ -28,7 +28,7 @@ class AnyMap;
  */
 struct ArrheniusData : public ReactionData
 {
-    virtual bool update(const ThermoPhase& phase, const Kinetics& kin);
+    bool update(const ThermoPhase& phase, const Kinetics& kin) override;
     using ReactionData::update;
 };
 
@@ -79,15 +79,14 @@ class ArrheniusBase : public ReactionRate
     //! equivalent field
     void getRateParameters(AnyMap& node) const;
 
-    virtual void setParameters(
-        const AnyMap& node, const UnitStack& rate_units) override;
+    void setParameters(const AnyMap& node, const UnitStack& rate_units) override;
 
-    virtual void getParameters(AnyMap& node) const override;
+    void getParameters(AnyMap& node) const override;
 
     //! Check rate expression
-    virtual void check(const string& equation) override;
+    void check(const string& equation) override;
 
-    virtual void validate(const string& equation, const Kinetics& kin) override;
+    void validate(const string& equation, const Kinetics& kin) override;
 
     //! Return the pre-exponential factor *A* (in m, kmol, s to powers depending
     //! on the reaction order)
@@ -176,7 +175,7 @@ class ArrheniusRate : public ArrheniusBase
         return make_unique<MultiRate<ArrheniusRate, ArrheniusData>>();
     }
 
-    virtual const string type() const override {
+    const string type() const override {
         return "Arrhenius";
     }
 

include/cantera/kinetics/BlowersMaselRate.h

@@ -20,11 +20,11 @@ struct BlowersMaselData : public ReactionData
 {
     BlowersMaselData() = default;
 
-    virtual void update(double T) override;
-    virtual bool update(const ThermoPhase& phase, const Kinetics& kin) override;
+    void update(double T) override;
+    bool update(const ThermoPhase& phase, const Kinetics& kin) override;
     using ReactionData::update;
 
-    virtual void resize(size_t nSpecies, size_t nReactions, size_t nPhases) override {
+    void resize(size_t nSpecies, size_t nReactions, size_t nPhases) override {
         partialMolarEnthalpies.resize(nSpecies, 0.);
         ready = true;
     }
@@ -90,11 +90,11 @@ class BlowersMaselRate : public ArrheniusBase
         return make_unique<MultiRate<BlowersMaselRate, BlowersMaselData>>();
     }
 
-    virtual const string type() const override {
+    const string type() const override {
         return "Blowers-Masel";
     }
 
-    virtual void setContext(const Reaction& rxn, const Kinetics& kin) override;
+    void setContext(const Reaction& rxn, const Kinetics& kin) override;
 
     //! Evaluate reaction rate
     double evalRate(double logT, double recipT) const {
@@ -149,7 +149,7 @@ class BlowersMaselRate : public ArrheniusBase
     }
 
 public:
-    virtual double activationEnergy() const override {
+    double activationEnergy() const override {
         return effectiveActivationEnergy_R(m_deltaH_R) * GasConstant;
     }
 

include/cantera/kinetics/ChebyshevRate.h

@@ -24,15 +24,15 @@ struct ChebyshevData : public ReactionData
 {
     ChebyshevData() = default;
 
-    virtual void update(double T) override;
+    void update(double T) override;
 
-    virtual void update(double T, double P) override {
+    void update(double T, double P) override {
         ReactionData::update(T);
         pressure = P;
         log10P = std::log10(P);
     }
 
-    virtual bool update(const ThermoPhase& phase, const Kinetics& kin) override;
+    bool update(const ThermoPhase& phase, const Kinetics& kin) override;
 
     using ReactionData::update;
 
@@ -43,9 +43,9 @@ struct ChebyshevData : public ReactionData
      */
     void perturbPressure(double deltaP);
 
-    virtual void restore() override;
+    void restore() override;
 
-    virtual void invalidateCache() override {
+    void invalidateCache() override {
         ReactionData::invalidateCache();
         pressure = NAN;
     }
@@ -109,20 +109,20 @@ class ChebyshevRate final : public ReactionRate
 
     ChebyshevRate(const AnyMap& node, const UnitStack& rate_units={});
 
-    unique_ptr<MultiRateBase> newMultiRate() const {
+    unique_ptr<MultiRateBase> newMultiRate() const override {
         return make_unique<MultiRate<ChebyshevRate, ChebyshevData>>();
     }
 
-    const string type() const { return "Chebyshev"; }
+    const string type() const override { return "Chebyshev"; }
 
     //! Perform object setup based on AnyMap node information
     /*!
      *  @param node  AnyMap containing rate information
      *  @param rate_units  Unit definitions specific to rate information
      */
-    void setParameters(const AnyMap& node, const UnitStack& rate_units);
+    void setParameters(const AnyMap& node, const UnitStack& rate_units) override;
 
-    void getParameters(AnyMap& rateNode) const;
+    void getParameters(AnyMap& rateNode) const override;
 
     //! @deprecated To be removed after %Cantera 3.0.
     void getParameters(AnyMap& rateNode, const Units& rate_units) const {
@@ -131,7 +131,7 @@ class ChebyshevRate final : public ReactionRate
         return getParameters(rateNode);
     }
 
-    virtual void validate(const string& equation, const Kinetics& kin);
+    void validate(const string& equation, const Kinetics& kin) override;
 
     //! Update information specific to reaction
     /*!

include/cantera/kinetics/Custom.h

@@ -49,7 +49,7 @@ class CustomFunc1Rate final : public ReactionRate
     void getParameters(AnyMap& rateNode, const Units& rate_units=Units(0.)) const;
     using ReactionRate::getParameters;
 
-    virtual void validate(const string& equation, const Kinetics& kin) override;
+    void validate(const string& equation, const Kinetics& kin) override;
 
     //! Update information specific to reaction
     /*!

include/cantera/kinetics/EdgeKinetics.h

@@ -25,7 +25,7 @@ class EdgeKinetics : public InterfaceKinetics
         m_nDim = 1;
     }
 
-    virtual string kineticsType() const {
+    string kineticsType() const override {
         return "edge";
     }
 };