Declare variables closer to their initialization

Author: maxaehle

Common/src/interface_interpolation/CInterpolator.cpp

@@ -155,16 +155,11 @@ unsigned long CInterpolator::Collect_ElementInfo(int markDonor, unsigned short n
 void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker) {
   CGeometry* geom = Geometry[val_zone][INST_0][MESH_0];
 
-  unsigned long iVertex, kVertex;
-
-  unsigned long *uptr, nVertex, nElems, iDim, iPoint;
-
-  unsigned long nGlobalLinkedNodes, nLocalVertex, nLocalLinkedNodes;
-
   const auto nDim = geom->GetnDim();
 
   /*--- If this zone has no parts of the marker, it will not participate
    * in the first part of this function (collection). ---*/
+  unsigned long nVertex, nElems;
   if (val_marker != -1) {
     nVertex = geom->GetnVertex(val_marker);
     nElems = geom->GetnElem_Bound(val_marker);
@@ -176,9 +171,9 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
   /*--- Get the number of domain vertices on the marker, and a mapping
    * (iVertex) -> (iLocalVertex, non-domain points being ignored). ---*/
   su2vector<unsigned long> iVertex_to_iLocalVertex(nVertex);
-  nLocalVertex = 0;
-  for (iVertex = 0; iVertex < nVertex; iVertex++) {
-    iPoint = geom->vertex[val_marker][iVertex]->GetNode();
+  unsigned long nLocalVertex = 0;
+  for (unsigned long iVertex = 0; iVertex < nVertex; iVertex++) {
+    const auto iPoint = geom->vertex[val_marker][iVertex]->GetNode();
     if (geom->nodes->GetDomain(iPoint)) {
       iVertex_to_iLocalVertex[iVertex] = nLocalVertex;
       nLocalVertex++;
@@ -197,12 +192,12 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
   unordered_map<unsigned long, set<unsigned long> > neighbors;
 
   /*--- Define or initialize them. ---*/
-  for (iVertex = 0; iVertex < nVertex; iVertex++) {
-    iPoint = geom->vertex[val_marker][iVertex]->GetNode();
+  for (unsigned long iVertex = 0; iVertex < nVertex; iVertex++) {
+    const auto iPoint = geom->vertex[val_marker][iVertex]->GetNode();
     if (geom->nodes->GetDomain(iPoint)) {
       unsigned long iLocalVertex = iVertex_to_iLocalVertex[iVertex];
       Buffer_Send_GlobalPoint[iLocalVertex] = geom->nodes->GetGlobalIndex(iPoint);
-      for (iDim = 0; iDim < nDim; iDim++) Buffer_Send_Coord[iLocalVertex][iDim] = geom->nodes->GetCoord(iPoint, iDim);
+      for (unsigned long iDim = 0; iDim < nDim; iDim++) Buffer_Send_Coord[iLocalVertex][iDim] = geom->nodes->GetCoord(iPoint, iDim);
       neighbors.insert(pair<unsigned long, set<unsigned long> >(iPoint, set<unsigned long>()));
     }
   }
@@ -211,7 +206,7 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
   for (unsigned long iElem = 0; iElem < nElems; iElem++) {
     CPrimalGrid* elem = geom->bound[val_marker][iElem];
     for (unsigned short iNode = 0; iNode < elem->GetnNodes(); iNode++) {
-      iPoint = elem->GetNode(iNode);
+      const auto iPoint = elem->GetNode(iNode);
       if (geom->nodes->GetDomain(iPoint)) {
         set<unsigned long>& neighb = neighbors.at(iPoint);
         for (unsigned short iNeighbor = 0; iNeighbor < elem->GetnNeighbor_Nodes(iNode); iNeighbor++) {
@@ -227,9 +222,9 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
   su2vector<unsigned long> Buffer_Send_nLinkedNodes(nLocalVertex);
   // cumsum of Buffer_Send_nLinkedNodes
   su2vector<unsigned long> Buffer_Send_StartLinkedNodes(nLocalVertex);
-  nLocalLinkedNodes = 0;
-  for (iVertex = 0; iVertex < nVertex; iVertex++) {
-    iPoint = geom->vertex[val_marker][iVertex]->GetNode();
+  unsigned long nLocalLinkedNodes = 0;
+  for (unsigned long iVertex = 0; iVertex < nVertex; iVertex++) {
+    const auto iPoint = geom->vertex[val_marker][iVertex]->GetNode();
     if (geom->nodes->GetDomain(iPoint)) {
       unsigned long iLocalVertex = iVertex_to_iLocalVertex[iVertex];
       Buffer_Send_nLinkedNodes[iLocalVertex] = neighbors.at(iPoint).size();
@@ -240,8 +235,8 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
   // global point IDs of surface-neighbors of all domain vertices on the marker
   su2vector<unsigned long> Buffer_Send_LinkedNodes(nLocalLinkedNodes);
   unsigned long index = 0;
-  for (iVertex = 0; iVertex < nVertex; iVertex++) {
-    iPoint = geom->vertex[val_marker][iVertex]->GetNode();
+  for (unsigned long iVertex = 0; iVertex < nVertex; iVertex++) {
+    const auto iPoint = geom->vertex[val_marker][iVertex]->GetNode();
     if (geom->nodes->GetDomain(iPoint)) {
       for (unsigned long jPoint_global : neighbors.at(iPoint)) {
         Buffer_Send_LinkedNodes[index] = jPoint_global;
@@ -256,6 +251,7 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
    * For this, the master process collects the data from all processes, joins them and broadcasts them again. ---*/
 
   /*--- Allocate global arrays. ---*/
+  unsigned long nGlobalLinkedNodes;
   SU2_MPI::Allreduce(&nLocalVertex, &nGlobalVertex, 1, MPI_UNSIGNED_LONG, MPI_SUM, SU2_MPI::GetComm());
   SU2_MPI::Allreduce(&nLocalLinkedNodes, &nGlobalLinkedNodes, 1, MPI_UNSIGNED_LONG, MPI_SUM, SU2_MPI::GetComm());
 
@@ -278,14 +274,14 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
       for (unsigned long iDim = 0; iDim < nDim; iDim++)
         Buffer_Receive_Coord(iVertex, iDim) = Buffer_Send_Coord(iVertex, iDim);
 
-    for (iVertex = 0; iVertex < nLocalVertex; iVertex++) {
+    for (unsigned long iVertex = 0; iVertex < nLocalVertex; iVertex++) {
       Buffer_Receive_GlobalPoint[iVertex] = Buffer_Send_GlobalPoint[iVertex];
       Buffer_Receive_Proc[iVertex] = MASTER_NODE;
       Buffer_Receive_nLinkedNodes[iVertex] = Buffer_Send_nLinkedNodes[iVertex];
       Buffer_Receive_StartLinkedNodes[iVertex] = Buffer_Send_StartLinkedNodes[iVertex];
     }
 
-    for (iVertex = 0; iVertex < nLocalLinkedNodes; iVertex++)
+    for (unsigned long iVertex = 0; iVertex < nLocalLinkedNodes; iVertex++)
       Buffer_Receive_LinkedNodes[iVertex] = Buffer_Send_LinkedNodes[iVertex];
 
     unsigned long received_nLocalVertex_sum = nLocalVertex;
@@ -309,7 +305,7 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
       SU2_MPI::Recv(&Buffer_Receive_StartLinkedNodes[received_nLocalVertex_sum], received_nLocalVertex,
                     MPI_UNSIGNED_LONG, iRank, 1, SU2_MPI::GetComm(), MPI_STATUS_IGNORE);
 
-      for (iVertex = 0; iVertex < received_nLocalVertex; iVertex++) {
+      for (unsigned long iVertex = 0; iVertex < received_nLocalVertex; iVertex++) {
         Buffer_Receive_Proc[received_nLocalVertex_sum + iVertex] = iRank;
         Buffer_Receive_StartLinkedNodes[received_nLocalVertex_sum + iVertex] += received_nLocalLinkedNodes_sum;
       }
@@ -333,27 +329,27 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
     for (unsigned long iDim = 0; iDim < nDim; iDim++)
       Buffer_Receive_Coord(iVertex, iDim) = Buffer_Send_Coord(iVertex, iDim);
 
-  for (iVertex = 0; iVertex < nGlobalVertex; iVertex++) {
+  for (unsigned long iVertex = 0; iVertex < nGlobalVertex; iVertex++) {
     Buffer_Receive_GlobalPoint[iVertex] = Buffer_Send_GlobalPoint[iVertex];
     Buffer_Receive_Proc[iVertex] = MASTER_NODE;
     Buffer_Receive_nLinkedNodes[iVertex] = Buffer_Send_nLinkedNodes[iVertex];
     Buffer_Receive_StartLinkedNodes[iVertex] = Buffer_Send_StartLinkedNodes[iVertex];
   }
 
-  for (iVertex = 0; iVertex < nGlobalLinkedNodes; iVertex++)
+  for (unsigned long iVertex = 0; iVertex < nGlobalLinkedNodes; iVertex++)
     Buffer_Receive_LinkedNodes[iVertex] = Buffer_Send_LinkedNodes[iVertex];
 #endif
 
-  /*--- Master process replaced global point indices in Buffer_Receive_LinkedNodes by their indices in
+  /*--- Master process replaces global point indices in Buffer_Receive_LinkedNodes by their indices in
    * Buffer_Receive_GlobalPoint, Buffer_Receive_nLinkedNodes etc. ---*/
   if (rank == MASTER_NODE) {
-    for (iVertex = 0; iVertex < nGlobalVertex; iVertex++) {
-      uptr = &Buffer_Receive_LinkedNodes[Buffer_Receive_StartLinkedNodes[iVertex]];
+    for (unsigned long iVertex = 0; iVertex < nGlobalVertex; iVertex++) {
+      unsigned long *uptr = &Buffer_Receive_LinkedNodes[Buffer_Receive_StartLinkedNodes[iVertex]];
 
       for (unsigned long jLinkedNode = 0; jLinkedNode < Buffer_Receive_nLinkedNodes[iVertex]; jLinkedNode++) {
         unsigned long jPoint = uptr[jLinkedNode];
         bool found = false;  // Global point index has been found
-        for (kVertex = 0; kVertex < nGlobalVertex; kVertex++) {
+        for (unsigned long kVertex = 0; kVertex < nGlobalVertex; kVertex++) {
           if (Buffer_Receive_GlobalPoint[kVertex] == jPoint) {
             uptr[jLinkedNode] = kVertex;
             found = true;
@@ -362,7 +358,7 @@ void CInterpolator::ReconstructBoundary(unsigned long val_zone, int val_marker)
         }
 
         if (!found) {  // remove from list
-          for (kVertex = jLinkedNode; kVertex < Buffer_Receive_nLinkedNodes[iVertex] - 1; kVertex++) {
+          for (unsigned long kVertex = jLinkedNode; kVertex < Buffer_Receive_nLinkedNodes[iVertex] - 1; kVertex++) {
             uptr[kVertex] = uptr[kVertex + 1];
           }
           Buffer_Receive_nLinkedNodes[iVertex]--;