fix bug in signature of Allgatherv in base mpi wrapper

Author: pcarruscag

Common/include/CConfig.hpp

@@ -5089,7 +5089,7 @@ class CConfig {
    * Gradients are w.r.t density, velocity[3], and pressure. when 2D gradient w.r.t. 3rd component of velocity set to 0.
    */
   su2double GetCoeff_ObjChainRule(unsigned short iVar) const { return Obj_ChainRuleCoeff[iVar]; }
- 
+
   /*!
    * \author H. Kline
    * \brief Get the flag indicating whether to comput a combined objective.
@@ -6781,7 +6781,7 @@ class CConfig {
    * \brief Get the type of wall and roughness height on a wall boundary (Heatflux or Isothermal).
    * \param[in] val_index - Index corresponding to the boundary.
    * \return The wall type and roughness height.
-   */ 
+   */
   pair<unsigned short, su2double> GetWallRoughnessProperties(string val_marker) const;
 
   /*!

Common/include/geometry/CPhysicalGeometry.hpp

@@ -105,8 +105,9 @@ class CPhysicalGeometry final : public CGeometry {
   unsigned long *Elem_ID_Line_Linear{nullptr};
   unsigned long *Elem_ID_BoundTria_Linear{nullptr};
   unsigned long *Elem_ID_BoundQuad_Linear{nullptr};
-  int *GlobalMarkerStorageDispl{nullptr};
-  su2double *GlobalRoughness_Height{nullptr};
+
+  vector<int> GlobalMarkerStorageDispl;
+  vector<su2double> GlobalRoughness_Height;
 
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/

Common/include/mpi_structure.hpp

@@ -417,7 +417,7 @@ class CBaseMPIWrapper {
                         void *recvbuf, int recvcnt, Datatype recvtype, Comm comm);
 
   static void Allgatherv(void *sendbuf, int sendcnt, Datatype sendtype,
-                         void *recvbuf, int recvcnt, int *displs, Datatype recvtype, Comm comm);
+                         void *recvbuf, int *recvcnt, int *displs, Datatype recvtype, Comm comm);
 
   static void Sendrecv(void *sendbuf, int sendcnt, Datatype sendtype,
                        int dest, int sendtag, void *recvbuf, int recvcnt,

Common/include/mpi_structure.inl

@@ -612,7 +612,7 @@ inline void CBaseMPIWrapper::Scatter(void *sendbuf, int sendcnt, Datatype sendty
 }
 
 inline void CBaseMPIWrapper::Allgatherv(void *sendbuf, int sendcnt, Datatype sendtype,
-                                   void *recvbuf, int recvcnt, int *displs, Datatype recvtype, Comm comm){
+                                   void *recvbuf, int *recvcnt, int *displs, Datatype recvtype, Comm comm){
   CopyData(sendbuf, recvbuf, sendcnt, sendtype);
 }
 

Common/src/CConfig.cpp

@@ -865,7 +865,7 @@ void CConfig::SetPointersNull(void) {
   Inlet_FlowDir             = nullptr;     Inlet_Temperature           = nullptr;     Inlet_Pressure        = nullptr;
   Inlet_Velocity            = nullptr;     Inflow_Mach                 = nullptr;     Inflow_Pressure       = nullptr;
   Exhaust_Pressure          = nullptr;     Outlet_Pressure             = nullptr;     Isothermal_Temperature= nullptr;
-  
+
   ElasticityMod             = nullptr;     PoissonRatio                = nullptr;     MaterialDensity       = nullptr;
 
   Load_Dir = nullptr;            Load_Dir_Value = nullptr;          Load_Dir_Multiplier = nullptr;
@@ -4677,8 +4677,8 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
        }
 
        /*--- Update kind_wall when a non zero roughness value is specified. ---*/
-       for (iMarker = 0; iMarker < nWall; iMarker++) 
-         if (Roughness_Height[iMarker] != 0.0) 
+       for (iMarker = 0; iMarker < nWall; iMarker++)
+         if (Roughness_Height[iMarker] != 0.0)
            Kind_Wall[iMarker] = ROUGH;
 
        /*--- Check if a non solid wall marker was specified as rough. ---*/
@@ -5334,7 +5334,7 @@ void CConfig::SetMarkers(unsigned short val_software) {
     Marker_CfgFile_KindBC[iMarker_CfgFile] = FLOWLOAD_BOUNDARY;
     iMarker_CfgFile++;
   }
-  
+
   for (iMarker_CfgFile = 0; iMarker_CfgFile < nMarker_CfgFile; iMarker_CfgFile++) {
     Marker_CfgFile_Monitoring[iMarker_CfgFile] = NO;
     for (iMarker_Monitoring = 0; iMarker_Monitoring < nMarker_Monitoring; iMarker_Monitoring++)
@@ -5460,7 +5460,7 @@ void CConfig::SetMarkers(unsigned short val_software) {
       if (Marker_CfgFile_TagBound[iMarker_CfgFile] == Marker_PyCustom[iMarker_PyCustom])
         Marker_CfgFile_PyCustom[iMarker_CfgFile] = YES;
   }
-  
+
 }
 
 void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {

Common/src/geometry/CPhysicalGeometry.cpp

@@ -312,9 +312,6 @@ CPhysicalGeometry::CPhysicalGeometry(CGeometry *geometry,
   delete [] Elem_ID_BoundTria_Linear;
   delete [] Elem_ID_BoundQuad_Linear;
 
-  delete[] GlobalMarkerStorageDispl;
-  delete[] GlobalRoughness_Height;
-
 }
 
 CPhysicalGeometry::~CPhysicalGeometry(void) {
@@ -11242,8 +11239,6 @@ void CPhysicalGeometry::SetWallDistance(const CConfig *config, CADTElemClass *Wa
   /*--- Step 3: Loop over all interior mesh nodes and compute minimum      ---*/
   /*---        distance to a solid wall element                           ---*/
   /*--------------------------------------------------------------------------*/
-  int rank;
-  SU2_MPI::Comm_rank(MPI_COMM_WORLD, &rank);
 
   /*--- Store marker list and roughness in a global array. ---*/
   if (config->GetnRoughWall() > 0) SetGlobalMarkerRoughness(config);
@@ -11263,65 +11258,47 @@ void CPhysicalGeometry::SetWallDistance(const CConfig *config, CADTElemClass *Wa
       WallADT->DetermineNearestElement(nodes->GetCoord(iPoint), dist, markerID, elemID, rankID);
 
       nodes->SetWall_Distance(iPoint, min(dist,nodes->GetWall_Distance(iPoint)));
+
       if (config->GetnRoughWall() > 0) {
-        auto index = GlobalMarkerStorageDispl[rankID]+ markerID;
+        auto index = GlobalMarkerStorageDispl[rankID] + markerID;
         auto localRoughness = GlobalRoughness_Height[index];
         nodes->SetRoughnessHeight(iPoint, localRoughness);
-	  }
+      }
     }
-    
+
   }
   // end SU2_OMP_PARALLEL
 }
 
 void CPhysicalGeometry::SetGlobalMarkerRoughness(const CConfig* config) {
 
-  unsigned short iMarker;
-  unsigned short nMarker_All = config->GetnMarker_All();
-
-  int *displs = new int [size];
-  int* recvCounts = new int [size];
-  int sizeLocal = (int) nMarker_All; // number of local markers
-  
-  //Communicate size of local marker array and make an array large enough to hold all data
-  SU2_MPI::Allgather(&sizeLocal, 1, MPI_INT, recvCounts, 1,
-                       MPI_INT, MPI_COMM_WORLD);
-  
-  // displacements based on size on each rank
-  displs[0] = 0;
-  for(int i=1; i<size; ++i) displs[i] = displs[i-1] + recvCounts[i-1];
+  const auto nMarker_All = config->GetnMarker_All();
+
+  vector<int> recvCounts(size);
+  auto sizeLocal = static_cast<int>(nMarker_All); // number of local markers
+
+  /*--- Communicate size of local marker array and make an array large enough to hold all data. ---*/
+  SU2_MPI::Allgather(&sizeLocal, 1, MPI_INT, recvCounts.data(), 1, MPI_INT, MPI_COMM_WORLD);
 
   /*--- Set the global array of displacements, needed to access the correct roughness element. ---*/
-  if (GlobalMarkerStorageDispl == nullptr) GlobalMarkerStorageDispl = new int [size];
+  GlobalMarkerStorageDispl.resize(size);
   GlobalMarkerStorageDispl[0] = 0;
-  for (int iRank = 1; iRank < size; iRank++) 
-    GlobalMarkerStorageDispl[iRank] = displs[iRank];
-  
-  //total size
-  int sizeGlobal = displs[size-1] + recvCounts[size-1];
+  for (int iRank = 1; iRank < size; iRank++)
+    GlobalMarkerStorageDispl[iRank] = GlobalMarkerStorageDispl[iRank-1] + recvCounts[iRank-1];
+
+  /*--- Total size ---*/
+  const auto sizeGlobal = GlobalMarkerStorageDispl[size-1] + recvCounts[size-1];
 
   /*--- Allocate local and global arrays to hold roughness. ---*/
-  su2double *localRough = new su2double [nMarker_All]; // local number of markers
-  su2double *globalRough = new su2double[sizeGlobal];  // all markers including send recieve
-  pair<unsigned short, su2double> wallprop;
+  vector<su2double> localRough(nMarker_All);   // local number of markers
+  GlobalRoughness_Height.resize(sizeGlobal);   // all markers including send recieve
 
-  for (iMarker = 0; iMarker < nMarker_All; iMarker++) {
-    wallprop = config->GetWallRoughnessProperties(config->GetMarker_All_TagBound(iMarker));
+  for (auto iMarker = 0u; iMarker < nMarker_All; iMarker++) {
+    auto wallprop = config->GetWallRoughnessProperties(config->GetMarker_All_TagBound(iMarker));
     localRough[iMarker] = wallprop.second;
   }
 
-  SU2_MPI::Allgatherv( localRough, sizeLocal, MPI_DOUBLE, globalRough ,
-                        recvCounts, displs, MPI_DOUBLE,
-                        MPI_COMM_WORLD);
-
-  /*--- Set the global array of roughness per marker. ---*/
-  if (GlobalRoughness_Height == nullptr) GlobalRoughness_Height = new su2double [sizeGlobal];
-  for (int iMarker = 0; iMarker < sizeGlobal; iMarker++) 
-    GlobalRoughness_Height[iMarker] = globalRough[iMarker];
-
-  /*--- Deallocate local variables. ---*/
-  delete [] displs;
-  delete [] recvCounts;
-  delete [] localRough;
-  delete [] globalRough;
+  /*--- Finally, gather the roughness of all markers. ---*/
+  SU2_MPI::Allgatherv(localRough.data(), sizeLocal, MPI_DOUBLE, GlobalRoughness_Height.data(),
+                      recvCounts.data(), GlobalMarkerStorageDispl.data(), MPI_DOUBLE, MPI_COMM_WORLD);
 }