BoundaryElementSearch: Return bulk element id and bulk element face id. #2125
Conversation
| @@ -56,20 +56,28 @@ class BoundaryElementsSearcher | |||
| */ | |||
| std::vector<MeshLib::Element*> const& getBoundaryElements(GeoLib::GeoObject const& geoObj); | |||
|
|
|||
| std::vector<std::pair<std::size_t, unsigned>> const& getBulkIDs( | |||
| /** | ||
| * generate boundary elements at the given point. | ||
| * @param point Search the mesh for given point | ||
| * @return a vector of boundary elements | ||
| */ | ||
| std::vector<MeshLib::Element*> const& getBoundaryElementsAtPoint( | ||
| GeoLib::Point const& point); | ||
| std::vector<std::pair<std::size_t, unsigned>> const& getBulkIDsAtPoint( |
| break; | ||
| default: | ||
| const static std::vector<std::pair<std::size_t, unsigned>> dummy; | ||
| return dummy; |
There was a problem hiding this comment.
Shouldn't that case rather be an error?
There was a problem hiding this comment.
In principle you are right. I made it consistent with the existing code. The new method getBulkIDs() has the same behaviour as the similar method getBoundaryElements(). I don't want to break the consistency in this PR. @chleh Is this okay for you?
| std::array<MeshLib::Node*, 1> const nodes = {{ | ||
| const_cast<MeshLib::Node*>(_mesh.getNode(node_ids[0]))}}; | ||
|
|
||
| _boundary_elements.push_back(new MeshLib::Point{nodes, node_ids[0]}); | ||
| for (auto const* bulk_element : _mesh.getNode(node_ids[0])->getElements()) | ||
| { | ||
| _bulk_ids.emplace_back(std::make_pair( |
There was a problem hiding this comment.
Minor Note: emplace_back shouldn't require std::make_pair.
| { | ||
| _bulk_ids.emplace_back(std::make_pair( | ||
| bulk_element->getID(), | ||
| bulk_element->identifyFace(mesh_nodes.data()+node_ids[0]))); |
There was a problem hiding this comment.
(Not thir PR) That identifyFace does not have a const argument looks like a mistake.
| }); | ||
|
|
||
| // sort picked edges according to a distance of their first node along the | ||
| // polyline |
There was a problem hiding this comment.
Is that necessary to speed up some subsequent linear searches?
There was a problem hiding this comment.
The boundary elements have been sorted in the previous version of the implementation, too. I think the sort was necessary in OGS-5 for some reason. I'm not sure if it is needed anymore in OGS-6.
There was a problem hiding this comment.
Probably currently it's too much work to check if that code is still needed. But could you please add a comment that the sorting might be unnecessary. Because otherewise somebody who will refactor that piece of code later one might be pretty puzzled.
| std::find(node_ids_on_poly.begin(), node_ids_on_poly.end(), e2->getNodeIndex(0))); | ||
| return (dist1 < dist2); | ||
| }); | ||
| // zip _boundary_elements and _bulk_element_ids |
There was a problem hiding this comment.
Very similar algorithm zip-sort-unzip is used in BaseLib::quicksort. Maybe the BaseLib version can be generalized and used for this purpose? The only difference there is that begin is a pointer and offset, and same for the end.
| @@ -60,6 +60,8 @@ class BoundaryElementsAlongPolyline | |||
| */ | |||
| std::vector<MeshLib::Element*> const& getBoundaryElements() const {return _boundary_elements; } | |||
|
|
|||
| std::vector<std::pair<std::size_t, unsigned>> const& getBulkIDs() const; | |||
There was a problem hiding this comment.
Short comment about what is the first and second pair's element meaning.
| @@ -83,6 +85,8 @@ class BoundaryElementsAlongPolyline | |||
| MeshLib::Mesh const& _mesh; | |||
| GeoLib::Polyline const& _ply; | |||
| std::vector<MeshLib::Element*> _boundary_elements; | |||
|
|
|||
| std::vector<std::pair<std::size_t, unsigned>> _bulk_ids; | |||
| @@ -37,10 +37,19 @@ BoundaryElementsAtPoint::BoundaryElementsAtPoint( | |||
| "one is expected.", | |||
| node_ids.size(), _point[0], _point[1], _point[2]); | |||
|
|
|||
| auto& mesh_nodes = | |||
| const_cast<std::vector<MeshLib::Node*>&>(_mesh.getNodes()); | |||
There was a problem hiding this comment.
Not sure here: Maybe the const cast is not necessary? It is only used in the identifyFace call through a pointer...
There was a problem hiding this comment.
identifyFace expects a non const array. As @chleh mentioned this is probably bad design in identifyFace.
| private: | ||
| MeshLib::Mesh const& _mesh; | ||
| GeoLib::Point const& _point; | ||
| std::vector<MeshLib::Element*> _boundary_elements; | ||
| std::vector<std::pair<std::size_t, unsigned>> _bulk_ids; |
| for (auto const& boundary_elements : _boundary_elements_at_point) | ||
| { | ||
| if (boundary_elements->getPoint() == point) | ||
| return boundary_elements->getBulkIDs(); |
There was a problem hiding this comment.
The STL version:
auto it = std::find_if(begin(_boundary_elements_at_point), end(_boundary_elements_at_point,
[&point](auto const& boundary_element) {
return boundary_elements->getPoint() == point;
});
if (it != _boundary_elements_at_point.end())
return it->getBulkIDs();... is not necessarily shorter
There was a problem hiding this comment.
It is not shorter and not substantially more readable. I would like to keep my implementation. Is this okay for you?
| /// @return A vector of id pairs will be returned where the first item of | ||
| /// the pair is the element id and the second item of the pair is the face | ||
| /// id. | ||
| std::vector<std::pair<std::size_t, unsigned>> const& getBulkIDs( |
There was a problem hiding this comment.
Ah, I found the docu. You might want to use \copydoc if it's all the same text.
|
Hope the changes still give same results. If not, drop the BL changes and merge. |
TomFischer
force-pushed
the
NewFunctionalityInElementSearch
branch
from
1820992
to
96a7e1a
Compare
|
OpenGeoSys development has been moved to GitLab. |
Preparation PR for the constraint boundary condition PR that will be created soon.