move inits of CGeometry and co. to declaration

Author: pcarruscag

Common/include/fem/fem_geometry_structure.hpp

@@ -442,8 +442,8 @@ struct CBoundaryFEM {
  */
 class CMeshFEM: public CGeometry {
 protected:
-  unsigned long nVolElemTot;    /*!< \brief Total number of local volume elements, including halos. */
-  unsigned long nVolElemOwned;  /*!< \brief Number of owned local volume elements. */
+  unsigned long nVolElemTot{0};    /*!< \brief Total number of local volume elements, including halos. */
+  unsigned long nVolElemOwned{0};  /*!< \brief Number of owned local volume elements. */
 
   vector<unsigned long> nVolElemOwnedPerTimeLevel;    /*!< \brief Number of owned local volume elements
                                                                   per time level. Cumulative storage. */
@@ -489,13 +489,13 @@ class CMeshFEM: public CGeometry {
   vector<CFEMStandardBoundaryFace> standardBoundaryFacesGrid; /*!< \brief Vector that contains the standard boundary
                                                                           faces used for the geometry of the DG solver. */
 
-  CBlasStructure *blasFunctions; /*!< \brief  Pointer to the object to carry out the BLAS functionalities. */
+  CBlasStructure *blasFunctions{nullptr}; /*!< \brief  Pointer to the object to carry out the BLAS functionalities. */
 
 public:
   /*!
   * \brief Constructor of the class.
   */
- CMeshFEM(void) : CGeometry() { blasFunctions = nullptr; }
+ CMeshFEM(void) : CGeometry() { }
 
   /*!
   * \overload
@@ -1250,9 +1250,4 @@ class CDummyMeshFEM_DG : public CMeshFEM_DG {
    */
   CDummyMeshFEM_DG(CConfig *config);
 
-  /*!
-	 * \brief Destructor of the class.
-	 */
-  ~CDummyMeshFEM_DG() override;
-
 };

Common/include/geometry/CDummyGeometry.hpp

@@ -45,10 +45,5 @@ class CDummyGeometry final : public CGeometry{
    */
   CDummyGeometry(CConfig *config);
 
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CDummyGeometry() override;
-
 };
 

Common/include/geometry/CGeometry.hpp

@@ -54,11 +54,6 @@ class CMultiGridGeometry final : public CGeometry {
    */
   CMultiGridGeometry(CGeometry **geometry, CConfig *config_container, unsigned short iMesh);
 
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CMultiGridGeometry(void) override;
-
   /*!
    * \brief Determine if a CVPoint van be agglomerated, if it have the same marker point as the seed.
    * \param[in] CVPoint - Control volume to be agglomerated.

Common/include/geometry/CMultiGridGeometry.hpp

@@ -39,71 +39,71 @@
 class CPhysicalGeometry final : public CGeometry {
 
   unordered_map<unsigned long, unsigned long>
-  Global_to_Local_Point;                    /*!< \brief Global-local indexation for the points. */
-  long *Local_to_Global_Point;              /*!< \brief Local-global indexation for the points. */
-  unsigned short *Local_to_Global_Marker;   /*!< \brief Local to Global marker. */
-  unsigned short *Global_to_Local_Marker;   /*!< \brief Global to Local marker. */
-  unsigned long *adj_counter;               /*!< \brief Adjacency counter. */
-  unsigned long **adjacent_elem;            /*!< \brief Adjacency element list. */
-  su2activematrix Sensitivity;              /*!< \brief Matrix holding the sensitivities at each point. */
+  Global_to_Local_Point;                           /*!< \brief Global-local indexation for the points. */
+  long *Local_to_Global_Point{nullptr};            /*!< \brief Local-global indexation for the points. */
+  unsigned short *Local_to_Global_Marker{nullptr}; /*!< \brief Local to Global marker. */
+  unsigned short *Global_to_Local_Marker{nullptr}; /*!< \brief Global to Local marker. */
+  unsigned long *adj_counter{nullptr};             /*!< \brief Adjacency counter. */
+  unsigned long **adjacent_elem{nullptr};          /*!< \brief Adjacency element list. */
+  su2activematrix Sensitivity;                     /*!< \brief Matrix holding the sensitivities at each point. */
 
   vector<vector<unsigned long> > Neighbors;
   unordered_map<unsigned long, unsigned long> Color_List;
   vector<string> Marker_Tags;
-  unsigned long nLocal_Point,
-  nLocal_PointDomain,
-  nLocal_PointGhost,
-  nLocal_PointPeriodic,
-  nLocal_Elem,
-  nLocal_Bound_Elem,
-  nGlobal_Elem,
-  nGlobal_Bound_Elem,
-  nLocal_Line,
-  nLocal_BoundTria,
-  nLocal_BoundQuad,
-  nLinear_Line,
-  nLinear_BoundTria,
-  nLinear_BoundQuad,
-  nLocal_Tria,
-  nLocal_Quad,
-  nLocal_Tetr,
-  nLocal_Hexa,
-  nLocal_Pris,
-  nLocal_Pyra;
-  unsigned long nMarker_Global;
-  su2double *Local_Coords;
-  unsigned long *Local_Points;
-  unsigned long *Local_Colors;
-  unsigned long *Conn_Line;
-  unsigned long *Conn_BoundTria;
-  unsigned long *Conn_BoundQuad;
-  unsigned long *Conn_Line_Linear;
-  unsigned long *Conn_BoundTria_Linear;
-  unsigned long *Conn_BoundQuad_Linear;
-  unsigned long *Conn_Tria;
-  unsigned long *Conn_Quad;
-  unsigned long *Conn_Tetr;
-  unsigned long *Conn_Hexa;
-  unsigned long *Conn_Pris;
-  unsigned long *Conn_Pyra;
-  unsigned long *ID_Line;
-  unsigned long *ID_BoundTria;
-  unsigned long *ID_BoundQuad;
-  unsigned long *ID_Line_Linear;
-  unsigned long *ID_BoundTria_Linear;
-  unsigned long *ID_BoundQuad_Linear;
-  unsigned long *ID_Tria;
-  unsigned long *ID_Quad;
-  unsigned long *ID_Tetr;
-  unsigned long *ID_Hexa;
-  unsigned long *ID_Pris;
-  unsigned long *ID_Pyra;
-  unsigned long *Elem_ID_Line;
-  unsigned long *Elem_ID_BoundTria;
-  unsigned long *Elem_ID_BoundQuad;
-  unsigned long *Elem_ID_Line_Linear;
-  unsigned long *Elem_ID_BoundTria_Linear;
-  unsigned long *Elem_ID_BoundQuad_Linear;
+  unsigned long nLocal_Point{0},
+  nLocal_PointDomain{0},
+  nLocal_PointGhost{0},
+  nLocal_PointPeriodic{0},
+  nLocal_Elem{0},
+  nLocal_Bound_Elem{0},
+  nGlobal_Elem{0},
+  nGlobal_Bound_Elem{0},
+  nLocal_Line{0},
+  nLocal_BoundTria{0},
+  nLocal_BoundQuad{0},
+  nLinear_Line{0},
+  nLinear_BoundTria{0},
+  nLinear_BoundQuad{0},
+  nLocal_Tria{0},
+  nLocal_Quad{0},
+  nLocal_Tetr{0},
+  nLocal_Hexa{0},
+  nLocal_Pris{0},
+  nLocal_Pyra{0};
+  unsigned long nMarker_Global{0};
+  su2double *Local_Coords{nullptr};
+  unsigned long *Local_Points{nullptr};
+  unsigned long *Local_Colors{nullptr};
+  unsigned long *Conn_Line{nullptr};
+  unsigned long *Conn_BoundTria{nullptr};
+  unsigned long *Conn_BoundQuad{nullptr};
+  unsigned long *Conn_Line_Linear{nullptr};
+  unsigned long *Conn_BoundTria_Linear{nullptr};
+  unsigned long *Conn_BoundQuad_Linear{nullptr};
+  unsigned long *Conn_Tria{nullptr};
+  unsigned long *Conn_Quad{nullptr};
+  unsigned long *Conn_Tetr{nullptr};
+  unsigned long *Conn_Hexa{nullptr};
+  unsigned long *Conn_Pris{nullptr};
+  unsigned long *Conn_Pyra{nullptr};
+  unsigned long *ID_Line{nullptr};
+  unsigned long *ID_BoundTria{nullptr};
+  unsigned long *ID_BoundQuad{nullptr};
+  unsigned long *ID_Line_Linear{nullptr};
+  unsigned long *ID_BoundTria_Linear{nullptr};
+  unsigned long *ID_BoundQuad_Linear{nullptr};
+  unsigned long *ID_Tria{nullptr};
+  unsigned long *ID_Quad{nullptr};
+  unsigned long *ID_Tetr{nullptr};
+  unsigned long *ID_Hexa{nullptr};
+  unsigned long *ID_Pris{nullptr};
+  unsigned long *ID_Pyra{nullptr};
+  unsigned long *Elem_ID_Line{nullptr};
+  unsigned long *Elem_ID_BoundTria{nullptr};
+  unsigned long *Elem_ID_BoundQuad{nullptr};
+  unsigned long *Elem_ID_Line_Linear{nullptr};
+  unsigned long *Elem_ID_BoundTria_Linear{nullptr};
+  unsigned long *Elem_ID_BoundQuad_Linear{nullptr};
 
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/

Common/include/geometry/CPhysicalGeometry.hpp

@@ -78,6 +78,7 @@ class CSysMatrix {
 
   enum { OMP_MAX_SIZE_L = 8192 };   /*!< \brief Max. chunk size used in light parallel for loops. */
   enum { OMP_MAX_SIZE_H = 512 };    /*!< \brief Max. chunk size used in heavy parallel for loops. */
+  enum { OMP_MIN_SIZE = 32 };       /*!< \brief Chunk size for finer grain operations. */
   unsigned long omp_light_size;     /*!< \brief Actual chunk size used in light loops (e.g. over non zeros). */
   unsigned long omp_heavy_size;     /*!< \brief Actual chunk size used in heavy loops (e.g. over rows). */
   unsigned long omp_num_parts;      /*!< \brief Number of threads used in thread-parallel LU_SGS and ILU. */

Common/include/linear_algebra/CSysMatrix.hpp

@@ -161,7 +161,7 @@ inline size_t computeStaticChunkSize(size_t totalWork,
 template<class T, class U>
 void parallelCopy(size_t size, const T* src, U* dst)
 {
-  SU2_OMP_FOR_STAT(4096)
+  SU2_OMP_FOR_STAT(2048)
   for(size_t i=0; i<size; ++i) dst[i] = src[i];
 }
 
@@ -174,7 +174,7 @@ void parallelCopy(size_t size, const T* src, U* dst)
 template<class T, class U>
 void parallelSet(size_t size, T val, U* dst)
 {
-  SU2_OMP_FOR_STAT(4096)
+  SU2_OMP_FOR_STAT(2048)
   for(size_t i=0; i<size; ++i) dst[i] = val;
 }
 

Common/include/omp_structure.hpp

@@ -6867,122 +6867,15 @@ void CMeshFEM_DG::InitStaticMeshMovement(CConfig              *config,
 
 CDummyMeshFEM_DG::CDummyMeshFEM_DG(CConfig *config): CMeshFEM_DG() {
 
-  size = SU2_MPI::GetSize();
-  rank = SU2_MPI::GetRank();
-
-  nEdge      = 0;
-  nPoint     = 0;
-  nPointDomain = 0;
-  nPointNode = 0;
-  nElem      = 0;
-  nMarker    = 0;
   nZone = config->GetnZone();
 
-  nVolElemOwned = 0;
-  nVolElemTot = 0;
+  nPoint_P2PSend = new int[size] ();
+  nPoint_P2PRecv = new int[size] ();
 
-  nElem_Bound         = nullptr;
-  Tag_to_Marker       = nullptr;
-  elem                = nullptr;
-  face                = nullptr;
-  bound               = nullptr;
-  nodes               = nullptr;
-  edges               = nullptr;
-  vertex              = nullptr;
-  nVertex             = nullptr;
-  newBound            = nullptr;
-  nNewElem_Bound      = nullptr;
-  Marker_All_SendRecv = nullptr;
-
-  XCoordList.clear();
-  Xcoord_plane.clear();
-  Ycoord_plane.clear();
-  Zcoord_plane.clear();
-  FaceArea_plane.clear();
-  Plane_points.clear();
-
-  /*--- Arrays for defining the linear partitioning ---*/
-
-  beg_node = nullptr;
-  end_node = nullptr;
-
-  nPointLinear     = nullptr;
-  nPointCumulative = nullptr;
-
-  /*--- Containers for customized boundary conditions ---*/
-
-  CustomBoundaryHeatFlux = nullptr;      //Customized heat flux wall
-  CustomBoundaryTemperature = nullptr;   //Customized temperature wall
-
-  /*--- MPI point-to-point data structures ---*/
-
-  nP2PSend = 0;
-  nP2PRecv = 0;
-
-  maxCountPerPoint = 0;
-
-  bufD_P2PSend = nullptr;
-  bufD_P2PRecv = nullptr;
-
-  bufS_P2PSend = nullptr;
-  bufS_P2PRecv = nullptr;
-
-  req_P2PSend = nullptr;
-  req_P2PRecv = nullptr;
-
-  nPoint_P2PSend = new int[size];
-  nPoint_P2PRecv = new int[size];
-
-  Neighbors_P2PSend = nullptr;
-  Neighbors_P2PRecv = nullptr;
-
-  Local_Point_P2PSend = nullptr;
-  Local_Point_P2PRecv = nullptr;
-
-  /*--- MPI periodic data structures ---*/
-
-  nPeriodicSend = 0;
-  nPeriodicRecv = 0;
-
-  maxCountPerPeriodicPoint = 0;
-
-  bufD_PeriodicSend = nullptr;
-  bufD_PeriodicRecv = nullptr;
-
-  bufS_PeriodicSend = nullptr;
-  bufS_PeriodicRecv = nullptr;
-
-  req_PeriodicSend = nullptr;
-  req_PeriodicRecv = nullptr;
-
-  nPoint_PeriodicSend = nullptr;
-  nPoint_PeriodicRecv = nullptr;
-
-  Neighbors_PeriodicSend = nullptr;
-  Neighbors_PeriodicRecv = nullptr;
-
-  Local_Point_PeriodicSend = nullptr;
-  Local_Point_PeriodicRecv = nullptr;
-
-  Local_Marker_PeriodicSend = nullptr;
-  Local_Marker_PeriodicRecv = nullptr;
-
-  nVertex = new unsigned long[config->GetnMarker_All()];
-
-  for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++){
-    nVertex[iMarker] = 0;
-  }
+  nVertex = new unsigned long[config->GetnMarker_All()] ();
 
   Tag_to_Marker = new string[config->GetnMarker_All()];
 
-  this->nDim = nDim;
-
-
-  for (unsigned short iRank = 0; iRank < size; iRank++){
-    nPoint_P2PRecv[iRank] = 0;
-    nPoint_P2PSend[iRank] = 0;
-  }
-
   for (unsigned short i=0; i <= config->GetnLevels_TimeAccurateLTS(); i++){
     nMatchingFacesWithHaloElem.push_back(0);
   }
@@ -6992,5 +6885,3 @@ CDummyMeshFEM_DG::CDummyMeshFEM_DG(CConfig *config): CMeshFEM_DG() {
   nDim = CConfig::GetnDim(config->GetMesh_FileName(), config->GetMesh_FileFormat());
 
 }
-
-CDummyMeshFEM_DG::~CDummyMeshFEM_DG(){}

Common/src/fem/fem_geometry_structure.cpp

@@ -508,8 +508,7 @@ void CPhysicalGeometry::Read_SU2_Format_Parallel_FEM(CConfig        *config,
       }
 
       /*--- Allocate space for elements ---*/
-      elem = new CPrimalGrid*[nElem];
-      for (unsigned long i = 0; i < nElem; i++) elem[i] = nullptr;
+      elem = new CPrimalGrid*[nElem] ();
 
       /*--- Loop over all the elements and store the elements to be stored on
             this rank. Furthermore, determine the total amount of DOFs for
@@ -984,8 +983,7 @@ void CPhysicalGeometry::Read_CGNS_Format_Parallel_FEM(CConfig        *config,
   }
 
   /*--- Allocate space for elements ---*/
-  elem = new CPrimalGrid*[nElem];
-  for(unsigned long i=0; i<nElem; ++i) elem[i] = NULL;
+  elem = new CPrimalGrid*[nElem] ();
 
   /*--- Loop over over the connectivities and read the elements to be stored on
         this rank. Furthermore, determine the local amount of DOFs for the