Addressing comments

Author: vdweide

Common/include/toolboxes/fem/CFaceOfElement.hpp

@@ -34,8 +34,6 @@
 #include <algorithm>
 #include <climits>
 
-using namespace std;
-
 /*!
  * \class CFaceOfElement
  * \brief Class used in the partitioning of the FEM grid as well as the building of
@@ -68,9 +66,8 @@ class CFaceOfElement {
   bool elem0IsOwner;                     /*!< \brief Whether or not the neighboring element 0 is the owner
                                                      of the face. If false, element 1 is the owner. */
 
-  /* Standard constructor and destructor. */
+  /* Constructor. Initialize the member variables. */
   CFaceOfElement();
-  ~CFaceOfElement() {}
 
   /* Alternative constructor to set the corner points. */
   CFaceOfElement(const unsigned short VTK_Type, const unsigned short nPoly, const unsigned long* Nodes);
@@ -91,11 +88,11 @@ class CFaceOfElement {
 
   /*--- Member function, which creates a unique numbering for the corner points.
         A sort in increasing order is OK for this purpose.                       ---*/
-  inline void CreateUniqueNumbering(void) { std::sort(cornerPoints, cornerPoints + nCornerPoints); }
+  inline void CreateUniqueNumbering() { std::sort(cornerPoints, cornerPoints + nCornerPoints); }
 
   /*--- Member function, which creates a unique numbering for the corner points
         while the orientation is taken into account. ---*/
-  void CreateUniqueNumberingWithOrientation(void);
+  void CreateUniqueNumberingWithOrientation();
 
  private:
   /*--- Copy function, which copies the data of the given object into the current object. ---*/

Common/include/toolboxes/fem/CMatchingFace.hpp

@@ -50,12 +50,9 @@ class CMatchingFace {
   su2double cornerCoor[4][3];   /*!< \brief Coordinates of the corner points of the face. */
   su2double tolForMatching;     /*!< \brief Tolerance for this face for matching points. */
 
-  /* Standard constructor. */
+  /* Constructor. Initialize the member variables to zero. */
   CMatchingFace();
 
-  /* Destructor, nothing to be done. */
-  ~CMatchingFace() {}
-
   /* Copy constructor and assignment operator. */
   inline CMatchingFace(const CMatchingFace& other) { Copy(other); }
 
@@ -68,7 +65,7 @@ class CMatchingFace {
   bool operator<(const CMatchingFace& other) const;
 
   /*--- Member function, which sorts the coordinates of the face. ---*/
-  void SortFaceCoordinates(void);
+  void SortFaceCoordinates();
 
  private:
   /*--- Copy function, which copies the data of the given object into the current object. ---*/

Common/include/toolboxes/fem/CReorderElements.hpp

@@ -60,7 +60,7 @@ class CReorderElements {
   /*!
    * \brief Default constructor of the class. Disabled.
    */
-  CReorderElements(void) = delete;
+  CReorderElements() = delete;
 
   /*!
    * \brief Less than operator of the class. Needed for the sorting.
@@ -71,26 +71,26 @@ class CReorderElements {
    * \brief Function to make available the variable commSolution.
    * \return Whether or not the solution of the element must be communicated.
    */
-  inline bool GetCommSolution(void) const { return commSolution; }
+  inline bool GetCommSolution() const { return commSolution; }
 
   /*!
    * \brief Function to make available the element type of the element.
    * \return The value of elemType, which stores the VTK type, polynomial degree
              and whether or not the Jacobian is constant.
    */
-  inline unsigned short GetElemType(void) const { return elemType; }
+  inline unsigned short GetElemType() const { return elemType; }
 
   /*!
    * \brief Function to make available the global element ID.
    * \return The global element ID of the element.
    */
-  inline unsigned long GetGlobalElemID(void) const { return globalElemID; }
+  inline unsigned long GetGlobalElemID() const { return globalElemID; }
 
   /*!
    * \brief Function to make available the time level.
    * \return The time level of the element.
    */
-  inline unsigned short GetTimeLevel(void) const { return timeLevel; }
+  inline unsigned short GetTimeLevel() const { return timeLevel; }
 
   /*!
    * \brief Function, which sets the value of commSolution.

Common/include/toolboxes/fem/CSortBoundaryFaces.hpp

@@ -60,7 +60,7 @@ class CSortFaces {
   /*!
    * \brief Default constructor of the class. Disabled.
    */
-  CSortFaces(void) = delete;
+  CSortFaces() = delete;
 
   /*!
    * \brief Operator used for the comparison.

Common/include/toolboxes/fem/CSortFaces.hpp

@@ -29,7 +29,6 @@
 #include "../../include/toolboxes/classes_multiple_integers.hpp"
 #include "../../include/toolboxes/fem/CReorderElements.hpp"
 #include "../../include/toolboxes/fem/CSortFaces.hpp"
-#include "../../include/toolboxes/fem/CSortBoundaryFaces.hpp"
 #include "../../include/fem/fem_geometry_structure.hpp"
 #include "../../include/geometry/primal_grid/CPrimalGridFEM.hpp"
 #include "../../include/geometry/primal_grid/CPrimalGridBoundFEM.hpp"
@@ -2974,7 +2973,18 @@ void CMeshFEM_DG::CreateFaces(CConfig* config) {
          each time level. */
       for (unsigned short i = 0; i < nTimeLevels; ++i)
         sort(surfElem.begin() + boundaries[iMarker].nSurfElem[i],
-             surfElem.begin() + boundaries[iMarker].nSurfElem[i + 1], CSortBoundaryFaces());
+             surfElem.begin() + boundaries[iMarker].nSurfElem[i + 1],
+             [](const CSurfaceElementFEM& f0, const CSurfaceElementFEM& f1) {
+               /* First sorting criterion is the index of the standard element. The
+                  boundary faces should be sorted per standard element. Note that the
+                  time level is not taken into account here, because it is assumed that
+                  the surface elements to be sorted belong to one time level. */
+               if (f0.indStandardElement != f1.indStandardElement) return f0.indStandardElement < f1.indStandardElement;
+
+               /* The standard elements are the same. The second criterion is the
+                  corresponding volume IDs of the surface elements. */
+               return f0.volElemID < f1.volElemID;
+             });
     }
   }
 }

