Merge remote-tracking branch 'upstream/develop' into feature_aero_thermo_elasticity

Author: pcarruscag

Common/include/CConfig.hpp

@@ -996,7 +996,9 @@ class CConfig {
   DV_Penalty;                       /*!< \brief Penalty weight to add a constraint to the total amount of stiffness. */
   unsigned long Nonphys_Points,     /*!< \brief Current number of non-physical points in the solution. */
   Nonphys_Reconstr;                 /*!< \brief Current number of non-physical reconstructions for 2nd-order upwinding. */
-  bool ParMETIS;                    /*!< \brief Boolean for activating ParMETIS mode (while testing). */
+  su2double ParMETIS_tolerance;     /*!< \brief Load balancing tolerance for ParMETIS. */
+  long ParMETIS_pointWgt;           /*!< \brief Load balancing weight given to points. */
+  long ParMETIS_edgeWgt;            /*!< \brief Load balancing weight given to edges. */
   unsigned short DirectDiff;        /*!< \brief Direct Differentation mode. */
   bool DiscreteAdjoint;                  /*!< \brief AD-based discrete adjoint mode. */
   unsigned long Wrt_Surf_Freq_DualTime;  /*!< \brief Writing surface solution frequency for Dual Time. */
@@ -9379,6 +9381,21 @@ class CConfig {
    */
   unsigned long GetEdgeColoringGroupSize(void) const { return edgeColorGroupSize; }
 
+  /*!
+   * \brief Get the ParMETIS load balancing tolerance.
+   */
+  passivedouble GetParMETIS_Tolerance() const { return SU2_TYPE::GetValue(ParMETIS_tolerance); }
+
+  /*!
+   * \brief Get the ParMETIS load balancing weight for points.
+   */
+  long GetParMETIS_PointWeight() const { return ParMETIS_pointWgt; }
+
+  /*!
+   * \brief Get the ParMETIS load balancing weight for edges
+   */
+  long GetParMETIS_EdgeWeight() const { return ParMETIS_edgeWgt; }
+
   /*!
    * \brief Find the marker index (if any) that is part of a given interface pair.
    * \param[in] iInterface - Number of the interface pair being tested, starting at 0.

Common/include/fem/fem_geometry_structure.hpp

@@ -880,7 +880,7 @@ class CMeshFEM_DG: public CMeshFEM {
   * \brief Set the send receive boundaries of the grid.
   * \param[in] config - Definition of the particular problem.
   */
-  void SetSendReceive(CConfig *config) override;
+  void SetSendReceive(const CConfig *config) override;
 
   /*!
    * \brief Set the local index that correspond with the global numbering index.

Common/include/geometry/CGeometry.hpp

@@ -137,8 +137,8 @@ class CGeometry {
 
 #if defined(HAVE_MPI) && defined(HAVE_PARMETIS)
   vector<vector<unsigned long> > adj_nodes; /*!< \brief Vector of vectors holding each node's adjacency during preparation for ParMETIS. */
-  idx_t *adjacency{nullptr}; /*!< \brief Local adjacency array to be input into ParMETIS for partitioning (idx_t is a ParMETIS type defined in their headers). */
-  idx_t *xadj{nullptr};      /*!< \brief Index array that points to the start of each node's adjacency in CSR format (needed to interpret the adjacency array).  */
+  vector<idx_t> adjacency; /*!< \brief Local adjacency array to be input into ParMETIS for partitioning (idx_t is a ParMETIS type defined in their headers). */
+  vector<idx_t> xadj;      /*!< \brief Index array that points to the start of each node's adjacency in CSR format (needed to interpret the adjacency array).  */
 #endif
 
   /*--- Turbomachinery variables ---*/
@@ -769,7 +769,7 @@ class CGeometry {
    * \brief A virtual member.
    * \param[in] config - Definition of the particular problem.
    */
-  inline virtual void SetColorGrid_Parallel(CConfig *config) {}
+  inline virtual void SetColorGrid_Parallel(const CConfig *config) {}
 
   /*!
    * \brief A virtual member.
@@ -789,7 +789,7 @@ class CGeometry {
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_domain - Number of domains for parallelization purposes.
    */
-  inline virtual void SetSendReceive(CConfig *config) {}
+  inline virtual void SetSendReceive(const CConfig *config) {}
 
   /*!
    * \brief A virtual member.

Common/include/geometry/CPhysicalGeometry.hpp

@@ -164,22 +164,22 @@ class CPhysicalGeometry final : public CGeometry {
    * \param[in] geometry - Definition of the geometry container holding the initial linear partitions of the grid + coloring.
    * \param[in] config - Definition of the particular problem.
    */
-  void DistributeColoring(CConfig *config, CGeometry *geometry);
+  void DistributeColoring(const CConfig *config, CGeometry *geometry);
 
   /*!
    * \brief Distribute the grid points, including ghost points, across all ranks based on a ParMETIS coloring.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    */
-  void DistributePoints(CConfig *config, CGeometry *geometry);
+  void DistributePoints(const CConfig *config, CGeometry *geometry);
 
   /*!
    * \brief Distribute the connectivity for a single volume element type across all ranks based on a ParMETIS coloring.
    * \param[in] config - Definition of the particular problem.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] Elem_Type - VTK index of the element type being distributed.
    */
-  void DistributeVolumeConnectivity(CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
+  void DistributeVolumeConnectivity(const CConfig *config, CGeometry *geometry, unsigned short Elem_Type);
 
   /*!
    * \brief Distribute the connectivity for a single surface element type in all markers across all ranks based on a ParMETIS coloring.
@@ -273,21 +273,17 @@ class CPhysicalGeometry final : public CGeometry {
    * \brief Routine to sort the adjacency for ParMETIS for graph partitioning in parallel.
    * \param[in] config - Definition of the particular problem.
    */
-  void SortAdjacency(CConfig *config);
+  void SortAdjacency(const CConfig *config);
 
   /*!
    * \brief Set the send receive boundaries of the grid.
-   * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] val_domain - Number of domains for parallelization purposes.
    */
-  void SetSendReceive(CConfig *config) override;
+  void SetSendReceive(const CConfig *config) override;
 
   /*!
    * \brief Set the send receive boundaries of the grid.
-   * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] val_domain - Number of domains for parallelization purposes.
    */
   void SetBoundaries(CConfig *config) override;
 
@@ -373,7 +369,7 @@ class CPhysicalGeometry final : public CGeometry {
    * \brief Prepares the grid point adjacency based on a linearly partitioned mesh object needed by ParMETIS for graph partitioning in parallel.
    * \param[in] config - Definition of the particular problem.
    */
-  void PrepareAdjacency(CConfig *config);
+  void PrepareAdjacency(const CConfig *config);
 
   /*!
    * \brief Find repeated nodes between two elements to identify the common face.
@@ -533,7 +529,7 @@ class CPhysicalGeometry final : public CGeometry {
    * \brief Set the domains for grid grid partitioning using ParMETIS.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetColorGrid_Parallel(CConfig *config) override;
+  void SetColorGrid_Parallel(const CConfig *config) override;
 
   /*!
    * \brief Set the domains for FEM grid partitioning using ParMETIS.

Common/src/CConfig.cpp

@@ -2666,8 +2666,14 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Number of zones of the problem */
   addPythonOption("NZONES");
 
-  /* DESCRIPTION: Activate ParMETIS mode for testing */
-  addBoolOption("PARMETIS", ParMETIS, false);
+  /* DESCRIPTION: ParMETIS load balancing tolerance */
+  addDoubleOption("PARMETIS_TOLERANCE", ParMETIS_tolerance, 0.02);
+
+  /* DESCRIPTION: ParMETIS load balancing weight for points */
+  addLongOption("PARMETIS_POINT_WEIGHT", ParMETIS_pointWgt, 0);
+
+  /* DESCRIPTION: ParMETIS load balancing weight for edges (equiv. to neighbors) */
+  addLongOption("PARMETIS_EDGE_WEIGHT", ParMETIS_edgeWgt, 1);
 
   /*--- options that are used in the Hybrid RANS/LES Simulations  ---*/
   /*!\par CONFIG_CATEGORY:Hybrid_RANSLES Options\ingroup Config*/

Common/src/fem/fem_geometry_structure.cpp

@@ -3443,7 +3443,7 @@ void CMeshFEM_DG::CreateStandardVolumeElements(CConfig *config) {
   }
 }
 
-void CMeshFEM_DG::SetSendReceive(CConfig *config) {
+void CMeshFEM_DG::SetSendReceive(const CConfig *config) {
 
   /*----------------------------------------------------------------------------*/
   /*--- Step 1: Determine the ranks from which this rank has to receive data ---*/