Replaced the C-style cast by static_cast

Author: vdweide

Common/src/fem/fem_geometry_structure.cpp

@@ -267,14 +267,14 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
   map<int, int> rankToIndCommBuf;
   for (int i = 0; i < size; ++i) {
     if (sendToRank[i]) {
-      int ind = (int)rankToIndCommBuf.size();
+      int ind = static_cast<int>(rankToIndCommBuf.size());
       rankToIndCommBuf[i] = ind;
     }
   }
 
   /*--- Definition of the communication buffers, used to send the element data
         to the correct ranks.                ---*/
-  int nRankSend = (int)rankToIndCommBuf.size();
+  int nRankSend = static_cast<int>(rankToIndCommBuf.size());
   vector<vector<short> > shortSendBuf(nRankSend, vector<short>(0));
   vector<vector<long> > longSendBuf(nRankSend, vector<long>(0));
   vector<vector<su2double> > doubleSendBuf(nRankSend, vector<su2double>(0));
@@ -294,7 +294,7 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
 
   /*--- Loop over the local elements to fill the communication buffers with element data. ---*/
   for (unsigned long i = 0; i < geometry->GetnElem(); ++i) {
-    int ind = (int)geometry->elem[i]->GetColor();
+    int ind = static_cast<int>(geometry->elem[i]->GetColor());
     map<int, int>::const_iterator MI = rankToIndCommBuf.find(ind);
     ind = MI->second;
 
@@ -385,7 +385,7 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
       /* Determine to which rank this boundary element must be sent.
          That is the same as its corresponding domain element.
          Update the corresponding index in longSendBuf. */
-      int ind = (int)geometry->elem[elemID]->GetColor();
+      int ind = static_cast<int>(geometry->elem[elemID]->GetColor());
       const auto MI = rankToIndCommBuf.find(ind);
       ind = MI->second;
 
@@ -566,8 +566,8 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
          the elements with constant and non-constant Jacobians are
          considered the same. */
       if (JacConstant) {
-        const auto orderExactStraight = (unsigned short)ceil(nPolySol * config->GetQuadrature_Factor_Straight());
-        const auto orderExactCurved = (unsigned short)ceil(nPolySol * config->GetQuadrature_Factor_Curved());
+        const auto orderExactStraight = static_cast<unsigned short>(ceil(nPolySol * config->GetQuadrature_Factor_Straight()));
+        const auto orderExactCurved = static_cast<unsigned short>(ceil(nPolySol * config->GetQuadrature_Factor_Curved()));
         if (orderExactStraight == orderExactCurved) JacConstant = false;
       }
 
@@ -691,14 +691,14 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
   rankToIndCommBuf.clear();
   for (int i = 0; i < size; ++i) {
     if (sendToRank[i]) {
-      int ind = (int)rankToIndCommBuf.size();
+      int ind = static_cast<int>(rankToIndCommBuf.size());
       rankToIndCommBuf[i] = ind;
     }
   }
 
   /* Resize the first index of the long send buffers for the communication of
      the halo data.        */
-  nRankSend = (int)rankToIndCommBuf.size();
+  nRankSend = static_cast<int>(rankToIndCommBuf.size());
   longSendBuf.resize(nRankSend);
 
   /* Determine the number of ranks, from which this rank will receive elements. */
@@ -717,7 +717,7 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
     if (*low > haloElements[i].long0) --ind;
 
     /* Convert this rank to the index in the send buffer. */
-    MI = rankToIndCommBuf.find((int)ind);
+    MI = rankToIndCommBuf.find(static_cast<int>(ind));
     ind = MI->second;
 
     /* Store the global element ID and the periodic index in the long buffer.
@@ -911,12 +911,12 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
   for (int i = 0; i < size; ++i) {
     if (nHaloElemPerRank[i + 1] > nHaloElemPerRank[i]) {
       sendToRank[i] = 1;
-      int ind = (int)rankToIndCommBuf.size();
+      int ind = static_cast<int>(rankToIndCommBuf.size());
       rankToIndCommBuf[i] = ind;
     }
   }
 
-  nRankSend = (int)rankToIndCommBuf.size();
+  nRankSend = static_cast<int>(rankToIndCommBuf.size());
 
   /* Store the value of nRankSend for later use. */
   const int nRankSendHaloInfo = nRankSend;
@@ -1179,7 +1179,7 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
   /*--- Create the graph of local elements. The halo elements are ignored. ---*/
   vector<vector<unsigned long> > neighElem(nVolElemOwned, vector<unsigned long>(0));
 
-  nRankRecv = (int)longRecvBuf.size();
+  nRankRecv = static_cast<int>(longRecvBuf.size());
   for (int i = 0; i < nRankRecv; ++i) {
     unsigned long indL = 1, indS = 0;
     for (long j = 0; j < longRecvBuf[i][0]; ++j) {
@@ -1452,7 +1452,7 @@ CMeshFEM::CMeshFEM(CGeometry* geometry, CConfig* config) {
   /*--- Resize the first index of the send buffers to nRankRecv, because this
         number of messages must be sent back to the sending ranks with halo
         information. ---*/
-  nRankRecv = (int)longSecondRecvBuf.size();
+  nRankRecv = static_cast<int>(longSecondRecvBuf.size());
   shortSendBuf.resize(nRankRecv);
   longSendBuf.resize(nRankRecv);
   doubleSendBuf.resize(nRankRecv);
@@ -2455,12 +2455,12 @@ void CMeshFEM_DG::CreateFaces(CConfig* config) {
          is set to false. Hence it is only needed to carry out this check for faces
          with a constant Jacobian. This is done to reduce the number of standard elements. */
       if (thisFace.JacFaceIsConsideredConstant) {
-        auto orderExactStraight = (unsigned short)ceil(thisFace.nPolyGrid0 * config->GetQuadrature_Factor_Straight());
-        auto orderExactCurved = (unsigned short)ceil(thisFace.nPolyGrid0 * config->GetQuadrature_Factor_Curved());
+        auto orderExactStraight = static_cast<unsigned short>(ceil(thisFace.nPolyGrid0 * config->GetQuadrature_Factor_Straight()));
+        auto orderExactCurved = static_cast<unsigned short>(ceil(thisFace.nPolyGrid0 * config->GetQuadrature_Factor_Curved()));
 
         if (orderExactStraight == orderExactCurved) {
-          orderExactStraight = (unsigned short)ceil(thisFace.nPolySol0 * config->GetQuadrature_Factor_Straight());
-          orderExactCurved = (unsigned short)ceil(thisFace.nPolySol0 * config->GetQuadrature_Factor_Curved());
+          orderExactStraight = static_cast<unsigned short>(ceil(thisFace.nPolySol0 * config->GetQuadrature_Factor_Straight()));
+          orderExactCurved = static_cast<unsigned short>(ceil(thisFace.nPolySol0 * config->GetQuadrature_Factor_Curved()));
           if (orderExactStraight == orderExactCurved) thisFace.JacFaceIsConsideredConstant = false;
         }
       }
@@ -3159,7 +3159,7 @@ void CMeshFEM_DG::SetSendReceive(const CConfig* config) {
   map<int, int> rankToIndRecvBuf;
   for (int i = 0; i < size; ++i) {
     if (recvFromRank[i]) {
-      int ind = (int)rankToIndRecvBuf.size();
+      int ind = static_cast<int>(rankToIndRecvBuf.size());
       rankToIndRecvBuf[i] = ind;
     }
   }

Common/src/fem/fem_standard_element.cpp

@@ -186,9 +186,9 @@ CFEMStandardElementBase::CFEMStandardElementBase(unsigned short val_VTK_Type, un
     orderExact = val_orderExact;
   } else {
     if (constJacobian)
-      orderExact = (unsigned short)ceil(val_nPoly * config->GetQuadrature_Factor_Straight());
+      orderExact = static_cast<unsigned short>(ceil(val_nPoly * config->GetQuadrature_Factor_Straight()));
     else
-      orderExact = (unsigned short)ceil(val_nPoly * config->GetQuadrature_Factor_Curved());
+      orderExact = static_cast<unsigned short>(ceil(val_nPoly * config->GetQuadrature_Factor_Curved()));
   }
 
   /*--- Determine the integration points. This depends on the element type. ---*/
@@ -903,7 +903,7 @@ void CFEMStandardElementBase::SubConnForPlottingLine(const unsigned short nPoly,
   /*--- Determine the local subconnectivity of the line element used for plotting
         purposes. This is rather trivial, because the line element is subdivided
         into nPoly linear line elements.                    ---*/
-  unsigned short nnPoly = max(nPoly, (unsigned short)1);
+  unsigned short nnPoly = max(nPoly, static_cast<unsigned short>(1));
   for (unsigned short i = 0; i < nnPoly; ++i) {
     subConn.push_back(i);
     subConn.push_back(i + 1);
@@ -916,7 +916,7 @@ void CFEMStandardElementBase::SubConnForPlottingQuadrilateral(const unsigned sho
         plotting purposes. Note that the connectivity of the linear subelements
         obey the VTK connectivity rule of a quadrilateral, which is different
         from the connectivity for the high order quadrilateral. ---*/
-  unsigned short nnPoly = max(nPoly, (unsigned short)1);
+  unsigned short nnPoly = max(nPoly, static_cast<unsigned short>(1));
   for (unsigned short j = 0; j < nnPoly; ++j) {
     unsigned short jj = j * (nnPoly + 1);
     for (unsigned short i = 0; i < nnPoly; ++i) {

Common/src/fem/geometry_structure_fem_part.cpp

@@ -609,15 +609,15 @@ void CPhysicalGeometry::SetColorFEMGrid_Parallel(CConfig* config) {
         the points that occur in the faces of localFacesComm.        ---*/
   vector<unsigned long> facePointsProc(size + 1, 0);
   unsigned long total_point_accounted = 0;
-  for (unsigned long i = 1; i <= (unsigned long)size; ++i) {
+  for (unsigned long i = 1; i <= static_cast<unsigned long>(size); ++i) {
     facePointsProc[i] = maxPointID / size;
     total_point_accounted += facePointsProc[i];
   }
 
   unsigned long rem_point = maxPointID - total_point_accounted;
   for (unsigned long i = 1; i <= rem_point; ++i) ++facePointsProc[i];
 
-  for (unsigned long i = 0; i < (unsigned long)size; ++i) facePointsProc[i + 1] += facePointsProc[i];
+  for (unsigned long i = 0; i < static_cast<unsigned long>(size); ++i) facePointsProc[i + 1] += facePointsProc[i];
 
   /*--- Determine the number of faces that has to be sent to each rank.
         Note that the rank is stored in elemID1, such that the search
@@ -637,7 +637,7 @@ void CPhysicalGeometry::SetColorFEMGrid_Parallel(CConfig* config) {
   vector<unsigned long> sendBufFace(9 * nFacesLocComm);
   vector<unsigned long> counter(size);
   counter[0] = 0;
-  for (unsigned long i = 1; i < (unsigned long)size; ++i) counter[i] = counter[i - 1] + 9 * nFacesComm[i - 1];
+  for (unsigned long i = 1; i < static_cast<unsigned long>(size); ++i) counter[i] = counter[i - 1] + 9 * nFacesComm[i - 1];
 
   for (unsigned long i = 0; i < nFacesLocComm; ++i) {
     unsigned long rankFace = localFacesComm[i].elemID1;
@@ -657,7 +657,7 @@ void CPhysicalGeometry::SetColorFEMGrid_Parallel(CConfig* config) {
 
   /*--- Determine the number of ranks from which I receive a message. */
   unsigned long nMessSend = 0;
-  for (unsigned long i = 0; i < (unsigned long)size; ++i) {
+  for (unsigned long i = 0; i < static_cast<unsigned long>(size); ++i) {
     if (nFacesComm[i]) {
       counter[i] = 1;
       ++nMessSend;
@@ -674,7 +674,7 @@ void CPhysicalGeometry::SetColorFEMGrid_Parallel(CConfig* config) {
 
   nMessSend = 0;
   unsigned long indSend = 0;
-  for (unsigned long i = 0; i < (unsigned long)size; ++i) {
+  for (unsigned long i = 0; i < static_cast<unsigned long>(size); ++i) {
     if (nFacesComm[i]) {
       unsigned long count = 9 * nFacesComm[i];
       SU2_MPI::Isend(&sendBufFace[indSend], count, MPI_UNSIGNED_LONG, i, i, SU2_MPI::GetComm(), &commReqs[nMessSend]);
@@ -792,7 +792,7 @@ void CPhysicalGeometry::SetColorFEMGrid_Parallel(CConfig* config) {
 
     sizeMess /= 9;
     unsigned long jj = 0;
-    for (unsigned long j = 0; j < (unsigned long)sizeMess; ++j, jj += 9) {
+    for (unsigned long j = 0; j < static_cast<unsigned long>(sizeMess); ++j, jj += 9) {
       CFaceOfElement thisFace;
       thisFace.nCornerPoints = recvBuf[jj];
       thisFace.cornerPoints[0] = recvBuf[jj + 1];
@@ -2240,7 +2240,7 @@ void CPhysicalGeometry::DetermineDonorElementsWallFunctions(CConfig* config) {
      carried out for each rank and store them in such a way that the info can
      be used directly in Allgatherv. */
   vector<int> recvCounts(size), displs(size);
-  int nLocalSearchPoints = (int)markerIDGlobalSearch.size();
+  int nLocalSearchPoints = static_cast<int>(markerIDGlobalSearch.size());
 
   SU2_MPI::Allgather(&nLocalSearchPoints, 1, MPI_INT, recvCounts.data(), 1, MPI_INT, SU2_MPI::GetComm());
   displs[0] = 0;

Common/src/geometry/CGeometry.cpp

@@ -183,8 +183,8 @@ void CGeometry::PreprocessP2PComms(CGeometry* geometry, CConfig* config) {
       /*--- If we have not visited this element yet, increment our
        number of elements that must be sent to a particular proc. ---*/
 
-      if ((nPoint_Flag[iRank] != (int)iMarker)) {
-        nPoint_Flag[iRank] = (int)iMarker;
+      if ((nPoint_Flag[iRank] != static_cast<int>(iMarker))) {
+        nPoint_Flag[iRank] = static_cast<int>(iMarker);
         nPoint_Send_All[iRank + 1] += nVertexS;
       }
     }
@@ -819,13 +819,13 @@ void CGeometry::PreprocessPeriodicComms(CGeometry* geometry, CConfig* config) {
           /*--- Get the rank that holds the matching periodic point
            on the other marker in the periodic pair. ---*/
 
-          iRank = (int)geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
+          iRank = static_cast<int>(geometry->vertex[iMarker][iVertex]->GetDonorProcessor());
 
           /*--- If we have not visited this point last, increment our
            number of points that must be sent to a particular proc. ---*/
 
-          if ((nPoint_Flag[iRank] != (int)iPoint)) {
-            nPoint_Flag[iRank] = (int)iPoint;
+          if ((nPoint_Flag[iRank] != static_cast<int>(iPoint))) {
+            nPoint_Flag[iRank] = static_cast<int>(iPoint);
             nPoint_Send_All[iRank + 1] += 1;
           }
         }
@@ -962,7 +962,7 @@ void CGeometry::PreprocessPeriodicComms(CGeometry* geometry, CConfig* config) {
             /*--- Get the rank that holds the matching periodic point
              on the other marker in the periodic pair. ---*/
 
-            iRank = (int)geometry->vertex[iMarker][iVertex]->GetDonorProcessor();
+            iRank = static_cast<int>(geometry->vertex[iMarker][iVertex]->GetDonorProcessor());
 
             /*--- If the rank for the current periodic point matches the
              rank of the current send message, then store the local point
@@ -971,11 +971,11 @@ void CGeometry::PreprocessPeriodicComms(CGeometry* geometry, CConfig* config) {
 
             if (iRank == Neighbors_PeriodicSend[iSend]) {
               Local_Point_PeriodicSend[ii] = iPoint;
-              Local_Marker_PeriodicSend[ii] = (unsigned long)iMarker;
+              Local_Marker_PeriodicSend[ii] = static_cast<unsigned long>(iMarker);
               jj = ii * nPackets;
               idSend[jj] = geometry->vertex[iMarker][iVertex]->GetDonorPoint();
               jj++;
-              idSend[jj] = (unsigned long)iPeriodic;
+              idSend[jj] = static_cast<unsigned long>(iPeriodic);
               ii++;
             }
           }