Changed the work estimates for ParMetis to passivedouble

Author: vdweide

Common/include/fem/fem_standard_element.hpp

@@ -990,7 +990,7 @@ class CFEMStandardElement : public CFEMStandardElementBase {
            type. This information is used to determine a well balanced partition.
   * \param[in] config - Object, which contains the input parameters.
   */
-  su2double WorkEstimateMetis(CConfig* config);
+  passivedouble WorkEstimateMetis(CConfig* config);
 
  private:
   /*!
@@ -1420,7 +1420,7 @@ class CFEMStandardInternalFace : public CFEMStandardElementBase {
            type. This information is used to determine a well balanced partition.
   * \param[in] config - Object, which contains the input parameters.
   */
-  su2double WorkEstimateMetis(CConfig* config);
+  passivedouble WorkEstimateMetis(CConfig* config);
 
  private:
   /*!
@@ -1636,7 +1636,7 @@ class CFEMStandardBoundaryFace : public CFEMStandardElementBase {
            type. This information is used to determine a well balanced partition.
   * \param[in] config - Object, which contains the input parameters.
   */
-  su2double WorkEstimateMetis(CConfig* config);
+  passivedouble WorkEstimateMetis(CConfig* config);
 
   /*!
   * \brief Function, which estimates the additional amount of work for an element
@@ -1645,7 +1645,7 @@ class CFEMStandardBoundaryFace : public CFEMStandardElementBase {
   * \param[in] config    - Object, which contains the input parameters.
   * \param[in] nPointsWF - Number of points to discretize the wall model.
   */
-  su2double WorkEstimateMetisWallFunctions(CConfig* config, const unsigned short nPointsWF);
+  passivedouble WorkEstimateMetisWallFunctions(CConfig* config, const unsigned short nPointsWF);
 
  private:
   /*!

Common/src/fem/fem_work_estimate_metis.cpp

@@ -28,22 +28,22 @@
 
 #include "../../include/fem/fem_standard_element.hpp"
 
-su2double CFEMStandardElement::WorkEstimateMetis(CConfig* config) {
+passivedouble CFEMStandardElement::WorkEstimateMetis(CConfig* config) {
   /* TEMPORARY IMPLEMENTATION. */
   return nIntegration + 0.1 * nDOFs;
 }
 
-su2double CFEMStandardInternalFace::WorkEstimateMetis(CConfig* config) {
+passivedouble CFEMStandardInternalFace::WorkEstimateMetis(CConfig* config) {
   /* TEMPORARY IMPLEMENTATION. */
   return 2.0 * nIntegration + 0.05 * (nDOFsFaceSide0 + nDOFsFaceSide1);
 }
 
-su2double CFEMStandardBoundaryFace::WorkEstimateMetis(CConfig* config) {
+passivedouble CFEMStandardBoundaryFace::WorkEstimateMetis(CConfig* config) {
   /* TEMPORARY IMPLEMENTATION. */
   return nIntegration + 0.05 * nDOFsFace;
 }
 
-su2double CFEMStandardBoundaryFace::WorkEstimateMetisWallFunctions(CConfig* config, const unsigned short nPointsWF) {
+passivedouble CFEMStandardBoundaryFace::WorkEstimateMetisWallFunctions(CConfig* config, const unsigned short nPointsWF) {
   /* TEMPORARY IMPLEMENTATION. */
   return 0.25 * nIntegration * nPointsWF;
 }

Common/src/geometry/CPhysicalGeometryFEM.cpp

@@ -1162,13 +1162,13 @@ void CPhysicalGeometry::DetermineFEMColorsViaParMETIS(vector<vector<unsigned lon
 
     /* Create the vertex weights in ParMETIS format. */
     vector<idx_t> vwgtPar(nElem * ncon);
-    for (unsigned long i = 0; i < nElem * ncon; ++i) vwgtPar[i] = (idx_t)ceil(vwgt[i]);
+    for (unsigned long i = 0; i < nElem * ncon; ++i) vwgtPar[i] = static_cast<idx_t>(ceil(vwgt[i]));
 
     /* Create the adjacency weight in ParMETIS format. */
     vector<idx_t> adjwgtPar(xadjPar[nElem]);
     ii = 0;
     for (unsigned long i = 0; i < nElem; ++i) {
-      for (unsigned long j = 0; j < adjwgt[i].size(); ++j, ++ii) adjwgtPar[ii] = (idx_t)ceil(adjwgt[i][j]);
+      for (unsigned long j = 0; j < adjwgt[i].size(); ++j, ++ii) adjwgtPar[ii] = static_cast<idx_t>(ceil(adjwgt[i][j]));
     }
 
     /* Make sure that an equal distribution is obtained. */
@@ -2960,12 +2960,13 @@ void CPhysicalGeometry::DetermineFEMGraphWeights(
 
   /*--- Determine the minimum of the workload of the elements, i.e. 1st vertex
         weight, over the entire domain. ---*/
-  su2double minvwgt = vwgt[0];
+  passivedouble minvwgt = vwgt[0];
   for (unsigned long i = 0; i < nElem; ++i) minvwgt = min(minvwgt, vwgt[2 * i]);
 
 #ifdef HAVE_MPI
-  su2double locminvwgt = minvwgt;
-  SU2_MPI::Allreduce(&locminvwgt, &minvwgt, 1, MPI_DOUBLE, MPI_MIN, SU2_MPI::GetComm());
+  su2double locminvwgt = minvwgt, globminvwgt;
+  SU2_MPI::Allreduce(&locminvwgt, &globminvwgt, 1, MPI_DOUBLE, MPI_MIN, SU2_MPI::GetComm());
+  minvwgt = SU2_TYPE::GetValue(globminvwgt);
 #endif
 
   /*--- Scale the workload of the elements, the 1st vertex weight, with the