Change struct to a lambda function.

That has the benefit of capturing the outside variables/objects by
reference using [&] which makes the input list much smaller.

Author: TobiKattmann

SU2_CFD/include/solvers/CScalarSolver.hpp

@@ -84,7 +84,7 @@ class CScalarSolver : public CSolver {
 
   /*!
    * \brief Compute the viscous flux for the turbulent equation at a particular edge.
-   * \tparam SolverSpecificNumericsFunc - Struct, that implements solver specific contributions to numerics.
+   * \tparam SolverSpecificNumericsFunc - lambda-function, that implements solver specific contributions to numerics.
    * \note The functor has to implement (*geometry, *numerics, *config, *nodes, iPoint, jPoint)
    * \param[in] iEdge - Edge for which we want to compute the flux
    * \param[in] geometry - Geometrical definition of the problem.
@@ -120,7 +120,7 @@ class CScalarSolver : public CSolver {
 
     /*--- Call Numerics contribution which are Solver-Specifc. Implemented in the caller: Viscous_Residual.  ---*/
 
-    SolverSpecificNumerics(*geometry, *numerics, *config, *nodes, iPoint, jPoint);
+    SolverSpecificNumerics(iPoint, jPoint);
 
     /*--- Compute residual, and Jacobians ---*/
 

SU2_CFD/src/solvers/CTurbSASolver.cpp

@@ -290,15 +290,11 @@ void CTurbSASolver::Viscous_Residual(unsigned long iEdge, CGeometry* geometry, C
                                      CNumerics* numerics, CConfig* config) {
 
   /*--- Define an object to set solver specific numerics contribution. ---*/
-  struct SolverSpecificNumerics {
-
-    FORCEINLINE void operator() (const CGeometry& geometry, CNumerics& numerics, CConfig& config, const CScalarVariable& nodes, unsigned long iPoint, unsigned long jPoint) const {
-      /*--- Roughness heights. ---*/
-      if (config.GetKind_Turb_Model() == SA)
-        numerics.SetRoughness(geometry.nodes->GetRoughnessHeight(iPoint), geometry.nodes->GetRoughnessHeight(jPoint));
-    }
-
-  } SolverSpecificNumerics;
+  auto SolverSpecificNumerics = [&](unsigned long iPoint, unsigned long jPoint) {
+    /*--- Roughness heights. ---*/
+    if (config->GetKind_Turb_Model() == SA)
+      numerics->SetRoughness(geometry->nodes->GetRoughnessHeight(iPoint), geometry->nodes->GetRoughnessHeight(jPoint));
+  };
 
   /*--- Now instantiate the generic implementation with the functor above. ---*/
 

SU2_CFD/src/solvers/CTurbSSTSolver.cpp

@@ -279,15 +279,10 @@ void CTurbSSTSolver::Viscous_Residual(unsigned long iEdge, CGeometry* geometry,
                                      CNumerics* numerics, CConfig* config) {
 
   /*--- Define an object to set solver specific numerics contribution. ---*/
-  struct SolverSpecificNumerics {
-
-    FORCEINLINE void operator() (const CGeometry& geometry, CNumerics& numerics, CConfig& config, const CScalarVariable& nodes, unsigned long iPoint, unsigned long jPoint) const {
-      /*--- Menter's first blending function (only SST)---*/
-      if ((config.GetKind_Turb_Model() == SST) || (config.GetKind_Turb_Model() == SST_SUST))
-        numerics.SetF1blending(nodes.GetF1blending(iPoint), nodes.GetF1blending(jPoint));
-    }
-
-  } SolverSpecificNumerics;
+  auto SolverSpecificNumerics = [&](unsigned long iPoint, unsigned long jPoint) {
+    /*--- Menter's first blending function (only SST)---*/
+    numerics->SetF1blending(nodes->GetF1blending(iPoint), nodes->GetF1blending(jPoint));
+  };
 
   /*--- Now instantiate the generic implementation with the functor above. ---*/