diff --git a/MeshGeoToolsLib/MeshNodesOnPoint.cpp b/MeshGeoToolsLib/MeshNodesOnPoint.cpp index 30d0e93113fd8cd6606672f7e796d9fde8045f2a..edeabd3664f9e030de42fb69c7f91ac18b473dbb 100644 --- a/MeshGeoToolsLib/MeshNodesOnPoint.cpp +++ b/MeshGeoToolsLib/MeshNodesOnPoint.cpp @@ -30,7 +30,7 @@ MeshNodesOnPoint::MeshNodesOnPoint(MeshLib::Mesh const& mesh, { for (auto id : vec_ids) { - if (mesh.isBaseNode(id)) + if (isBaseNode(*mesh.getNode(id))) { _msh_node_ids.push_back(id); } diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h index 0cca934b120ab2bd56cc25e34491163046e219e5..e0b445050ae33efe2e330e9792e148def50bd5ea 100644 --- a/MeshLib/Mesh.h +++ b/MeshLib/Mesh.h @@ -122,9 +122,6 @@ public: /// Get the number of base nodes std::size_t getNumberOfBaseNodes() const { return _n_base_nodes; } - /// Return true if the given node is a basic one (i.e. linear order node) - bool isBaseNode(std::size_t node_idx) const {return node_idx < _n_base_nodes; } - /// Return true if the mesh has any nonlinear nodes bool isNonlinear() const { return (getNumberOfNodes() != getNumberOfBaseNodes()); } diff --git a/ProcessLib/LIE/Common/MeshUtils.cpp b/ProcessLib/LIE/Common/MeshUtils.cpp index cf4fa79523bf26ca920851774313d4870e3dfdf5..8eae30a0dbe462973cd8bf332d97822e65689081 100644 --- a/ProcessLib/LIE/Common/MeshUtils.cpp +++ b/ProcessLib/LIE/Common/MeshUtils.cpp @@ -29,7 +29,7 @@ class IsCrackTip { public: explicit IsCrackTip(MeshLib::Mesh const& mesh) - : _mesh(mesh), _fracture_element_dim(mesh.getDimension() - 1) + : _fracture_element_dim(mesh.getDimension() - 1) { _is_internal_node.resize(mesh.getNumberOfNodes(), true); @@ -43,7 +43,7 @@ public: bool operator()(MeshLib::Node const& node) const { - if (!_is_internal_node[node.getID()] || !_mesh.isBaseNode(node.getID())) + if (!_is_internal_node[node.getID()] || !isBaseNode(node)) { return false; } @@ -59,7 +59,6 @@ public: } private: - MeshLib::Mesh const& _mesh; unsigned const _fracture_element_dim; std::vector<bool> _is_internal_node; }; diff --git a/Tests/MeshLib/TestQuadraticMesh.cpp b/Tests/MeshLib/TestQuadraticMesh.cpp index 0b53e41fedceddc4c6f9bbcf238466d6c0173dc2..68b525b4aecfbefec4d735bfa47e2ba4a273f40e 100644 --- a/Tests/MeshLib/TestQuadraticMesh.cpp +++ b/Tests/MeshLib/TestQuadraticMesh.cpp @@ -40,12 +40,12 @@ TEST(MeshLib, QuadraticOrderMesh_Line) for (unsigned i = 0; i < e->getNumberOfBaseNodes(); i++) { - ASSERT_TRUE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_TRUE(isBaseNode(*e->getNode(i))); } for (unsigned i = e->getNumberOfBaseNodes(); i < e->getNumberOfNodes(); i++) { - ASSERT_FALSE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_FALSE(isBaseNode(*e->getNode(i))); } } @@ -85,12 +85,12 @@ TEST(MeshLib, QuadraticOrderMesh_Quad8) for (unsigned i = 0; i < e->getNumberOfBaseNodes(); i++) { - ASSERT_TRUE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_TRUE(isBaseNode(*e->getNode(i))); } for (unsigned i = e->getNumberOfBaseNodes(); i < e->getNumberOfNodes(); i++) { - ASSERT_FALSE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_FALSE(isBaseNode(*e->getNode(i))); } } @@ -147,12 +147,12 @@ TEST(MeshLib, QuadraticOrderMesh_Quad9) for (unsigned i = 0; i < e->getNumberOfBaseNodes(); i++) { - ASSERT_TRUE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_TRUE(isBaseNode(*e->getNode(i))); } for (unsigned i = e->getNumberOfBaseNodes(); i < e->getNumberOfNodes(); i++) { - ASSERT_FALSE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_FALSE(isBaseNode(*e->getNode(i))); } } @@ -243,12 +243,12 @@ TEST(MeshLib, QuadraticOrderMesh_LineQuad) for (unsigned i = 0; i < e->getNumberOfBaseNodes(); i++) { - ASSERT_TRUE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_TRUE(isBaseNode(*e->getNode(i))); } for (unsigned i = e->getNumberOfBaseNodes(); i < e->getNumberOfNodes(); i++) { - ASSERT_FALSE(mesh->isBaseNode(getNodeIndex(*e, i))); + ASSERT_FALSE(isBaseNode(*e->getNode(i))); } }