Feature/gridedit 1548 casulli refinement depths #390

BillSenior · 2024-12-02T14:04:06Z

No description provided.

Added api unit functions and unit test, though the test does not yet work correctly

Added missing file and updated cmake file

…ry property

…y required conditions

…mkernel_mesh2d_set_property. Must also pass a propertyId to indicate which property is being defined

…tree in that interpolator

…e centres for triangulation interpolation

and simple unit test

BillSenior · 2024-12-19T08:20:53Z

libs/MeshKernel/src/SampleAveragingInterpolator.cpp

+
+    double searchRadiusSquared = 1.0e5;
+


Where did this number (1e5) come from?

BillSenior · 2024-12-19T08:28:02Z

libs/MeshKernelApi/include/MeshKernelApi/PropertyCalculator.hpp

+
+        /// @brief Determine the size of the edge-length vector required
+        int Size(const MeshKernelState& state, const meshkernel::Location location) const override;


Update comment, interpolation is not only for edges

BillSenior · 2024-12-19T08:28:55Z

libs/MeshKernelApi/src/MeshKernel.cpp

+        // The current property id, initialised with a number larger than the Mesh2D:::Property enum values
+        static int currentPropertyId = static_cast<int>(meshkernel::Mesh2D::Property::EdgeLength);
+


Update comment, its no longer larger than the enum.

BillSenior · 2024-12-19T08:29:47Z

libs/MeshKernelApi/src/MeshKernel.cpp

+    std::map<int, std::unique_ptr<PropertyCalculator>> allocatePropertyCalculators()
+    {
+        std::map<int, std::unique_ptr<PropertyCalculator>> propertyMap;
+
+        int propertyId = static_cast<int>(meshkernel::Mesh2D::Property::Orthogonality);
+        propertyMap.emplace(propertyId, std::make_unique<OrthogonalityPropertyCalculator>());
+
+        propertyId = static_cast<int>(meshkernel::Mesh2D::Property::EdgeLength);
+        propertyMap.emplace(propertyId, std::make_unique<EdgeLengthPropertyCalculator>());
+
+        return propertyMap;
+    }
+
+    /// @brief Map of property calculators, from an property identifier to the calculator.
+    static std::map<int, std::unique_ptr<PropertyCalculator>> propertyCalculators = allocatePropertyCalculators();


Could this be implemented as a singlton rather than a static global variable

BillSenior · 2024-12-19T12:15:41Z

libs/MeshKernel/include/MeshKernel/SampleTriangulationInterpolator.hpp

+
+        /// @brief Set sample data
+        // template <meshkernel::ValidConstDoubleArray VectorType>
+        // void SetData(const int propertyId, const VectorType& sampleData) override;
+


Remove commented out code

BillSenior · 2024-12-19T12:16:06Z

libs/MeshKernel/include/MeshKernel/Utilities/Utilities.hpp

+    /// @note saves only triangle and quadrilateral elements.
+    void PrintVtk(const std::vector<Point>& nodes, const std::vector<std::vector<UInt>>& faces, const std::string& fileName);
+


rename to save vtk

do you want to preserve this method?

BillSenior · 2024-12-19T12:16:56Z

libs/MeshKernel/src/CasulliRefinement.cpp

+            {
+                refineNode = true;
+            }


Could break here inside if

BillSenior · 2024-12-19T12:17:18Z

libs/MeshKernel/src/CasulliRefinement.cpp

+        if (node1 == constants::missing::uintValue || node2 == constants::missing::uintValue)
+        // if (node1 == constants::missing::uintValue && node2 == constants::missing::uintValue)


Remove commented out code

remove commented code

lucacarniato · 2024-12-17T16:16:09Z

libs/MeshKernel/include/MeshKernel/CasulliRefinement.hpp

@@ -32,7 +32,9 @@
 #include <vector>

 #include "MeshKernel/Mesh2D.hpp"
+#include "MeshKernel/Parameters.hpp"
 #include "MeshKernel/Polygons.hpp"


polygons.hpp unused header

lucacarniato · 2024-12-17T16:38:16Z

libs/MeshKernel/include/MeshKernel/Definitions.hpp

@@ -112,4 +113,70 @@ namespace meshkernel
    /// @brief Get the string representation of the CurvilinearDirection enumeration values.
    const std::string& CurvilinearDirectionToString(CurvilinearDirection direction);

