From 6afa1923f18d6ca5dde7d83aa916ff3c1bd60134 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Tue, 14 Jul 2015 21:01:12 +0200
Subject: [PATCH] include comments from DN
---
MeshLib/MeshSearch/ElementSearch.cpp | 4 ----
MeshLib/MeshSearch/ElementSearch.h | 4 +---
MeshLib/MeshSearch/NodeSearch.cpp | 6 +-----
MeshLib/MeshSearch/NodeSearch.h | 6 ++----
ProcessLib/NeumannBc.h | 2 +-
Tests/AssemblerLib/LocalToGlobalIndexMap.cpp | 2 +-
Tests/MeshLib/TestBoundaryElementSearch.cpp | 4 ++--
Tests/MeshLib/TestRemove.cpp | 13 +++++++------
8 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/MeshLib/MeshSearch/ElementSearch.cpp b/MeshLib/MeshSearch/ElementSearch.cpp
index 61441cbdefc..a8d165ef087 100644
--- a/MeshLib/MeshSearch/ElementSearch.cpp
+++ b/MeshLib/MeshSearch/ElementSearch.cpp
@@ -22,10 +22,6 @@ ElementSearch::ElementSearch(const MeshLib::Mesh &mesh)
{
}
-ElementSearch::~ElementSearch()
-{
-}
-
std::size_t ElementSearch::searchByMaterialID(int const matID)
{
boost::optional<MeshLib::PropertyVector<int> const&> opt_pv(
diff --git a/MeshLib/MeshSearch/ElementSearch.h b/MeshLib/MeshSearch/ElementSearch.h
index 85715826feb..724743e3d48 100644
--- a/MeshLib/MeshSearch/ElementSearch.h
+++ b/MeshLib/MeshSearch/ElementSearch.h
@@ -23,13 +23,11 @@ class Mesh;
class Element;
/// Element search class
-class ElementSearch
+class ElementSearch final
{
public:
explicit ElementSearch(const MeshLib::Mesh &mesh);
- ~ElementSearch();
-
/// return marked elements
const std::vector<std::size_t>& getSearchedElementIDs() const { return _marked_elements; }
diff --git a/MeshLib/MeshSearch/NodeSearch.cpp b/MeshLib/MeshSearch/NodeSearch.cpp
index ea5a92c9271..81efa477843 100644
--- a/MeshLib/MeshSearch/NodeSearch.cpp
+++ b/MeshLib/MeshSearch/NodeSearch.cpp
@@ -24,10 +24,6 @@ NodeSearch::NodeSearch(const MeshLib::Mesh &mesh)
{
}
-NodeSearch::~NodeSearch()
-{
-}
-
std::size_t NodeSearch::searchByElementIDs(const std::vector<std::size_t> &elements, bool only_match_all_connected_elements)
{
std::vector<std::size_t> connected_nodes;
@@ -86,7 +82,7 @@ void NodeSearch::updateUnion(const std::vector<std::size_t> &vec)
_marked_nodes.assign(vec_temp.begin(), vec_temp.end());
}
-std::vector<Node*> getNodes(std::vector<Element*> const& elements)
+std::vector<Node*> getUniqueNodes(std::vector<Element*> const& elements)
{
std::set<Node*> nodes_set;
for (auto e : elements)
diff --git a/MeshLib/MeshSearch/NodeSearch.h b/MeshLib/MeshSearch/NodeSearch.h
index cde251814cf..8a8df377faf 100644
--- a/MeshLib/MeshSearch/NodeSearch.h
+++ b/MeshLib/MeshSearch/NodeSearch.h
@@ -21,13 +21,11 @@ class Element;
class Node;
/// Node search class
-class NodeSearch
+class NodeSearch final
{
public:
explicit NodeSearch(const MeshLib::Mesh &mesh);
- ~NodeSearch();
-
/// return marked node IDs
const std::vector<std::size_t>& getSearchedNodeIDs() const {return _marked_nodes; }
@@ -48,7 +46,7 @@ private:
};
/// Create a vector of unique nodes used by given elements.
-std::vector<Node*> getNodes(std::vector<Element*> const& elements);
+std::vector<Node*> getUniqueNodes(std::vector<Element*> const& elements);
} // end namespace MeshLib
diff --git a/ProcessLib/NeumannBc.h b/ProcessLib/NeumannBc.h
index b31b3d6aea2..abe0c146622 100644
--- a/ProcessLib/NeumannBc.h
+++ b/ProcessLib/NeumannBc.h
@@ -64,7 +64,7 @@ public:
std::back_inserter(_elements),
std::mem_fn(&MeshLib::Element::clone));
- std::vector<MeshLib::Node*> nodes = MeshLib::getNodes(_elements);
+ std::vector<MeshLib::Node*> nodes = MeshLib::getUniqueNodes(_elements);
_mesh_subset_all_nodes =
mesh_subset_all_nodes.getIntersectionByNodes(nodes);
diff --git a/Tests/AssemblerLib/LocalToGlobalIndexMap.cpp b/Tests/AssemblerLib/LocalToGlobalIndexMap.cpp
index f625863b20a..ad750a55168 100644
--- a/Tests/AssemblerLib/LocalToGlobalIndexMap.cpp
+++ b/Tests/AssemblerLib/LocalToGlobalIndexMap.cpp
@@ -88,7 +88,7 @@ TEST_F(AssemblerLibLocalToGlobalIndexMapTest, SubsetByComponent)
some_elements.push_back(const_cast<MeshLib::Element*>(mesh->getElement(id)));
// Find unique node ids of the selected elements for testing.
- std::vector<MeshLib::Node*> selected_nodes = MeshLib::getNodes(some_elements);
+ std::vector<MeshLib::Node*> selected_nodes = MeshLib::getUniqueNodes(some_elements);
MeshLib::MeshSubset const* const selected_subset =
nodesSubset->getIntersectionByNodes(selected_nodes);
diff --git a/Tests/MeshLib/TestBoundaryElementSearch.cpp b/Tests/MeshLib/TestBoundaryElementSearch.cpp
index fa7380241e6..ac5a62f86d3 100644
--- a/Tests/MeshLib/TestBoundaryElementSearch.cpp
+++ b/Tests/MeshLib/TestBoundaryElementSearch.cpp
@@ -151,7 +151,7 @@ TEST_F(MeshLibBoundaryElementSearchInSimpleHexMesh, SurfaceSearch)
double sum_area_b = std::accumulate(found_faces_sfc_b.begin(), found_faces_sfc_b.end(), 0.0,
[](double v, MeshLib::Element*e){return v+e->getContent();});
ASSERT_EQ(_geometric_size*_geometric_size, sum_area_b);
- auto connected_nodes_b = MeshLib::getNodes(found_faces_sfc_b);
+ auto connected_nodes_b = MeshLib::getUniqueNodes(found_faces_sfc_b);
ASSERT_EQ(n_nodes_2d, connected_nodes_b.size());
for (auto node : connected_nodes_b)
ASSERT_EQ(0.0, (*node)[2]); // check z coordinates
@@ -162,7 +162,7 @@ TEST_F(MeshLibBoundaryElementSearchInSimpleHexMesh, SurfaceSearch)
double sum_area_f = std::accumulate(found_faces_sfc_f.begin(), found_faces_sfc_f.end(), 0.0,
[](double v, MeshLib::Element*e){return v+e->getContent();});
ASSERT_EQ(_geometric_size*_geometric_size, sum_area_f);
- auto connected_nodes_f = MeshLib::getNodes(found_faces_sfc_f);
+ auto connected_nodes_f = MeshLib::getUniqueNodes(found_faces_sfc_f);
ASSERT_EQ(n_nodes_2d, connected_nodes_f.size());
for (auto node : connected_nodes_f)
ASSERT_EQ(0.0, (*node)[1]); // check y coordinates
diff --git a/Tests/MeshLib/TestRemove.cpp b/Tests/MeshLib/TestRemove.cpp
index b753a8ebbc3..8659eda07ff 100644
--- a/Tests/MeshLib/TestRemove.cpp
+++ b/Tests/MeshLib/TestRemove.cpp
@@ -15,13 +15,14 @@
#include "gtest/gtest.h"
-#include "Mesh.h"
+#include "MathLib/MathTools.h"
+
+#include "MeshLib/Mesh.h"
#include "MeshLib/Node.h"
-#include "Elements/Element.h"
-#include "MeshEditing/RemoveMeshComponents.h"
-#include "MeshGenerators/MeshGenerator.h"
-#include "MeshQuality/MeshValidation.h"
-#include "MathTools.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/MeshEditing/RemoveMeshComponents.h"
+#include "MeshLib/MeshGenerators/MeshGenerator.h"
+#include "MeshLib/MeshQuality/MeshValidation.h"
TEST(MeshLib, RemoveNodes)
{
--
GitLab