Simplify algorithm

Deltares · Oct 31, 2023 · 2f09798 · 2f09798
1 parent d6a85f9
commit 2f09798
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGrid.cpp b/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGrid.cpp
@@ -292,6 +292,16 @@ CurvilinearGrid::ComputeBlockFromCornerPoints(const CurvilinearGridNodeIndices&
         throw ConstraintError("Invalid index: first index - {{{}, {}}}, second index - {{{}, {}}}", lowerLeft.m_m, lowerLeft.m_n, upperRight.m_m, upperRight.m_n);
     }
 
+    if (lowerLeft.m_m >= m_numM || lowerLeft.m_n >= m_numN)
+    {
+        throw ConstraintError("Invalid index: first index {{{}, {}}} not in mesh limits {{{}, {}}}", lowerLeft.m_m, lowerLeft.m_n, m_numM, m_numN);
+    }
+
+    if (upperRight.m_m >= m_numM || upperRight.m_n >= m_numN)
+    {
+        throw ConstraintError("Invalid index: second index {{{}, {}}} not in mesh limits {{{}, {}}}", upperRight.m_m, upperRight.m_n, m_numM, m_numN);
+    }
+
     return {lowerLeft, upperRight};
 }
 

diff --git a/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGridDeleteInterior.cpp b/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGridDeleteInterior.cpp
@@ -40,22 +40,11 @@ meshkernel::CurvilinearGridDeleteInterior::CurvilinearGridDeleteInterior(Curvili
 
 void meshkernel::CurvilinearGridDeleteInterior::Compute()
 {
+    const UInt lowerLimitI = m_lowerLeft.m_n;
+    const UInt upperLimitI = m_upperRight.m_n;
 
-    if (m_lowerLeft.m_m >= m_grid.m_numM || m_lowerLeft.m_n >= m_grid.m_numN)
-    {
-        throw ConstraintError("Invalid index: first index {{{}, {}}} not in mesh limits {{{}, {}}}", m_lowerLeft.m_m, m_lowerLeft.m_n, m_grid.m_numM, m_grid.m_numN);
-    }
-
-    if (m_upperRight.m_m >= m_grid.m_numM || m_upperRight.m_n >= m_grid.m_numN)
-    {
-        throw ConstraintError("Invalid index: second index {{{}, {}}} not in mesh limits {{{}, {}}}", m_upperRight.m_m, m_upperRight.m_n, m_grid.m_numM, m_grid.m_numN);
-    }
-
-    UInt lowerLimitI = m_lowerLeft.m_n;
-    UInt upperLimitI = m_upperRight.m_n;
-
-    UInt lowerLimitJ = m_lowerLeft.m_m;
-    UInt upperLimitJ = m_upperRight.m_m;
+    const UInt lowerLimitJ = m_lowerLeft.m_m;
+    const UInt upperLimitJ = m_upperRight.m_m;
 
     for (UInt n = lowerLimitI + 1; n < upperLimitI; ++n)
     {