+    /// @brief The concept specifies that the array type must have an access operator returning the array element type or can be converted to one
+    template <typename ArrayType, typename ResultType>
+    concept ArrayConstAccessConcept = requires(const ArrayType& array, const size_t i) {


when do you need these concepts?

lucacarniato · 2024-12-17T16:45:58Z

libs/MeshKernel/include/MeshKernel/MeshTriangulation.hpp

+
+    /// @brief A simple bounded array
+    template <const UInt Dimension>
+    class BoundedArray


if the dimension in known at compile time, can we use an std::array ?

lucacarniato · 2024-12-17T16:50:01Z

libs/MeshKernel/include/MeshKernel/MeshTriangulation.hpp

+        bool PointIsInElement(const Point& pnt, const UInt faceId) const;
+
+        /// @brief Print the mesh graph
+        void Print(std::ostream& out = std::cout) const;


i suggest removing this function in the final commit

lucacarniato · 2024-12-19T12:49:16Z

libs/MeshKernel/include/MeshKernel/CasulliRefinement.hpp

@@ -94,6 +120,25 @@ namespace meshkernel
        /// @param [in, out] nodeMask Node mask information
        static void InitialiseFaceNodes(const Mesh2D& mesh, std::vector<NodeMask>& nodeMask);

+        /// @brief INitialise the node mask using depth data


lucacarniato · 2024-12-19T14:30:41Z

libs/MeshKernel/include/MeshKernel/Utilities/Utilities.hpp

+    /// @note saves only triangle and quadrilateral elements.
+    void PrintVtk(const std::vector<Point>& nodes, const std::vector<std::vector<UInt>>& faces, const std::string& fileName);
+


do you want to preserve this method?

lucacarniato · 2024-12-19T14:47:56Z

libs/MeshKernel/src/CasulliRefinement.cpp

+        if (node1 == constants::missing::uintValue || node2 == constants::missing::uintValue)
+        // if (node1 == constants::missing::uintValue && node2 == constants::missing::uintValue)


remove commented code

lucacarniato · 2024-12-19T14:49:56Z

libs/MeshKernel/src/MeshTriangulation.cpp

+        {
+            return faceId;
+        }
+        else


remove else

lucacarniato · 2024-12-19T15:01:41Z

libs/MeshKernel/src/MeshTriangulation.cpp

+{
+    m_elementCentreRTree->SearchNearestPoint(pnt);
+
+    if (m_elementCentreRTree->HasQueryResults())


consider early returning instead

lucacarniato · 2024-12-19T15:21:08Z

libs/MeshKernel/tests/src/MeshRefinementTests.cpp

-                                         40, 39, 40, 25, 33,
-                                         35, 27, 36, 29, 31,
-                                         30, 37, 38, 32, 40};
+    // std::vector<int> expectedEdgesStart = {9, 25, 9, 12, 13,


remove commented code

BillSenior · 2024-12-19T17:00:41Z

libs/MeshKernel/include/MeshKernel/Parameters.hpp

+        /// @brief The minimum depth considered when computing refinement based on depths
+        ///
+        /// Only depths greater than this value will be considered.
+        double minimum_refinement_depth = 0.0;
+


Pass as parameter and remove from the struct here.
This way the api does not change

BillSenior requested a review from lucacarniato December 12, 2024 17:02

BillSenior added 29 commits December 16, 2024 17:47

GRIDEDIT-1536 Fixed bug for sphericla accurate

6810022

GRIDEDIT-1536 Added mesh triangulation and sample interpolator

1a1b6da

GRIDEDIT-1536 Small refactoring and fixing of unit test

3fbd0b6

Added api unit functions and unit test, though the test does not yet work correctly

GRIDEDIT-1536 Fixed api unit test

f85dd01

Added missing file and updated cmake file

GRIDEDIT-1536 Added checks for success after all mkapi function calls

80f0750

GRIDEDIT-1536 Extended unit tests and removed some unused code

e1b13e6

GRIDEDIT-1536 Fixed clang formatting warnings

bc3c0d7

GRIDEDIT-1536 Fixed codespell warnings

8d0c7a4

GRIDEDIT-1536 Fixed doxygen warnings

ccb657c

GRIDEDIT-1536 Fixed clang formatting warnings

c2d7c03

GRIDEDIT-1536 Changes made after sonarcloud analysis

f5be983

GRIDEDIT-1536 Changes made after sonarcloud analysis

947d8fe

GRIDEDIT-1536 Update several comments

635c7eb

GRIDEDIT-1546 Added calculator hierarchy for api properties

9659b65

GRIDEDIT-1546 Removed some commented out code

58059de

GRIDEDIT-1546 Fixed clang formatting warning

46560d5

GRIDEDIT-1546 Changes made after sonarcloud analysis

abf732a

GRIDEDIT-1546 Using the sample interpolator when getting the bathymet…

9615c1f

…ry property

GRIDEDIT-1546 Added concept to check array template parameters satisf…

27c1231

…y required conditions

GRIDEDIT-1546 Removed bathymetry from api function names, now called …

8fc7d18

…mkernel_mesh2d_set_property. Must also pass a propertyId to indicate which property is being defined

GRIDEDIT-1546 Small refactoring after review and discussion

24524a7

GRIDEDIT-1546 FIxed clang formatting and doxygen warnings

2bcb10c

GRIDEDIT-1546 Attempt at fixing windows build

8f0f8ca

GRIDEDIT-1546 Attempt at fixing windows build

5002381

GRIDEDIT-1546 Fix for clang formattnig warnings

a234d8c

GRIDEDIT-1546 Fix for clang formatting warnings

9323424

GRIDEDIT-1548 First implementation of Casulli refinement with depths

f2ad060

GRIDEDIT-1548 Removed invalid nodes and edges after Casulli refinement

bd0899c

GRIDEDIT-1548 Passing to other computer

4211df8

BillSenior added 14 commits December 16, 2024 17:47

GRIDEDIT-1548 Start at getting averaging interpolation working

4165424

GRIDEDIT-1548 Passing to other computer

28a0fbd

GRIDEDIT-1548 Passing to other computer

93b11e0

GRIDEDIT-1548 Fixed a couple of bugs, e.g. not initialising the node …

35b94e1

…tree in that interpolator

GRIDEDIT-1548 Several bug fixes

f2c4dc0

GRIDEDIT-1548 Fixed unit test

508b895

GRIDEDIT-1548 Refactored so each interpolator type is in its own file

6164d6b

GRIDEDIT-1548 Added casulli refinement wrt depths function to api

b8193cd

GRIDEDIT-1548 Extended doxygen comments

55caa8e

GRIDEDIT-1548 Added interpolation at mesh nodes, edge centres and fac…

36be737

…e centres for triangulation interpolation

GRIDEDIT-1548 FIxed some doxygen and clang formatting warnings

934891b

GRIDEDIT-1548 Added casulli refinement wrt depths to mk api

32a01b8

and simple unit test

GRIDEDIT-1548 Fixed clang formating and doxygen warnings

06ddf8a

GRIDEDIT-1548 Fixed comment spelling warnings

c38c831

BillSenior force-pushed the feature/GRIDEDIT-1548_casulli_refinement_depths branch from 52fde8f to c38c831 Compare December 16, 2024 16:47

GRIDEDIT-1548 Disabled two tests, can be removed after review

ac960cd

BillSenior commented Dec 19, 2024

View reviewed changes

lucacarniato approved these changes Dec 19, 2024

View reviewed changes

BillSenior commented Dec 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/gridedit 1548 casulli refinement depths #390

Feature/gridedit 1548 casulli refinement depths #390

BillSenior commented Dec 2, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

lucacarniato Dec 19, 2024

BillSenior Dec 19, 2024

BillSenior Dec 19, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 17, 2024

lucacarniato Dec 17, 2024

lucacarniato Dec 17, 2024

lucacarniato Dec 17, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 19, 2024

lucacarniato Dec 19, 2024

BillSenior Dec 19, 2024


		/// @brief Determine the size of the edge-length vector required
		int Size(const MeshKernelState& state, const meshkernel::Location location) const override;

		// The current property id, initialised with a number larger than the Mesh2D:::Property enum values
		static int currentPropertyId = static_cast<int>(meshkernel::Mesh2D::Property::EdgeLength);

		/// @note saves only triangle and quadrilateral elements.
		void PrintVtk(const std::vector<Point>& nodes, const std::vector<std::vector<UInt>>& faces, const std::string& fileName);

		if (node1 == constants::missing::uintValue \|\| node2 == constants::missing::uintValue)
		// if (node1 == constants::missing::uintValue && node2 == constants::missing::uintValue)

Feature/gridedit 1548 casulli refinement depths #390

Are you sure you want to change the base?

Feature/gridedit 1548 casulli refinement depths #390

Conversation

BillSenior commented Dec 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment