Revert "Make turb_sources/diffusion/convection methods final instead override."

This reverts commit 67c1aa9.

Author: TobiKattmann

SU2_CFD/include/numerics/turbulent/turb_convection.hpp

@@ -41,13 +41,13 @@ class CUpwSca_TurbSA final : public CUpwScalar {
   /*!
    * \brief Adds any extra variables to AD
    */
-  void ExtraADPreaccIn() final;
+  void ExtraADPreaccIn() override;
 
   /*!
    * \brief SA specific steps in the ComputeResidual method
    * \param[in] config - Definition of the particular problem.
    */
-  void FinishResidualCalc(const CConfig* config) final;
+  void FinishResidualCalc(const CConfig* config) override;
 
 public:
   /*!
@@ -71,13 +71,13 @@ class CUpwSca_TurbSST final : public CUpwScalar {
   /*!
    * \brief Adds any extra variables to AD
    */
-  void ExtraADPreaccIn() final;
+  void ExtraADPreaccIn() override;
 
   /*!
    * \brief SST specific steps in the ComputeResidual method
    * \param[in] config - Definition of the particular problem.
    */
-  void FinishResidualCalc(const CConfig* config) final;
+  void FinishResidualCalc(const CConfig* config) override;
 
 public:
   /*!

SU2_CFD/include/numerics/turbulent/turb_diffusion.hpp

@@ -44,13 +44,13 @@ class CAvgGrad_TurbSA final : public CAvgGrad_Scalar {
   /*!
    * \brief Adds any extra variables to AD
    */
-  void ExtraADPreaccIn(void) final;
+  void ExtraADPreaccIn(void) override;
 
   /*!
    * \brief SA specific steps in the ComputeResidual method
    * \param[in] config - Definition of the particular problem.
    */
-  void FinishResidualCalc(const CConfig* config) final;
+  void FinishResidualCalc(const CConfig* config) override;
 
 public:
   /*!
@@ -78,13 +78,13 @@ class CAvgGrad_TurbSA_Neg final : public CAvgGrad_Scalar {
   /*!
    * \brief Adds any extra variables to AD
    */
-  void ExtraADPreaccIn(void) final;
+  void ExtraADPreaccIn(void) override;
 
   /*!
    * \brief SA specific steps in the ComputeResidual method
    * \param[in] config - Definition of the particular problem.
    */
-  void FinishResidualCalc(const CConfig* config) final;
+  void FinishResidualCalc(const CConfig* config) override;
 
 public:
   /*!
@@ -117,13 +117,13 @@ class CAvgGrad_TurbSST final : public CAvgGrad_Scalar {
   /*!
    * \brief Adds any extra variables to AD
    */
-  void ExtraADPreaccIn(void) final;
+  void ExtraADPreaccIn(void) override;
 
   /*!
    * \brief SST specific steps in the ComputeResidual method
    * \param[in] config - Definition of the particular problem.
    */
-  void FinishResidualCalc(const CConfig* config) final;
+  void FinishResidualCalc(const CConfig* config) override;
 
 public:
   /*!
@@ -140,7 +140,7 @@ class CAvgGrad_TurbSST final : public CAvgGrad_Scalar {
   /*!
    * \brief Sets value of first blending function.
    */
-  void SetF1blending(su2double val_F1_i, su2double val_F1_j) final {
+  void SetF1blending(su2double val_F1_i, su2double val_F1_j) override {
     F1_i = val_F1_i; F1_j = val_F1_j;
   }
 

SU2_CFD/include/numerics/turbulent/turb_sources.hpp

@@ -150,7 +150,7 @@ class CSourcePieceWise_TurbSA final : public CSourceBase_TurbSA {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 
 };
 
@@ -185,7 +185,7 @@ class CSourcePieceWise_TurbSA_COMP final : public CSourceBase_TurbSA {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 
 };
 
@@ -219,7 +219,7 @@ class CSourcePieceWise_TurbSA_E final : public CSourceBase_TurbSA {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 };
 
 /*!
@@ -254,7 +254,7 @@ class CSourcePieceWise_TurbSA_E_COMP : public CSourceBase_TurbSA {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 };
 
 /*!
@@ -285,7 +285,7 @@ class CSourcePieceWise_TurbSA_Neg : public CSourceBase_TurbSA {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 
 };
 
@@ -382,7 +382,7 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
    * \param[in] val_F1_i - Value of the first blending function at point i.
    * \param[in] val_F1_j - Value of the first blending function at point j.
    */
-  inline void SetF1blending(su2double val_F1_i, su2double val_F1_j) final {
+  inline void SetF1blending(su2double val_F1_i, su2double val_F1_j) override {
     F1_i = val_F1_i;
     F1_j = val_F1_j;
   }
@@ -392,7 +392,7 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
    * \param[in] val_F2_i - Value of the second blending function at point i.
    * \param[in] val_F2_j - Value of the second blending function at point j.
    */
-  inline void SetF2blending(su2double val_F2_i, su2double val_F2_j) final {
+  inline void SetF2blending(su2double val_F2_i, su2double val_F2_j) override {
     F2_i = val_F2_i;
     F2_j = val_F2_j;
   }
@@ -402,7 +402,7 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
    * \param[in] val_CDkw_i - Value of the cross diffusion at point i.
    * \param[in] val_CDkw_j - Value of the cross diffusion at point j.
    */
-  inline void SetCrossDiff(su2double val_CDkw_i, su2double val_CDkw_j) final {
+  inline void SetCrossDiff(su2double val_CDkw_i, su2double val_CDkw_j) override {
     CDkw_i = val_CDkw_i;
     CDkw_j = val_CDkw_j;
   }
@@ -412,6 +412,6 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
    * \param[in] config - Definition of the particular problem.
    * \return A lightweight const-view (read-only) of the residual/flux and Jacobians.
    */
-  ResidualType<> ComputeResidual(const CConfig* config) final;
+  ResidualType<> ComputeResidual(const CConfig* config) override;
 
 };