simplify a few things

Author: pcarruscag

SU2_CFD/src/solvers/CFEASolver.cpp

@@ -337,31 +337,25 @@ void CFEASolver::HybridParallelInitialization(CGeometry* geometry) {
 
 void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
 
-  unsigned long iElem;
-  unsigned long index;
-  unsigned long elProperties[4];
+  const auto iZone = config->GetiZone();
+  const auto nZone = geometry->GetnZone();
 
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry->GetnZone();
-
-  bool topology_mode = config->GetTopology_Optimization();
-
-  string filename;
-  ifstream properties_file;
+  const bool topology_mode = config->GetTopology_Optimization();
 
   element_properties = new CProperty*[nElement];
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetFEA_FileName();
+  auto filename = config->GetFEA_FileName();
 
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
     filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
 
-  properties_file.open(filename.data(), ios::in);
+  ifstream properties_file;
+  properties_file.open(filename);
 
   /*--- In case there is no file, all elements get the same property (0) ---*/
 
@@ -374,7 +368,7 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
         SU2_MPI::Error("Topology mode requires an element-based properties file.",CURRENT_FUNCTION);
     }
 
-    for (iElem = 0; iElem < nElement; iElem++){
+    for (auto iElem = 0ul; iElem < nElement; iElem++){
       element_properties[iElem] = new CElementProperty(FEA_TERM, 0, 0, 0);
     }
 
@@ -385,24 +379,15 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
 
     element_based = true;
 
-    /*--- In case this is a parallel simulation, we need to perform the
-       Global2Local index transformation first. ---*/
+    /*--- In case this is a parallel simulation, we need to perform the Global2Local index transformation first. ---*/
 
-    long *Global2Local = new long[geometry->GetGlobal_nElemDomain()];
+    unordered_map<unsigned long, unsigned long> Global2Local;
 
-    /*--- First, set all indices to a negative value by default ---*/
-
-    for (iElem = 0; iElem < geometry->GetGlobal_nElemDomain(); iElem++)
-      Global2Local[iElem] = -1;
-
-    /*--- Now fill array with the transform values only for the points in the rank (including halos) ---*/
-
-    for (iElem = 0; iElem < nElement; iElem++)
+    for (auto iElem = 0ul; iElem < nElement; iElem++)
       Global2Local[geometry->elem[iElem]->GetGlobalIndex()] = iElem;
 
     /*--- Read all lines in the restart file ---*/
 
-    long iElem_Local;
     unsigned long iElem_Global_Local = 0, iElem_Global = 0; string text_line;
 
     /*--- The first line is the header ---*/
@@ -420,9 +405,13 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
          Otherwise, the local index for this node on the current processor
          will be returned and used to instantiate the vars. ---*/
 
-      iElem_Local = Global2Local[iElem_Global];
+      auto it = Global2Local.find(iElem_Global);
+
+      if (it != Global2Local.end()) {
 
-      if (iElem_Local >= 0) {
+        auto iElem_Local = it->second;
+
+        unsigned long elProperties[4], index;
 
         if (config->GetAdvanced_FEAElementBased() || topology_mode){
           point_line >> index >> elProperties[0] >> elProperties[1] >> elProperties[2] >> elProperties[3];
@@ -454,63 +443,43 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
                      string("It could be empty lines at the end of the file."), CURRENT_FUNCTION);
     }
 
-    /*--- Close the restart file ---*/
-
-    properties_file.close();
-
-    /*--- Free memory needed for the transformation ---*/
-
-    delete [] Global2Local;
-
   }
 
 }
 
 void CFEASolver::Set_Prestretch(CGeometry *geometry, CConfig *config) {
 
-  unsigned long iPoint;
-  unsigned long index;
-
-  unsigned short iVar;
-  unsigned short iZone = config->GetiZone();
-  unsigned short nZone = geometry->GetnZone();
-
-  string filename;
-  ifstream prestretch_file;
-
+  const auto iZone = config->GetiZone();
+  const auto nZone = geometry->GetnZone();
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetPrestretch_FEMFileName();
+  auto filename = config->GetPrestretch_FEMFileName();
 
   /*--- If multizone, append zone name ---*/
   if (nZone > 1)
     filename = config->GetMultizone_FileName(filename, iZone, ".dat");
 
   if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
 
-  prestretch_file.open(filename.data(), ios::in);
+  ifstream prestretch_file;
+  prestretch_file.open(filename);
 
   /*--- In case there is no file ---*/
 
   if (prestretch_file.fail()) {
     SU2_MPI::Error(string("There is no FEM prestretch reference file ") + filename, CURRENT_FUNCTION);
   }
 
-  /*--- In case this is a parallel simulation, we need to perform the
-   Global2Local index transformation first. ---*/
-
-  map<unsigned long,unsigned long> Global2Local;
-  map<unsigned long,unsigned long>::const_iterator MI;
+  /*--- Make a global to local map that also covers halo nodes (the one in geometry does not). ---*/
 
-  /*--- Now fill array with the transform values only for local points ---*/
+  unordered_map<unsigned long, unsigned long> Global2Local;
 
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++)
+  for (auto iPoint = 0ul; iPoint < nPoint; ++iPoint)
     Global2Local[geometry->nodes->GetGlobalIndex(iPoint)] = iPoint;
 
   /*--- Read all lines in the restart file ---*/
 
-  long iPoint_Local;
   unsigned long iPoint_Global_Local = 0, iPoint_Global = 0; string text_line;
 
   /*--- The first line is the header ---*/
@@ -523,17 +492,20 @@ void CFEASolver::Set_Prestretch(CGeometry *geometry, CConfig *config) {
     /*--- Retrieve local index. If this node from the restart file lives
      on the current processor, we will load and instantiate the vars. ---*/
 
-    MI = Global2Local.find(iPoint_Global);
-    if (MI != Global2Local.end()) {
+    auto it = Global2Local.find(iPoint_Global);
+
+    if (it != Global2Local.end()) {
 
-      iPoint_Local = Global2Local[iPoint_Global];
+      auto iPoint_Local = it->second;
 
       su2double Sol[MAXNVAR] = {0.0};
+      unsigned long index;
 
       if (nDim == 2) point_line >> Sol[0] >> Sol[1] >> index;
       if (nDim == 3) point_line >> Sol[0] >> Sol[1] >> Sol[2] >> index;
 
-      for (iVar = 0; iVar < nVar; iVar++) nodes->SetPrestretch(iPoint_Local,iVar, Sol[iVar]);
+      for (unsigned short iVar = 0; iVar < nVar; iVar++)
+        nodes->SetPrestretch(iPoint_Local, iVar, Sol[iVar]);
 
       iPoint_Global_Local++;
     }
@@ -542,99 +514,28 @@ void CFEASolver::Set_Prestretch(CGeometry *geometry, CConfig *config) {
 
   /*--- Detect a wrong solution file ---*/
 
-  if (iPoint_Global_Local != nPointDomain) {
+  if (iPoint_Global_Local != nPoint) {
     SU2_MPI::Error(string("The solution file ") + filename + string(" doesn't match with the mesh file!\n") +
                    string("It could be empty lines at the end of the file."), CURRENT_FUNCTION);
   }
 
-  /*--- Close the restart file ---*/
-
-  prestretch_file.close();
-
-#ifdef HAVE_MPI
-  /*--- We need to communicate here the prestretched geometry for the halo nodes. ---*/
-  /*--- We avoid creating a new function as this may be reformatted.              ---*/
-
-  unsigned short iMarker, MarkerS, MarkerR;
-  unsigned long iVertex, nVertexS, nVertexR, nBufferS_Vector, nBufferR_Vector;
-  su2double *Buffer_Receive_U = nullptr, *Buffer_Send_U = nullptr;
-
-  int send_to, receive_from;
-
-  for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-    if ((config->GetMarker_All_KindBC(iMarker) == SEND_RECEIVE) &&
-        (config->GetMarker_All_SendRecv(iMarker) > 0)) {
-
-      MarkerS = iMarker;  MarkerR = iMarker+1;
-
-      send_to = config->GetMarker_All_SendRecv(MarkerS)-1;
-      receive_from = abs(config->GetMarker_All_SendRecv(MarkerR))-1;
-
-      nVertexS = geometry->nVertex[MarkerS];  nVertexR = geometry->nVertex[MarkerR];
-      nBufferS_Vector = nVertexS*nVar;        nBufferR_Vector = nVertexR*nVar;
-
-      /*--- Allocate Receive and send buffers  ---*/
-      Buffer_Receive_U = new su2double [nBufferR_Vector];
-      Buffer_Send_U = new su2double[nBufferS_Vector];
-
-      /*--- Copy the solution that should be sent ---*/
-      for (iVertex = 0; iVertex < nVertexS; iVertex++) {
-        iPoint = geometry->vertex[MarkerS][iVertex]->GetNode();
-        for (iVar = 0; iVar < nVar; iVar++)
-          Buffer_Send_U[iVar*nVertexS+iVertex] = nodes->GetPrestretch(iPoint,iVar);
-      }
-
-      /*--- Send/Receive information using Sendrecv ---*/
-      SU2_MPI::Sendrecv(Buffer_Send_U, nBufferS_Vector, MPI_DOUBLE, send_to, 0,
-                        Buffer_Receive_U, nBufferR_Vector, MPI_DOUBLE, receive_from, 0, MPI_COMM_WORLD, nullptr);
-
-      /*--- Deallocate send buffer ---*/
-      delete [] Buffer_Send_U;
-
-      /*--- Do the coordinate transformation ---*/
-      for (iVertex = 0; iVertex < nVertexR; iVertex++) {
-
-        /*--- Find point and its type of transformation ---*/
-        iPoint = geometry->vertex[MarkerR][iVertex]->GetNode();
-
-        /*--- Store received values back into the variable. ---*/
-        for (iVar = 0; iVar < nVar; iVar++)
-          nodes->SetPrestretch(iPoint, iVar, Buffer_Receive_U[iVar*nVertexR+iVertex]);
-
-      }
-
-      /*--- Deallocate receive buffer ---*/
-      delete [] Buffer_Receive_U;
-
-    }
-
-  }
-#endif
-
 }
 
 void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
 
-  unsigned long iPoint;
-
-  unsigned short iVar;
-  unsigned short iZone = config->GetiZone();
-  unsigned short file_format = config->GetRefGeom_FileFormat();
-
-  string filename;
-  ifstream reference_file;
-
+  const auto iZone = config->GetiZone();
+  const auto file_format = config->GetRefGeom_FileFormat();
 
   /*--- Restart the solution from file information ---*/
 
-  filename = config->GetRefGeom_FEMFileName();
+  auto filename = config->GetRefGeom_FEMFileName();
 
   /*--- If multizone, append zone name ---*/
 
   filename = config->GetMultizone_FileName(filename, iZone, ".csv");
 
-  reference_file.open(filename.data(), ios::in);
+  ifstream reference_file;
+  reference_file.open(filename);
 
   /*--- In case there is no file ---*/
 
@@ -644,24 +545,8 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
 
   if (rank == MASTER_NODE) cout << "Filename: " << filename << " and format " << file_format << "." << endl;
 
-  /*--- In case this is a parallel simulation, we need to perform the
-   Global2Local index transformation first. ---*/
-
-  long *Global2Local = new long[geometry->GetGlobal_nPointDomain()];
-
-  /*--- First, set all indices to a negative value by default ---*/
-
-  for (iPoint = 0; iPoint < geometry->GetGlobal_nPointDomain(); iPoint++)
-    Global2Local[iPoint] = -1;
-
-  /*--- Now fill array with the transform values only for local points ---*/
-
-  for (iPoint = 0; iPoint < nPointDomain; iPoint++)
-    Global2Local[geometry->nodes->GetGlobalIndex(iPoint)] = iPoint;
-
   /*--- Read all lines in the restart file ---*/
 
-  long iPoint_Local;
   unsigned long iPoint_Global_Local = 0, iPoint_Global = 0; string text_line;
 
   /*--- The first line is the header ---*/
@@ -677,7 +562,7 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
        Otherwise, the local index for this node on the current processor
        will be returned and used to instantiate the vars. ---*/
 
-    iPoint_Local = Global2Local[iPoint_Global];
+    auto iPoint_Local = geometry->GetGlobal_to_Local_Point(iPoint_Global);
 
     if (iPoint_Local >= 0) {
 
@@ -692,7 +577,7 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
         Sol[2] = PrintingToolbox::stod(point_line[6]);
       }
 
-      for (iVar = 0; iVar < nVar; iVar++)
+      for (unsigned short iVar = 0; iVar < nVar; iVar++)
         nodes->SetReference_Geometry(iPoint_Local, iVar, Sol[iVar]);
 
       iPoint_Global_Local++;
@@ -707,14 +592,6 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
                    string("It could be empty lines at the end of the file."), CURRENT_FUNCTION);
   }
 
-  /*--- Close the restart file ---*/
-
-  reference_file.close();
-
-  /*--- Free memory needed for the transformation ---*/
-
-  delete [] Global2Local;
-
 }
 
 void CFEASolver::Set_VertexEliminationSchedule(CGeometry *geometry, const vector<unsigned short>& markers) {
@@ -3387,9 +3264,8 @@ void CFEASolver::ExtractAdjoint_Variables(CGeometry *geometry, CConfig *config)
   if (rank == MASTER_NODE) {
     string filename = config->GetTopology_Optim_FileName();
     ofstream file;
-    file.open(filename.c_str());
+    file.open(filename);
     for(iElem=0; iElem<nElemDomain; ++iElem) file << rec_buf[iElem] << "\n";
-    file.close();
   }
 
   delete [] send_buf;