- fixed formatting errors

Author: rois1995

Common/include/geometry/dual_grid/CPoint.hpp

@@ -108,11 +108,11 @@ class CPoint {
   su2vector<unsigned long>
       ClosestWall_Elem; /*!< \brief Element index of closest wall element, for givenrank, zone and marker index. */
 
-  su2activevector SharpEdge_Distance;     /*!< \brief Distance to a sharp edge. */
-  su2activevector Curvature;              /*!< \brief Value of the surface curvature (SU2_GEO). */
-  su2activevector MaxLength;              /*!< \brief The maximum cell-center to cell-center length. */
-  su2activevector RoughnessHeight;          /*!< \brief Roughness of the nearest wall. */
-  su2activematrix Normals;  /*!< \brief Normal of the nearest wall element. */
+  su2activevector SharpEdge_Distance; /*!< \brief Distance to a sharp edge. */
+  su2activevector Curvature;          /*!< \brief Value of the surface curvature (SU2_GEO). */
+  su2activevector MaxLength;          /*!< \brief The maximum cell-center to cell-center length. */
+  su2activevector RoughnessHeight;    /*!< \brief Roughness of the nearest wall. */
+  su2activematrix Normals;            /*!< \brief Normal of the nearest wall element. */
 
   su2matrix<int> AD_InputIndex; /*!< \brief Indices of Coord variables in the adjoint vector. */
   su2matrix<int>
@@ -489,22 +489,22 @@ class CPoint {
    * \brief Get the index of the closest wall element.
    * \param[in] iPoint - Index of the point.
    * \param[out] ClosestWall_Elem - ID of the closest element on a wall boundary.
-  */
-  inline unsigned long GetClosestWall_Elem(unsigned long iPoint) {return ClosestWall_Elem(iPoint);}
+   */
+  inline unsigned long GetClosestWall_Elem(unsigned long iPoint) { return ClosestWall_Elem(iPoint); }
 
   /*!
    * \brief Get the marker of the closest wall marker.
    * \param[in] iPoint - Index of the point.
    * \param[out] ClosestWall_Marker - MarkerID of the closest wall boundary.
    */
-  inline unsigned long GetClosestWall_Marker(unsigned long iPoint) {return ClosestWall_Marker(iPoint);}
+  inline unsigned long GetClosestWall_Marker(unsigned long iPoint) { return ClosestWall_Marker(iPoint); }
 
   /*!
    * \brief Get the rank of the closest wall marker.
    * \param[in] iPoint - Index of the point.
    * \param[out] ClosestWall_Rank - RankID of the closest wall boundary.
    */
-  inline unsigned long GetClosestWall_Rank(unsigned long iPoint) {return ClosestWall_Rank(iPoint);}
+  inline unsigned long GetClosestWall_Rank(unsigned long iPoint) { return ClosestWall_Rank(iPoint); }
 
   /*!
    * \brief Get the value of the distance to the nearest wall.
@@ -533,18 +533,17 @@ class CPoint {
    * \param[in] iPoint - Index of the point.
    * \param[in] normal - Value of the normal.
    */
-  template<typename Normals_type>
-  inline void SetNormal(unsigned long iPoint, Normals_type const&normal) { 
-    for (unsigned long iDim = 0; iDim < nDim; iDim++)
-      Normals(iPoint,iDim) = normal[iDim];
+  template <typename Normals_type>
+  inline void SetNormal(unsigned long iPoint, Normals_type const& normal) {
+    for (unsigned long iDim = 0; iDim < nDim; iDim++) Normals(iPoint, iDim) = normal[iDim];
   }
 
   /*!
    * \brief Set the value of the normal of the nearest wall element.
    * \param[in] iPoint - Index of the point.
    * \return normal to the normal of the nearest wall element.
    */
-  inline su2double *GetNormal(unsigned long iPoint) { return Normals[iPoint]; }
+  inline su2double* GetNormal(unsigned long iPoint) { return Normals[iPoint]; }
 
   /*!
    * \brief Set the value of the distance to a sharp edge.
@@ -926,21 +925,18 @@ class CPoint {
     }
   }
 
-
   /*!
    * \brief Set wall normal according to stored closest wall information.
    * \param[in] normals - Mapping [rank][zone][marker][element] -> normal
    */
-  template<typename Normals_type>
-  void SetWallNormals(Normals_type const&normals){
-    for (unsigned long iPoint=0; iPoint<GlobalIndex.size(); ++iPoint) {
+  template <typename Normals_type>
+  void SetWallNormals(Normals_type const& normals) {
+    for (unsigned long iPoint = 0; iPoint < GlobalIndex.size(); ++iPoint) {
       auto rankID = ClosestWall_Rank[iPoint];
       auto zoneID = ClosestWall_Zone[iPoint];
       auto markerID = ClosestWall_Marker[iPoint];
       auto elementID = ClosestWall_Elem[iPoint];
-      if(rankID >= 0)
-        SetNormal(iPoint, normals[rankID][zoneID][markerID][elementID]);
+      if (rankID >= 0) SetNormal(iPoint, normals[rankID][zoneID][markerID][elementID]);
     }
   }
-
 };

Common/src/geometry/CGeometry.cpp

@@ -4030,14 +4030,13 @@ void CGeometry::ComputeWallDistance(const CConfig* const* config_container, CGeo
     if (!wallDistanceNeeded[ZONE_0] || kindSolver == MAIN_SOLVER::FEM_LES || kindSolver == MAIN_SOLVER::FEM_RANS) {
       continue;
     } else {
-
       su2vector<su2vector<su2matrix<su2double>>> WallNormal_container;
       WallNormal_container.resize(nZone) = su2vector<su2matrix<su2double>>();
-      for (int iZone = 0; iZone < nZone; iZone++){
+      for (int iZone = 0; iZone < nZone; iZone++) {
         const CConfig* config = config_container[iZone];
         const CGeometry* geometry = geometry_container[iZone][iInst][MESH_0];
         WallNormal_container[iZone].resize(geometry->GetnMarker());
-        for (auto iMarker = 0; iMarker < geometry->GetnMarker(); iMarker++){
+        for (auto iMarker = 0; iMarker < geometry->GetnMarker(); iMarker++) {
           if (config->GetViscous_Wall(iMarker)) {
             WallNormal_container[iZone][iMarker].resize(geometry->GetnElem_Bound(iMarker), 3);
 
@@ -4053,20 +4052,16 @@ void CGeometry::ComputeWallDistance(const CConfig* const* config_container, CGeo
                   NormalHere[iDim] += geometry->vertex[iMarker][iVertexHere]->GetNormal(iDim);
               }
 
-              for (auto iDim = 0u; iDim < 3; iDim++)
-                NormalHere[iDim] /= geometry->bound[iMarker][iElem]->GetnNodes();
+              for (auto iDim = 0u; iDim < 3; iDim++) NormalHere[iDim] /= geometry->bound[iMarker][iElem]->GetnNodes();
 
               su2double NormalMag = 0.0;
-              for (auto iDim = 0u; iDim < 3; iDim++)
-                NormalMag += NormalHere[iDim]*NormalHere[iDim];
+              for (auto iDim = 0u; iDim < 3; iDim++) NormalMag += NormalHere[iDim] * NormalHere[iDim];
               NormalMag = sqrt(NormalMag);
 
-              for (auto iDim = 0u; iDim < 3; iDim++)
-                NormalHere[iDim] /= NormalMag;
+              for (auto iDim = 0u; iDim < 3; iDim++) NormalHere[iDim] /= NormalMag;
 
               for (auto iDim = 0u; iDim < 3; iDim++)
                 WallNormal_container[iZone][iMarker](iElem, iDim) = NormalHere[iDim];
-
             }
           } else {
             WallNormal_container[iZone][iMarker].resize(1, 3) = su2double(0.0);
@@ -4075,33 +4070,31 @@ void CGeometry::ComputeWallDistance(const CConfig* const* config_container, CGeo
       }
 
       auto normal_i =
-      make_pair(nZone, [config_container,geometry_container,iInst,WallNormal_container](unsigned long iZone){
-        const CConfig* config = config_container[iZone];
-        const CGeometry* geometry = geometry_container[iZone][iInst][MESH_0];
-        const auto nMarker = geometry->GetnMarker();
-        const auto WallNormal = WallNormal_container[iZone];
-
-        return make_pair( nMarker, [config,geometry,WallNormal](unsigned long iMarker){
-          auto nElem_Bou = geometry->GetnElem_Bound(iMarker);
-          if (!config->GetViscous_Wall(iMarker)) nElem_Bou = 1;
-
-          return make_pair(nElem_Bou, [WallNormal,iMarker](unsigned long iElem){
-            const auto dimensions = 3;
-
-            return make_pair(dimensions, [WallNormal,iMarker,iElem](unsigned short iDim){
-              
-              return WallNormal[iMarker](iElem, iDim);
+          make_pair(nZone, [config_container, geometry_container, iInst, WallNormal_container](unsigned long iZone) {
+            const CConfig* config = config_container[iZone];
+            const CGeometry* geometry = geometry_container[iZone][iInst][MESH_0];
+            const auto nMarker = geometry->GetnMarker();
+            const auto WallNormal = WallNormal_container[iZone];
+
+            return make_pair(nMarker, [config, geometry, WallNormal](unsigned long iMarker) {
+              auto nElem_Bou = geometry->GetnElem_Bound(iMarker);
+              if (!config->GetViscous_Wall(iMarker)) nElem_Bou = 1;
+
+              return make_pair(nElem_Bou, [WallNormal, iMarker](unsigned long iElem) {
+                const auto dimensions = 3;
+
+                return make_pair(dimensions, [WallNormal, iMarker, iElem](unsigned short iDim) {
+                  return WallNormal[iMarker](iElem, iDim);
+                });
+              });
             });
           });
-        });
-      });
 
-      NdFlattener<4>Normals_Local(normal_i);
+      NdFlattener<4> Normals_Local(normal_i);
       NdFlattener<5> Normals_global(Nd_MPI_Environment(), Normals_Local);
 
-
       // use it to update roughnesses
-      for(int jZone=0; jZone<nZone; jZone++){
+      for (int jZone = 0; jZone < nZone; jZone++) {
         geometry_container[jZone][iInst][MESH_0]->nodes->SetWallNormals(Normals_global);
       }
     }

Common/src/geometry/dual_grid/CPoint.cpp

@@ -128,7 +128,6 @@ void CPoint::FullAllocation(unsigned short imesh, const CConfig* config) {
   SharpEdge_Distance.resize(npoint) = su2double(0.0);
 
   Normals.resize(npoint, 3) = su2double(0.0);
-
 }
 
 void CPoint::SetElems(const vector<vector<long> >& elemsMatrix) { Elem = CCompressedSparsePatternL(elemsMatrix); }