Merge branch 'master' into feature/GRIDEDIT-778_casulli_derefinement

.github/workflows/build-and-test-workflow.yml

@@ -19,12 +19,12 @@ jobs:
 
     name: ${{ inputs.platform }}-${{ inputs.build_type }}
 
-    # The default compiler on macos is clang, switch to gcc 11. Specifying the version is necessary.
+    # The default compiler on macos is clang, switch to gcc. Specifying the version is necessary.
     # It seems like gcc and g++ are symbolic links to the default clang and clang++ compilers, respectively.
     # CMAKE_CXX_COMPILER_ID will evaluate to AppleClang rather than GNU on macos.
     env:
-      CC: gcc-11
-      CXX: g++-11
+      CC: gcc-12
+      CXX: g++-12
 
     # Build steps
     steps:

libs/MeshKernel/CMakeLists.txt

@@ -117,6 +117,9 @@ set(
   ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridSmoothness.cpp
   ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridSnapping.cpp
   ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridUtilities.cpp
+  ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridMeshExpansionCalculator.cpp
+  ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridSnapGridToLandBoundary.cpp
+  ${CURVILINEAR_GRID_SRC_DIR}/CurvilinearGridSnapGridToSpline.cpp
 )
 
 
@@ -233,6 +236,9 @@ set(
   ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridSmoothness.hpp
   ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridSnapping.hpp
   ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridUtilities.hpp
+  ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridMeshExpansionCalculator.hpp
+  ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridSnapGridToLandBoundary.hpp
+  ${CURVILINEAR_GRID_INC_DIR}/CurvilinearGridSnapGridToSpline.hpp
 )
 
 

libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp

