Feature/gridedit 1013 add missing api #323
Conversation
Add BoundingBox api data structure
Move implementations
| /// @brief Computes the node from an index | ||
| [[nodiscard]] const Point& Node(const UInt index) const | ||
| { | ||
| const UInt n = static_cast<UInt>(std::floor(index / NumM())); |
There was a problem hiding this comment.
why use std::floor here? index/NumM() is integer division.
There was a problem hiding this comment.
Consider adding index-to-curvilinear-pair and index-from-curvilinear-pair methods that provide the conversion.
There was a problem hiding this comment.
not sure it will be faster than:
[[nodiscard]] const Point& Node(const UInt index) const
{
const UInt n = index / NumM();
const UInt m = index % NumM();
return m_gridNodes(n, m);
}
data needs to be loaded into CPU caches. the approach above saves some memory
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
| const UInt n = index / NumM(); | ||
| const UInt m = index % NumM(); | ||
| return {n, m}; | ||
| } | ||
|
|
There was a problem hiding this comment.
nice!
can you add some unit tests to verify/demonstrate the convention?
| /// @brief Typedef for edge indices | ||
| using CurvilinearEdgeNodeIndices = std::array<CurvilinearGridNodeIndices, 2>; | ||
|
|
There was a problem hiding this comment.
Is it possible to use the Edge type, defined in Entities.hpp
There was a problem hiding this comment.
I think it is possible. But it requires a few other changes in other parts that deserve a separate pr
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
libs/MeshKernel/include/MeshKernel/CurvilinearGrid/CurvilinearGrid.hpp
Outdated
Show resolved
Hide resolved
| /// @param[in] boundingBox The bounding box | ||
| void BuildTree(Location meshLocation, const BoundingBox& boundingBox); |
There was a problem hiding this comment.
Isn't this function a little dangerous? We could pass a bounding box that is for a small part of the domain or even outside of the mesh domain, the tree would be empty, and many subsequent operations that used the tree would be invalid
| bool m_nodesRTreeRequiresUpdate = true; ///< m_nodesRTree requires an update | ||
| bool m_edgesRTreeRequiresUpdate = true; ///< m_edgesRTree requires an update | ||
| bool m_facesRTreeRequiresUpdate = true; ///< m_facesRTree requires an update | ||
| std::unordered_map<Location, std::unique_ptr<RTreeBase>> m_RTrees; ///< The RTrees to use | ||
| BoundingBox m_boundingBoxCache; ///< Caches the last bounding box used for selecting the locations |
There was a problem hiding this comment.
Could it be an idea to remove the trees from the curvilinear mesh completely?
Have functions that can create trees that have been pass as parameters.
The the algorithms that need the functionality provided by the tree can defined thier own trees and use them
There was a problem hiding this comment.
there is a separate task for this
| { | ||
| BuildTree(Location::Nodes); | ||
| SearchNearestLocation(point, Location::Nodes); | ||
| if (GetNumLocations(Location::Nodes) == 0) | ||
| if (rtree->GetQueryResultSize() <= 0) | ||
| { | ||
| return {constants::missing::uintValue, constants::missing::uintValue}; | ||
| throw AlgorithmError("Query result size <= 0."); | ||
| } | ||
|
|
||
| const auto nodeIndex = GetLocationsIndices(0, Location::Nodes); | ||
| return m_gridIndices[nodeIndex]; | ||
| return rtree->GetQueryResult(0); |
There was a problem hiding this comment.
Should the missing::uIntValue be returned here rather than raise an exception?
There was a problem hiding this comment.
often the return value is used as an index, an exception is better
No description provided.