Common/src/fem/fem_geometry_structure.cpp

@@ -90,7 +90,7 @@ CFaceOfElement::CFaceOfElement(const unsigned short VTK_Type, const unsigned sho
     }
 
     default: {
-      ostringstream message;
+      std::ostringstream message;
       message << "Unknown VTK surface element type, " << VTK_Type;
       SU2_MPI::Error(message.str(), CURRENT_FUNCTION);
     }
@@ -151,7 +151,7 @@ void CFaceOfElement::CreateUniqueNumberingWithOrientation() {
          also the element information must be swapped, because element 0 is to
          the left of the face and element 1 to the right. */
       if (cornerPoints[1] < cornerPoints[0]) {
-        swap(cornerPoints[0], cornerPoints[1]);
+        std::swap(cornerPoints[0], cornerPoints[1]);
         swapElements = true;
       }
       break;
@@ -225,19 +225,19 @@ void CFaceOfElement::CreateUniqueNumberingWithOrientation() {
     }
 
     default: {
-      ostringstream message;
-      message << "Unknown surface element type with " << nCornerPoints << " corners." << endl;
+      std::ostringstream message;
+      message << "Unknown surface element type with " << nCornerPoints << " corners." << std::endl;
       SU2_MPI::Error(message.str(), CURRENT_FUNCTION);
     }
   }
 
   /* Swap the element information, if needed. */
   if (swapElements) {
-    swap(elemID0, elemID1);
-    swap(nPolyGrid0, nPolyGrid1);
-    swap(nPolySol0, nPolySol1);
-    swap(nDOFsElem0, nDOFsElem1);
-    swap(elemType0, elemType1);
-    swap(faceID0, faceID1);
+    std::swap(elemID0, elemID1);
+    std::swap(nPolyGrid0, nPolyGrid1);
+    std::swap(nPolySol0, nPolySol1);
+    std::swap(nDOFsElem0, nDOFsElem1);
+    std::swap(elemType0, elemType1);
+    std::swap(faceID0, faceID1);
   }
 }

Common/src/toolboxes/fem/CFaceOfElement.cpp

@@ -1,5 +1,4 @@
 common_src += files(['CFaceOfElement.cpp',
                      'CMatchingFace.cpp',
                      'CReorderElements.cpp',
-                     'CSortBoundaryFaces.cpp',
                      'CSortFaces.cpp'])