Fix some sonar cloud issues

Deltares · Oct 10, 2023 · fe75306 · fe75306
1 parent 3e058cc
commit fe75306
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/libs/MeshKernel/include/MeshKernel/Mesh2DIntersections.hpp b/libs/MeshKernel/include/MeshKernel/Mesh2DIntersections.hpp
@@ -63,7 +63,7 @@ namespace meshkernel
     {
     public:
         /// @brief Constructor
-        Mesh2DIntersections(Mesh2D& mesh);
+        explicit Mesh2DIntersections(Mesh2D& mesh);
 
         /// @brief Compute intersection with a polygon, possibly containing multiple polylines
         /// @param[in] polygon An input polygon

diff --git a/libs/MeshKernel/src/Mesh2D.cpp b/libs/MeshKernel/src/Mesh2D.cpp
@@ -1531,8 +1531,8 @@ void Mesh2D::DeleteMesh(const Polygons& polygon, int deletionOption, bool invert
     // Find crossed faces
     Mesh2DIntersections mesh2DIntersections(*this);
     mesh2DIntersections.Compute(polygon);
-    const auto edgeIntersections = mesh2DIntersections.EdgeIntersections();
-    const auto faceIntersections = mesh2DIntersections.FaceIntersections();
+    const auto& edgeIntersections = mesh2DIntersections.EdgeIntersections();
+    const auto& faceIntersections = mesh2DIntersections.FaceIntersections();
 
     // Find faces with all nodes inside the polygon
     std::vector<bool> isNodeInsidePolygon(GetNumNodes(), false);
@@ -1562,22 +1562,22 @@ void Mesh2D::DeleteMesh(const Polygons& polygon, int deletionOption, bool invert
     std::function<bool(UInt)> excludedFace;
     if (deletionOption == InsideNotIntersected && !invertDeletion)
     {
-        excludedFace = [&](UInt f)
+        excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
         { return !isFaceCompletlyIncludedInPolygon[f] || faceIntersections[f].faceIndex != constants::missing::uintValue; };
     }
     else if (deletionOption == InsideNotIntersected && invertDeletion)
     {
-        excludedFace = [&](UInt f)
+        excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
         { return isFaceCompletlyIncludedInPolygon[f] && faceIntersections[f].faceIndex == constants::missing::uintValue; };
     }
     else if (deletionOption == InsideAndIntersected && !invertDeletion)
     {
-        excludedFace = [&](UInt f)
+        excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
         { return !isFaceCompletlyIncludedInPolygon[f] && faceIntersections[f].faceIndex == constants::missing::uintValue; };
     }
     else if (deletionOption == InsideAndIntersected && invertDeletion)
     {
-        excludedFace = [&](UInt f)
+        excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
         { return isFaceCompletlyIncludedInPolygon[f] || faceIntersections[f].faceIndex != constants::missing::uintValue; };
     }
 

diff --git a/libs/MeshKernel/src/Mesh2DIntersections.cpp b/libs/MeshKernel/src/Mesh2DIntersections.cpp
@@ -182,10 +182,8 @@ void Mesh2DIntersections::Compute(const std::vector<Point>& polyLine)
             auto [currentCrossingEdge, segmentIndex, nextSegmentIndex] = crossingEdges.front();
             crossingEdges.pop();
 
-            for (UInt f = 0; f < m_mesh.m_edgesFaces[currentCrossingEdge].size(); ++f)
+            for (const auto currentFaceIndex : m_mesh.m_edgesFaces[currentCrossingEdge])
             {
-                const auto currentFaceIndex = m_mesh.m_edgesFaces[currentCrossingEdge][f];
-
                 if (currentFaceIndex == constants::missing::uintValue)
                 {
                     continue;