GRIDEDIT-953 Added two unit tests

Deltares · Jun 17, 2024 · 94007c3 · 94007c3
1 parent 1fad686
commit 94007c3
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 3 deletions.
diff --git a/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGridSplineToGrid.cpp b/libs/MeshKernel/src/CurvilinearGrid/CurvilinearGridSplineToGrid.cpp
@@ -418,9 +418,6 @@ void meshkernel::CurvilinearGridSplineToGrid::DetermineSplineOrientation(const S
         splineInteraction[i][0] = maxm;
     }
 
-    // splineInteraction.col(1).fill(0);
-    // splineInteraction.col(2).fill(0);
-
     for (UInt i = 0; i < splines.GetNumSplines(); ++i)
     {
         splineInteraction[i][1] = 0;

diff --git a/libs/MeshKernel/tests/src/CurvilinearGridFromSplinesTests.cpp b/libs/MeshKernel/tests/src/CurvilinearGridFromSplinesTests.cpp
@@ -1350,3 +1350,61 @@ TEST(CurvilinearGridFromSplines, GenerateGridWithDisconectedSpline)
 
     EXPECT_THROW(splinesToGrid.Compute(*splines, curvilinearParameters, grid), mk::AlgorithmError);
 }
+
+TEST(CurvilinearGridFromSplines, GenerateGridWithThreeSplines)
+{
+    // Attempt to generate a grid with 3 splines
+    // Should raise a ConstraintError exception.
+    // At least four splines are required to generate a curvilinear grid
+
+    namespace mk = meshkernel;
+
+    std::vector<mk::Point> spline1{{-1.0, 0.0}, {11.0, 0.0}};
+    std::vector<mk::Point> spline2{{10.0, -1.0}, {10.0, 11.0}};
+    std::vector<mk::Point> spline3{{11.0, 10.0}, {-1.0, 10.0}};
+
+    auto splines = std::make_shared<Splines>(Projection::cartesian);
+    splines->AddSpline(spline1);
+    splines->AddSpline(spline2);
+    splines->AddSpline(spline3);
+
+    mk::CurvilinearParameters curvilinearParameters;
+
+    curvilinearParameters.m_refinement = 5;
+    curvilinearParameters.n_refinement = 5;
+
+    mk::CurvilinearGridSplineToGrid splinesToGrid;
+    mk::CurvilinearGrid grid(Projection::cartesian);
+
+    EXPECT_THROW(splinesToGrid.Compute(*splines, curvilinearParameters, grid), mk::ConstraintError);
+}
+
+TEST(CurvilinearGridFromSplines, GenerateGridWithSplinesTooShort)
+{
+    // Attempt to generate a grid with 4 splines, 1 of which has only a single point
+    // Should raise a ConstraintError exception.
+    // All splines are required to have at least 2 points in order to generate a curvilinear grid
+
+    namespace mk = meshkernel;
+
+    std::vector<mk::Point> spline1{{-1.0, 0.0}, {11.0, 0.0}};
+    std::vector<mk::Point> spline2{{10.0, -1.0}, {10.0, 11.0}};
+    std::vector<mk::Point> spline3{{11.0, 10.0}, {-1.0, 10.0}};
+    std::vector<mk::Point> spline4{{0.0, 11.0}};
+
+    auto splines = std::make_shared<Splines>(Projection::cartesian);
+    splines->AddSpline(spline1);
+    splines->AddSpline(spline2);
+    splines->AddSpline(spline3);
+    splines->AddSpline(spline4);
+
+    mk::CurvilinearParameters curvilinearParameters;
+
+    curvilinearParameters.m_refinement = 5;
+    curvilinearParameters.n_refinement = 5;
+
+    mk::CurvilinearGridSplineToGrid splinesToGrid;
+    mk::CurvilinearGrid grid(Projection::cartesian);
+
+    EXPECT_THROW(splinesToGrid.Compute(*splines, curvilinearParameters, grid), mk::ConstraintError);
+}