address PR comments, fix iDim==3 issues

Author: pcarruscag

SU2_CFD/include/numerics_simd/flow/convection/centered.hpp

@@ -170,8 +170,8 @@ class CCenteredBase : public Base {
 
     /*--- Add the contributions from the base class (static decorator). ---*/
 
-    Base::updateFlux(iEdge, iPoint, jPoint, avgV, V, solution_, geometry,
-                     config, area, unitNormal, implicit, flux, jac_i, jac_j);
+    Base::viscousTerms(iEdge, iPoint, jPoint, avgV, V, solution_, geometry,
+                       config, area, unitNormal, implicit, flux, jac_i, jac_j);
 
     /*--- Stop preaccumulation. ---*/
 

SU2_CFD/include/numerics_simd/flow/convection/roe.hpp

@@ -38,12 +38,12 @@
  * \class CRoeBase
  * \brief Base class for Roe schemes, derived classes implement
  * the dissipation term in a const "finalizeFlux" method.
- * A base class implementing "updateFlux" is accepted as template parameter.
+ * A base class implementing "viscousTerms" is accepted as template parameter.
  * Similarly to derived, that method should update the flux and Jacobians, but
- * whereas "finalizeFlux" is passed data prepared by CRoeBase, "updateFlux"
- * takes the same input arguments as "ComputeFlux", i.e. it must fetch the data
- * it needs from CVariable. Derived is meant to implement small details,
- * Base is meant to do heavy lifting like computing viscous fluxes.
+ * whereas "finalizeFlux" is passed data prepared by CRoeBase, "viscousTerms"
+ * takes the same input arguments as "ComputeFlux", i.e. it can fetch more
+ * data from CVariable. Derived is meant to implement small details,
+ * Base is meant to do heavy lifting.
  */
 template<class Derived, class Base>
 class CRoeBase : public Base {
@@ -199,8 +199,8 @@ class CRoeBase : public Base {
 
     /*--- Add the contributions from the base class (static decorator). ---*/
 
-    Base::updateFlux(iEdge, iPoint, jPoint, V1st, solution_, vector_ij, geometry,
-                     config, area, unitNormal, implicit, flux, jac_i, jac_j);
+    Base::viscousTerms(iEdge, iPoint, jPoint, V1st, solution_, vector_ij, geometry,
+                       config, area, unitNormal, implicit, flux, jac_i, jac_j);
 
     /*--- Stop preaccumulation. ---*/
 

SU2_CFD/include/numerics_simd/flow/diffusion/viscous_fluxes.hpp

@@ -58,7 +58,7 @@ class CNoViscousFlux : public CNumericsSIMD {
    * the decorated class can pass them to avoid expensive data accesses.
    */
   template<class... Ts>
-  void updateFlux(Ts&...) const {}
+  void viscousTerms(Ts&...) const {}
 };
 
 /*!
@@ -98,21 +98,21 @@ class CCompressibleViscousFlux : public CNumericsSIMD {
    * \brief Add viscous contributions to flux and jacobians.
    */
   template<class PrimVarType, size_t nVar>
-  FORCEINLINE void updateFlux(Int iEdge,
-                              Int iPoint,
-                              Int jPoint,
-                              const PrimVarType& avgV,
-                              const CPair<PrimVarType>& V,
-                              const CVariable& solution_,
-                              const VectorDbl<nDim>& vector_ij,
-                              const CGeometry& geometry,
-                              const CConfig& config,
-                              Double area,
-                              const VectorDbl<nDim>& unitNormal,
-                              bool implicit,
-                              VectorDbl<nVar>& flux,
-                              MatrixDbl<nVar>& jac_i,
-                              MatrixDbl<nVar>& jac_j) const {
+  FORCEINLINE void viscousTerms(Int iEdge,
+                                Int iPoint,
+                                Int jPoint,
+                                const PrimVarType& avgV,
+                                const CPair<PrimVarType>& V,
+                                const CVariable& solution_,
+                                const VectorDbl<nDim>& vector_ij,
+                                const CGeometry& geometry,
+                                const CConfig& config,
+                                Double area,
+                                const VectorDbl<nDim>& unitNormal,
+                                bool implicit,
+                                VectorDbl<nVar>& flux,
+                                MatrixDbl<nVar>& jac_i,
+                                MatrixDbl<nVar>& jac_j) const {
 
     static_assert(PrimVarType::nVar <= nPrimVar,"");
 
@@ -201,36 +201,36 @@ class CCompressibleViscousFlux : public CNumericsSIMD {
    * \overload Average primitives if not provided yet.
    */
   template<class PrimVarType, class... Ts>
-  FORCEINLINE void updateFlux(Int iEdge,
-                              Int iPoint,
-                              Int jPoint,
-                              const CPair<PrimVarType>& V,
-                              Ts&... args) const {
+  FORCEINLINE void viscousTerms(Int iEdge,
+                                Int iPoint,
+                                Int jPoint,
+                                const CPair<PrimVarType>& V,
+                                Ts&... args) const {
     PrimVarType avgV;
     for (size_t iVar = 0; iVar < PrimVarType::nVar; ++iVar) {
       avgV.all(iVar) = 0.5 * (V.i.all(iVar) + V.j.all(iVar));
     }
 
     /*--- Continue calculation. ---*/
-    updateFlux(iEdge, iPoint, jPoint, avgV, V, args...);
+    viscousTerms(iEdge, iPoint, jPoint, avgV, V, args...);
   }
 
   /*!
    * \overload Compute the i-j vector if not provided yet.
    */
   template<class PrimVarType, class... Ts>
-  FORCEINLINE void updateFlux(Int iEdge,
-                              Int iPoint,
-                              Int jPoint,
-                              const PrimVarType& avgV,
-                              const CPair<PrimVarType>& V,
-                              const CVariable& solution_,
-                              const CGeometry& geometry,
-                              Ts&... args) const {
+  FORCEINLINE void viscousTerms(Int iEdge,
+                                Int iPoint,
+                                Int jPoint,
+                                const PrimVarType& avgV,
+                                const CPair<PrimVarType>& V,
+                                const CVariable& solution_,
+                                const CGeometry& geometry,
+                                Ts&... args) const {
 
     const auto vector_ij = distanceVector<nDim>(iPoint, jPoint, geometry.nodes->GetCoord());
 
     /*--- Continue calculation. ---*/
-    updateFlux(iEdge, iPoint, jPoint, avgV, V, solution_, vector_ij, geometry, args...);
+    viscousTerms(iEdge, iPoint, jPoint, avgV, V, solution_, vector_ij, geometry, args...);
   }
 };

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -1814,7 +1814,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Momentum_Forces(const CGeometry* geometr
 
           /*--- Moment with respect to the reference axis ---*/
 
-          if (iDim == 3) {
+          if (nDim == 3) {
             MomentMomentum[0] += (Force[2] * MomentDist[1] - Force[1] * MomentDist[2]) / RefLength;
             MomentX_Force[1] += (-Force[1] * Coord[2]);
             MomentX_Force[2] += (Force[2] * Coord[1]);
@@ -2310,7 +2310,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
         /*--- Moment with respect to the reference axis ---*/
 
-        if (iDim == 3) {
+        if (nDim == 3) {
           MomentViscous[0] += (Force[2] * MomentDist[1] - Force[1] * MomentDist[2]) / RefLength;
           MomentX_Force[1] += (-Force[1] * Coord[2]);
           MomentX_Force[2] += (Force[2] * Coord[1]);