@@ -492,12 +492,12 @@ inline meshkernel::Point& meshkernel::CurvilinearGrid::GetNode(const UInt n, con
 
     if (n >= m_gridNodes.rows()) [[unlikely]]
     {
-        throw ConstraintError("Invalid row index {} > {}", n, m_gridNodes.rows());
+        throw ConstraintError("Invalid row index {} >= {}", n, m_gridNodes.rows());
     }
 
     if (m >= m_gridNodes.cols()) [[unlikely]]
     {
-        throw ConstraintError("Invalid column index {} > {}", m, m_gridNodes.cols());
+        throw ConstraintError("Invalid column index {} >= {}", m, m_gridNodes.cols());
     }
 
     m_nodesRTreeRequiresUpdate = true;
@@ -512,12 +512,12 @@ meshkernel::Point const& meshkernel::CurvilinearGrid::GetNode(const UInt n, cons
 
     if (n >= m_gridNodes.rows()) [[unlikely]]
     {
-        throw ConstraintError("Invalid row index {} > {}", n, m_gridNodes.rows());
+        throw ConstraintError("Invalid row index {} >= {}", n, m_gridNodes.rows());
     }
 
     if (m >= m_gridNodes.cols()) [[unlikely]]
     {
-        throw ConstraintError("Invalid column index {} > {}", m, m_gridNodes.cols());
+        throw ConstraintError("Invalid column index {} >= {}", m, m_gridNodes.cols());
     }
     return m_gridNodes(n + m_startOffset.m_n, m + m_startOffset.m_m);
 }

libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGridMeshExpansionCalculator.hpp

@@ -0,0 +1,132 @@
+//---- GPL ---------------------------------------------------------------------
+//
+// Copyright (C)  Stichting Deltares, 2011-2024.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// contact: delft3d.support@deltares.nl
+// Stichting Deltares
+// P.O. Box 177
+// 2600 MH Delft, The Netherlands
+//
+// All indications and logos of, and references to, "Delft3D" and "Deltares"
+// are registered trademarks of Stichting Deltares, and remain the property of
+// Stichting Deltares. All rights reserved.
+//
+//------------------------------------------------------------------------------
+
+#pragma once
+
+#include "MeshKernel/BoundingBox.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGridNodeIndices.hpp"
+#include "MeshKernel/LandBoundary.hpp"
+#include "MeshKernel/Splines.hpp"
+
+namespace meshkernel
+{
+
+    /// @brief Computes expansion factor for a point in the grid.
+    class CurvilinearGridMeshExpansionCalculator
+    {
+    public:
+        /// @brief Default destructor
+        virtual ~CurvilinearGridMeshExpansionCalculator() = default;
+
+        /// @brief Compute the mesh expansion factor.
+        ///
+        /// @param [in] snappedNodeIndex Index of the snapped grid point
+        /// @param [in] gridLinePointIndex Current point on the expansion grid line.
+        virtual double compute(const CurvilinearGridNodeIndices& snappedNodeIndex,
+                               const CurvilinearGridNodeIndices& gridLinePointIndex) const = 0;
+    };
+
+    /// @brief Computes the directional expansion factor for a point in the grid.
+    ///
+    /// The size of the expansion region is determine by the user selected points.
+    class UserDefinedRegionExpasionCalculator : public CurvilinearGridMeshExpansionCalculator
+    {
+    public:
+        /// @brief Constructor
+        /// @param [in] lowerLeft       Index of lower left point of expansion region
+        /// @param [in] upperRight      Index of upper right point of expansion region
+        /// @param [in] regionIndicator
+        UserDefinedRegionExpasionCalculator(const CurvilinearGridNodeIndices& lowerLeft,
+                                            const CurvilinearGridNodeIndices& upperRight,
+                                            const CurvilinearGridNodeIndices& regionIndicator);
+
+        /// @brief Compute the directional expansion factor.
+        /// @param [in] snappedNodeIndex Index of the snapped grid point
+        double compute(const CurvilinearGridNodeIndices& snappedNodeIndex,
+                       const CurvilinearGridNodeIndices& gridLinePointIndex) const override;
+
+    private:
+        /// @brief Index of lower left point of expansion region
+        CurvilinearGridNodeIndices m_indexBoxLowerLeft;
+
+        /// @brief Index of upper right point of expansion region
+        CurvilinearGridNodeIndices m_indexBoxUpperRight;
+
+        /// @brief Indicator for the expansion direction.
+        CurvilinearGridNodeIndices m_expansionRegionIndicator;
+    };
+
+    /// @brief Computes the non-directional expansion factor for a point in the grid.
+    ///
+    /// The size of the expansion region is pre-determined.
+    class DefaultRegionExpasionCalculator : public CurvilinearGridMeshExpansionCalculator
+    {
+    public:
+        /// @brief Constructor
+        /// @param [in] The starting (before expansion) grid
+        /// @param [in] The grid to which expansion is to be applied
+        /// @param [in] The landboundary
+        DefaultRegionExpasionCalculator(const CurvilinearGrid& originalGrid,
+                                        const CurvilinearGrid& snappedGrid,
+                                        const LandBoundary& landBoundary);
+
+        DefaultRegionExpasionCalculator(const CurvilinearGrid& originalGrid,
+                                        const CurvilinearGrid& snappedGrid,
+                                        const Splines& spline);
+
+        /// @brief Compute the non-direcitonal expansion factor.
+        /// @param [in] snappedNodeIndex Index of the snapped grid point
+        double compute(const CurvilinearGridNodeIndices& snappedNodeIndex,
+                       const CurvilinearGridNodeIndices& gridLinePointIndex) const override;
+
+    private:
+        /// @brief Viewing windows aspect ratio, value is used for the snapping.
+        ///
+        /// Value from editgridlineblok.f90
+        static constexpr double aspectRatio = 990.0 / 1600.0;
+
+        /// @brief How much to enlarge the size of the expansion region bounding box dimensions.
+        static constexpr double expansionRegionEnlargementFactor = 1.2;
+
+        /// @brief Compute the minimum expansion region radius.
+        ///
+        /// Used to set the m_expansionRegionMinimum member.
+        static double CalculateExpansionRegion(const BoundingBox& gridBoundingBox,
+                                               const BoundingBox& entityBoundingBox);
+
+        /// @brief The original grid before expansion
+        const CurvilinearGrid& m_originalGrid;
+
+        /// @brief The grid to which the expansion is to be applied.
+        const CurvilinearGrid& m_snappedGrid;
+
+        /// @brief The minimum expansion region radius
+        double m_expansionRegionMinimum{0.0};
+    };
+
+} // namespace meshkernel

libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGridSnapGridToLandBoundary.hpp

@@ -0,0 +1,71 @@
+//---- GPL ---------------------------------------------------------------------
+//
+// Copyright (C)  Stichting Deltares, 2011-2024.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// contact: delft3d.support@deltares.nl
+// Stichting Deltares
+// P.O. Box 177
+// 2600 MH Delft, The Netherlands
+//
+// All indications and logos of, and references to, "Delft3D" and "Deltares"
+// are registered trademarks of Stichting Deltares, and remain the property of
+// Stichting Deltares. All rights reserved.
+//
+//------------------------------------------------------------------------------
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGridMeshExpansionCalculator.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGridSnapping.hpp"
+#include "MeshKernel/Definitions.hpp"
+#include "MeshKernel/LandBoundary.hpp"
+#include "MeshKernel/Point.hpp"
+
+namespace meshkernel
+{
+
+    /// @brief Smoothly snap the grid to a land boundary.
+    class CurvilinearGridSnapGridToLandBoundary : public CurvilinearGridSnapping
+    {
+    public:
+        /// @brief constructor
+        /// @param [in] grid         The input curvilinear grid
+        /// @param [in] landBoundary The land boundary to which the grid is to be snapped.
+        /// @param [in] points       The points used to control the snapping and expansion.
+        CurvilinearGridSnapGridToLandBoundary(CurvilinearGrid& grid,
+                                              const LandBoundary& landBounday,
+                                              const std::vector<Point>& points);
+
+    private:
+        /// @brief Allocate the grid expansion calculator
+        std::unique_ptr<CurvilinearGridMeshExpansionCalculator>
+        AllocateCurvilinearGridMeshExpansionCalculator(const CurvilinearGrid& originalGrid,
+                                                       const CurvilinearGrid& snappedGrid) const override;
+
+        /// @brief Find the nearest point to the land boundary
+        Point FindNearestPoint(const Point& currentPoint) const override;
+
+        /// @brief Coordinate system
+        const Projection m_projection;
+
+        /// @brief The land boundary to which the grid is to be snapped.
+        const LandBoundary& m_landBoundary;
+    };
+
+} // namespace meshkernel

libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGridSnapGridToSpline.hpp

@@ -0,0 +1,67 @@
+//---- GPL ---------------------------------------------------------------------
+//
+// Copyright (C)  Stichting Deltares, 2011-2024.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// contact: delft3d.support@deltares.nl
+// Stichting Deltares
+// P.O. Box 177
+// 2600 MH Delft, The Netherlands
+//
+// All indications and logos of, and references to, "Delft3D" and "Deltares"
+// are registered trademarks of Stichting Deltares, and remain the property of
+// Stichting Deltares. All rights reserved.
+//
+//------------------------------------------------------------------------------
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGridMeshExpansionCalculator.hpp"
+#include "MeshKernel/CurvilinearGrid/CurvilinearGridSnapping.hpp"
+#include "MeshKernel/Point.hpp"
+#include "MeshKernel/Splines.hpp"
+
+namespace meshkernel
+{
+
+    /// @brief Smoothly snap the grid to a spline.
+    class CurvilinearGridSnapGridToSpline : public CurvilinearGridSnapping
+    {
+    public:
+        /// @brief constructor
+        /// @param [in] grid   The input curvilinear grid
+        /// @param [in] spline The spline to which the grid is to be snapped.
+        /// @param [in] points The points used to control the snapping and expansion.
+        CurvilinearGridSnapGridToSpline(CurvilinearGrid& grid,
+                                        const Splines& spline,
+                                        const std::vector<Point>& points);
+
+    private:
+        /// @brief Allocate a mesh expansion calculator
+        std::unique_ptr<CurvilinearGridMeshExpansionCalculator>
+        AllocateCurvilinearGridMeshExpansionCalculator(const CurvilinearGrid& originalGrid,
+                                                       const CurvilinearGrid& snappedGrid) const override;
+
+        /// @brief Find the nearest point to the spline
+        Point FindNearestPoint(const Point& currentPoint) const override;
+
+        /// @brief The spline
+        const Splines& m_spline;
+    };
+
+} // namespace meshkernel