Neighbor_Elements is unique_ptr<long[]>

Author: Max Aehle

Common/include/geometry/primal_grid/CPrimalGrid.hpp

@@ -52,7 +52,7 @@ class CPrimalGrid {
    * If this is a boundary element, store the index of the incident domain element. */
   unsigned long GlobalIndex_DomainElement;
   bool gi;
-  vector<long> Neighbor_Elements;      /*!< \brief Vector to store the elements surronding an element. */
+  unique_ptr<long[]> Neighbor_Elements;      /*!< \brief Vector to store the elements surronding an element. */
   su2double Coord_CG[3] = {0.0}; /*!< \brief Coordinates of the center-of-gravity of the element. */
 
   su2double Volume;                /*!< \brief Volume of the element. */
@@ -72,8 +72,9 @@ class CPrimalGrid {
    * \brief Constructor of the class.
    * \param[in] FEM - Whether this is a FEM element.
    * \param[in] nNodes - Number of nodes.
+   * \param[in] nNeighbor_Elements - Number of neighbor elements.
    */
-  CPrimalGrid(bool FEM, unsigned short nNodes);
+  CPrimalGrid(bool FEM, unsigned short nNodes, unsigned short nNeighbor_Elements);
 
   /*!
    * \brief Destructor of the class.
@@ -463,7 +464,7 @@ template<typename Connectivity>
 class CPrimalGridWithConnectivity : public CPrimalGrid {
 public:
 
-  CPrimalGridWithConnectivity(bool FEM) : CPrimalGrid(FEM, Connectivity::nNodes) {}
+  CPrimalGridWithConnectivity(bool FEM) : CPrimalGrid(FEM, Connectivity::nNodes, Connectivity::nFaces) {}
 
   inline unsigned short GetnNodes() const final {
     return Connectivity::nNodes;

Common/src/geometry/primal_grid/CHexahedron.cpp

@@ -48,9 +48,6 @@ CHexahedron::CHexahedron(unsigned long val_point_0, unsigned long val_point_1,
   Nodes[2] = val_point_2; Nodes[3] = val_point_3;
   Nodes[4] = val_point_4; Nodes[5] = val_point_5;
   Nodes[6] = val_point_6; Nodes[7] = val_point_7;
-
-  /*--- Allocate and define neighbor elements to a element ---*/
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CHexahedron::~CHexahedron() {}

Common/src/geometry/primal_grid/CPrimalGrid.cpp

@@ -27,9 +27,15 @@
 
 #include "../../../include/geometry/primal_grid/CPrimalGrid.hpp"
 
-CPrimalGrid::CPrimalGrid(bool FEM, unsigned short nNodes) : FEM(FEM), Nodes(new unsigned long[nNodes]) {
+CPrimalGrid::CPrimalGrid(bool FEM, unsigned short nNodes, unsigned short nNeighbor_Elements) :
+  FEM(FEM),
+  Nodes(new unsigned long[nNodes]),
+  Neighbor_Elements(new long[nNeighbor_Elements])
+{
 
   GlobalIndex_DomainElement = 0;
+  for(unsigned short i=0; i<nNeighbor_Elements; i++)
+    Neighbor_Elements[i] = -1;
   gi =true;
 
 }
@@ -47,10 +53,11 @@ void CPrimalGrid::GetAllNeighbor_Elements() const {
 
 void CPrimalGrid::InitializeNeighbors(unsigned short val_nFaces) {
 
-  /*--- Allocate the memory for Neighbor_Elements and
-        initialize the arrays to -1 to indicate that no neighbor is present and
+  /*--- Initialize arrays to -1/false to indicate that no neighbor is present and
         that no periodic transformation is needed to the neighbor. ---*/
-  Neighbor_Elements.resize(val_nFaces,-1);
-  for(size_t i=0; i<val_nFaces; i++) PeriodIndexNeighbors[i] = -1;
+  for(size_t i=0; i<val_nFaces; i++){
+    Neighbor_Elements[i] = -1;
+    PeriodIndexNeighbors[i] = -1;
+  }
   ElementOwnsFace.reset();
 }

Common/src/geometry/primal_grid/CPrimalGridBoundFEM.cpp

@@ -32,7 +32,7 @@ CPrimalGridBoundFEM::CPrimalGridBoundFEM(unsigned long         val_elemGlobalID,
                                          unsigned short        val_VTK_Type,
                                          unsigned short        val_nPolyGrid,
                                          unsigned short        val_nDOFsGrid,
-                                         vector<unsigned long> &val_nodes): CPrimalGrid(true, val_nDOFsGrid)
+                                         vector<unsigned long> &val_nodes): CPrimalGrid(true, val_nDOFsGrid, 1)
 {
   /*--- Store the integer data in the member variables of this object. ---*/
   VTK_Type = val_VTK_Type;

Common/src/geometry/primal_grid/CPrimalGridFEM.cpp

@@ -30,7 +30,7 @@
 CPrimalGridFEM::CPrimalGridFEM(unsigned long  val_elemGlobalID, unsigned short val_VTK_Type,
                                unsigned short val_nPolyGrid,    unsigned short val_nPolySol,
                                unsigned short val_nDOFsGrid,    unsigned short val_nDOFsSol,
-                               unsigned long  val_offDOfsSol,   istringstream  &elem_line) : CPrimalGrid(true, val_nDOFsGrid)
+                               unsigned long  val_offDOfsSol,   istringstream  &elem_line) : CPrimalGrid(true, val_nDOFsGrid, nFacesOfElementType(val_VTK_Type))
 {
   /*--- Store the integer data in the member variables of this object. ---*/
   VTK_Type = val_VTK_Type;
@@ -75,7 +75,7 @@ CPrimalGridFEM::CPrimalGridFEM(unsigned long  val_elemGlobalID, unsigned short v
 CPrimalGridFEM::CPrimalGridFEM(unsigned long  val_elemGlobalID, unsigned short val_VTK_Type,
                                unsigned short val_nPolyGrid,    unsigned short val_nPolySol,
                                unsigned short val_nDOFsGrid,    unsigned short val_nDOFsSol,
-                               unsigned long  val_offDOfsSol,   const unsigned long *connGrid): CPrimalGrid(true, val_nDOFsGrid)
+                               unsigned long  val_offDOfsSol,   const unsigned long *connGrid): CPrimalGrid(true, val_nDOFsGrid, nFacesOfElementType(val_VTK_Type))
 {
   /*--- Store the integer data in the member variables of this object. ---*/
   VTK_Type = val_VTK_Type;

Common/src/geometry/primal_grid/CPrism.cpp

@@ -50,9 +50,6 @@ CPrism::CPrism(unsigned long val_point_0, unsigned long val_point_1,
   Nodes[3] = val_point_3;
   Nodes[4] = val_point_4;
   Nodes[5] = val_point_5;
-
-  /*--- Allocate and define neighbor elements to a element ---*/
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CPrism::~CPrism() {}

Common/src/geometry/primal_grid/CPyramid.cpp

@@ -48,9 +48,6 @@ CPyramid::CPyramid(unsigned long val_point_0, unsigned long val_point_1,
   Nodes[2] = val_point_2;
   Nodes[3] = val_point_3;
   Nodes[4] = val_point_4;
-
-  /*--- Allocate and define neighbor elements to a element ---*/
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CPyramid::~CPyramid() {}

Common/src/geometry/primal_grid/CQuadrilateral.cpp

@@ -46,8 +46,6 @@ CQuadrilateral::CQuadrilateral(unsigned long val_point_0, unsigned long val_poin
   Nodes[1] = val_point_1;
   Nodes[2] = val_point_2;
   Nodes[3] = val_point_3;
-
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CQuadrilateral::~CQuadrilateral() {}

Common/src/geometry/primal_grid/CTetrahedron.cpp

@@ -46,9 +46,6 @@ CTetrahedron::CTetrahedron(unsigned long val_point_0, unsigned long val_point_1,
   Nodes[1] = val_point_1;
   Nodes[2] = val_point_2;
   Nodes[3] = val_point_3;
-
-  /*--- Allocate and define neighbor elements to a element ---*/
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CTetrahedron::~CTetrahedron() {}

Common/src/geometry/primal_grid/CTriangle.cpp

@@ -45,9 +45,6 @@ CTriangle::CTriangle(unsigned long val_point_0, unsigned long val_point_1,
   Nodes[0] = val_point_0;
   Nodes[1] = val_point_1;
   Nodes[2] = val_point_2;
-
-  /*--- Allocate and define neighbor elements to a element ---*/
-  Neighbor_Elements.resize(GetnFaces(),-1);
 }
 
 CTriangle::~CTriangle() {}