recover old sign convention and use helper function

Author: pcarruscag

Common/include/toolboxes/geometry_toolbox.hpp

@@ -79,6 +79,14 @@ inline T Norm(Int nDim, const T* a) {
   return sqrt(SquaredNorm(nDim, a));
 }
 
+/*! \brief dn = max(abs(n.(a-b)), 0.05 * ||a-b|| */
+template <class T, typename Int>
+inline T NormalDistance(Int nDim, const T* n, const T* a, const T* b) {
+  T d[3] = {0};
+  Distance(nDim, a, b, d);
+  return fmax(fabs(DotProduct(nDim, n, d)), 0.05 * Norm(nDim, d));
+}
+
 /*! \brief c = a x b */
 template <class T>
 inline void CrossProduct(const T* a, const T* b, T* c) {

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -2520,9 +2520,9 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
         if (config->GetMarker_All_KindBC(iMarker) == BC_TYPE::HEAT_FLUX) {
           if (py_custom) {
-            HeatFlux[iMarker][iVertex] = geometry->GetCustomBoundaryHeatFlux(iMarker, iVertex);
+            HeatFlux[iMarker][iVertex] = -geometry->GetCustomBoundaryHeatFlux(iMarker, iVertex);
           } else {
-            HeatFlux[iMarker][iVertex] = config->GetWall_HeatFlux(Marker_Tag);
+            HeatFlux[iMarker][iVertex] = -config->GetWall_HeatFlux(Marker_Tag);
             if (config->GetIntegrated_HeatFlux()) {
               HeatFlux[iMarker][iVertex] /= geometry->GetSurfaceArea(config, iMarker);
             }
@@ -2536,21 +2536,13 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
           }
           iPointNormal = geometry->vertex[iMarker][iVertex]->GetNormal_Neighbor();
           Coord_Normal = geometry->nodes->GetCoord(iPointNormal);
-          su2double Vec_ij[MAXNDIM] = {0.0};
-          GeometryToolbox::Distance(nDim, Coord, Coord_Normal, Vec_ij);
-
-          /*--- Prevent divisions by 0 by limiting the normal projection. ---*/
-          const su2double dist_ij = fmax(
-            fabs(GeometryToolbox::DotProduct(int(MAXNDIM), Vec_ij, UnitNormal)),
-            fmax(0.05 * GeometryToolbox::Norm(int(MAXNDIM), Vec_ij), EPS));
-
+          const su2double dist_ij = GeometryToolbox::NormalDistance(nDim, UnitNormal, Coord, Coord_Normal);
           const su2double There = nodes->GetTemperature(iPointNormal);
-
-          HeatFlux[iMarker][iVertex] = -thermal_conductivity * (There - Twall) / dist_ij * RefHeatFlux;
+          HeatFlux[iMarker][iVertex] = thermal_conductivity * (There - Twall) / dist_ij * RefHeatFlux;
         } else {
-          su2double dTdn = -GeometryToolbox::DotProduct(nDim, Grad_Temp, UnitNormal);
+          su2double dTdn = GeometryToolbox::DotProduct(nDim, Grad_Temp, UnitNormal);
           if (FlowRegime == ENUM_REGIME::INCOMPRESSIBLE && !energy) dTdn = 0.0;
-          HeatFlux[iMarker][iVertex] = -thermal_conductivity * dTdn * RefHeatFlux;
+          HeatFlux[iMarker][iVertex] = thermal_conductivity * dTdn * RefHeatFlux;
         }
       } else {
 

SU2_CFD/src/solvers/CIncNSSolver.cpp

@@ -472,13 +472,9 @@ void CIncNSSolver::BC_Wall_Generic(const CGeometry *geometry, const CConfig *con
 
       const auto Coord_i = geometry->nodes->GetCoord(iPoint);
       const auto Coord_j = geometry->nodes->GetCoord(Point_Normal);
-      su2double Edge_Vector[MAXNDIM] = {0.0};
-      GeometryToolbox::Distance(nDim, Coord_j, Coord_i, Edge_Vector);
-
-      /*--- Prevent divisions by 0 by limiting the normal projection. ---*/
-      const su2double dist_ij = fmax(
-        fabs(GeometryToolbox::DotProduct(int(MAXNDIM), Edge_Vector, Normal)) / Area,
-        fmax(0.05 * GeometryToolbox::Norm(int(MAXNDIM), Edge_Vector), EPS));
+      su2double UnitNormal[MAXNDIM] = {0.0};
+      for (auto iDim = 0u; iDim < nDim; ++iDim) UnitNormal[iDim] = Normal[iDim] / Area;
+      const su2double dist_ij = GeometryToolbox::NormalDistance(nDim, UnitNormal, Coord_i, Coord_j);
 
       /*--- Compute the normal gradient in temperature using Twall ---*/
 

SU2_CFD/src/solvers/CNSSolver.cpp

@@ -672,13 +672,7 @@ void CNSSolver::BC_Isothermal_Wall_Generic(CGeometry *geometry, CSolver **solver
 
     const auto Coord_i = geometry->nodes->GetCoord(iPoint);
     const auto Coord_j = geometry->nodes->GetCoord(Point_Normal);
-    su2double Vec_ij[MAXNDIM] = {0.0};
-    GeometryToolbox::Distance(nDim, Coord_i, Coord_j, Vec_ij);
-
-    /*--- Prevent divisions by 0 by limiting the normal projection. ---*/
-    const su2double dist_ij = fmax(
-      fabs(GeometryToolbox::DotProduct(int(MAXNDIM), Vec_ij, UnitNormal)),
-      fmax(0.05 * GeometryToolbox::Norm(int(MAXNDIM), Vec_ij), EPS));
+    const su2double dist_ij = GeometryToolbox::NormalDistance(nDim, UnitNormal, Coord_i, Coord_j);
 
     /*--- Store the corrected velocity at the wall which will
      be zero (v = 0), unless there is grid motion (v = u_wall)---*/