Skip to content
Snippets Groups Projects
Commit 433431f0 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Store RefNodeList instead of node list

parent 7f86c61c
Branches
Tags
1 merge request!140Change referenced item list policy
Show whitespace changes
Inline Side-by-side
src/mesh/MeshFlatNodeBoundary.cpp
+ 15
− 12
View file @ 433431f0
......@@ -15,8 +15,9 @@ MeshFlatNodeBoundary<Dimension>::_checkBoundaryIsFlat(const TinyVector<Dimension
bool is_bad = false;
parallel_for(this->m_node_list.size(), [=, &is_bad](int r) {
const Rd& x = xr[this->m_node_list[r]];
auto node_list = this->m_ref_node_list.list();
parallel_for(node_list.size(), [=, &is_bad](int r) {
const Rd& x = xr[node_list[r]];
if (std::abs(dot(x - origin, normal)) > 1E-13 * length) {
is_bad = true;
}
......@@ -39,8 +40,9 @@ MeshFlatNodeBoundary<1>::_getNormal(const Mesh<Connectivity<1>>& mesh)
const size_t number_of_bc_nodes = [&]() {
size_t number_of_bc_nodes = 0;
auto node_is_owned = mesh.connectivity().nodeIsOwned();
for (size_t i_node = 0; i_node < m_node_list.size(); ++i_node) {
number_of_bc_nodes += (node_is_owned[m_node_list[i_node]]);
auto node_list = m_ref_node_list.list();
for (size_t i_node = 0; i_node < node_list.size(); ++i_node) {
number_of_bc_nodes += (node_is_owned[node_list[i_node]]);
}
return parallel::allReduceMax(number_of_bc_nodes);
}();
......@@ -149,14 +151,14 @@ MeshFlatNodeBoundary<1>::_getOutgoingNormal(const Mesh<Connectivity<1>>& mesh)
const R normal = this->_getNormal(mesh);
double max_height = 0;
if (m_node_list.size() > 0) {
auto node_list = m_ref_node_list.list();
if (node_list.size() > 0) {
const NodeValue<const R>& xr = mesh.xr();
const auto& cell_to_node_matrix = mesh.connectivity().cellToNodeMatrix();
const auto& node_to_cell_matrix = mesh.connectivity().nodeToCellMatrix();
const NodeId r0 = m_node_list[0];
const NodeId r0 = node_list[0];
const CellId j0 = node_to_cell_matrix[r0][0];
const auto& j0_nodes = cell_to_node_matrix[j0];
......@@ -193,13 +195,14 @@ MeshFlatNodeBoundary<2>::_getOutgoingNormal(const Mesh<Connectivity<2>>& mesh)
double max_height = 0;
if (m_node_list.size() > 0) {
auto node_list = m_ref_node_list.list();
if (node_list.size() > 0) {
const NodeValue<const R2>& xr = mesh.xr();
const auto& cell_to_node_matrix = mesh.connectivity().cellToNodeMatrix();
const auto& node_to_cell_matrix = mesh.connectivity().nodeToCellMatrix();
const NodeId r0 = m_node_list[0];
const NodeId r0 = node_list[0];
const CellId j0 = node_to_cell_matrix[r0][0];
const auto& j0_nodes = cell_to_node_matrix[j0];
for (size_t r = 0; r < j0_nodes.size(); ++r) {
......@@ -234,14 +237,14 @@ MeshFlatNodeBoundary<3>::_getOutgoingNormal(const Mesh<Connectivity<3>>& mesh)
const R3 normal = this->_getNormal(mesh);
double max_height = 0;
if (m_node_list.size() > 0) {
auto node_list = m_ref_node_list.list();
if (node_list.size() > 0) {
const NodeValue<const R3>& xr = mesh.xr();
const auto& cell_to_node_matrix = mesh.connectivity().cellToNodeMatrix();
const auto& node_to_cell_matrix = mesh.connectivity().nodeToCellMatrix();
const NodeId r0 = m_node_list[0];
const NodeId r0 = node_list[0];
const CellId j0 = node_to_cell_matrix[r0][0];
const auto& j0_nodes = cell_to_node_matrix[j0];
......
src/mesh/MeshLineNodeBoundary.cpp
+ 4
− 3
View file @ 433431f0
......@@ -18,8 +18,9 @@ MeshLineNodeBoundary<Dimension>::_checkBoundaryIsLine(const TinyVector<Dimension
const Rdxd P = Rdxd{identity} - tensorProduct(direction, direction);
bool is_bad = false;
parallel_for(this->m_node_list.size(), [=, &is_bad](int i_node) {
const Rd& x = xr[this->m_node_list[i_node]];
auto node_list = this->m_ref_node_list.list();
parallel_for(node_list.size(), [=, &is_bad](int i_node) {
const Rd& x = xr[node_list[i_node]];
const Rd delta = P * (x - origin);
if (dot(delta, delta) > 1E-13 * length) {
is_bad = true;
......
src/mesh/MeshNodeBoundary.cpp
+ 13
− 13
View file @ 433431f0
......@@ -32,8 +32,9 @@ MeshNodeBoundary<2>::_getBounds(const Mesh<Connectivity<2>>& mesh) const
}
};
for (size_t r = 0; r < m_node_list.size(); ++r) {
const R2& x = xr[m_node_list[r]];
auto node_list = m_ref_node_list.list();
for (size_t r = 0; r < node_list.size(); ++r) {
const R2& x = xr[node_list[r]];
update_xmin(x, xmin);
update_xmax(x, xmax);
}
......@@ -127,8 +128,9 @@ MeshNodeBoundary<3>::_getBounds(const Mesh<Connectivity<3>>& mesh) const
const NodeValue<const R3>& xr = mesh.xr();
for (size_t r = 0; r < m_node_list.size(); ++r) {
const R3& x = xr[m_node_list[r]];
auto node_list = m_ref_node_list.list();
for (size_t r = 0; r < node_list.size(); ++r) {
const R3& x = xr[node_list[r]];
update_xmin(x, xmin);
update_ymin(x, ymin);
update_zmin(x, zmin);
......@@ -202,18 +204,17 @@ MeshNodeBoundary<Dimension>::MeshNodeBoundary(const Mesh<Connectivity<Dimension>
Array<NodeId> node_list(node_ids.size());
parallel_for(
node_ids.size(), PUGS_LAMBDA(int r) { node_list[r] = node_ids[r]; });
m_node_list = node_list;
m_ref_node_list = RefNodeList{ref_face_list.refId(), node_list, ref_face_list.isBoundary()};
} else {
Array<NodeId> node_list(face_list.size());
parallel_for(
face_list.size(), PUGS_LAMBDA(int r) { node_list[r] = static_cast<FaceId::base_type>(face_list[r]); });
m_node_list = node_list;
m_ref_node_list = RefNodeList{ref_face_list.refId(), node_list, ref_face_list.isBoundary()};
}
// This is quite dirty but it allows a non negligible performance
// improvement
const_cast<Connectivity<Dimension>&>(mesh.connectivity())
.addRefItemList(RefItemList<ItemType::node>(ref_face_list.refId(), m_node_list, ref_face_list.isBoundary()));
const_cast<Connectivity<Dimension>&>(mesh.connectivity()).addRefItemList(m_ref_node_list);
}
template <size_t Dimension>
......@@ -249,23 +250,22 @@ MeshNodeBoundary<Dimension>::MeshNodeBoundary(const Mesh<Connectivity<Dimension>
Array<NodeId> node_list(node_ids.size());
parallel_for(
node_ids.size(), PUGS_LAMBDA(int r) { node_list[r] = node_ids[r]; });
m_node_list = node_list;
m_ref_node_list = RefNodeList{ref_edge_list.refId(), node_list, ref_edge_list.isBoundary()};
} else {
Array<NodeId> node_list(edge_list.size());
parallel_for(
edge_list.size(), PUGS_LAMBDA(int r) { node_list[r] = static_cast<EdgeId::base_type>(edge_list[r]); });
m_node_list = node_list;
m_ref_node_list = RefNodeList{ref_edge_list.refId(), node_list, ref_edge_list.isBoundary()};
}
// This is quite dirty but it allows a non negligible performance
// improvement
const_cast<Connectivity<Dimension>&>(mesh.connectivity())
.addRefItemList(RefItemList<ItemType::node>(ref_edge_list.refId(), m_node_list, ref_edge_list.isBoundary()));
const_cast<Connectivity<Dimension>&>(mesh.connectivity()).addRefItemList(m_ref_node_list);
}
template <size_t Dimension>
MeshNodeBoundary<Dimension>::MeshNodeBoundary(const Mesh<Connectivity<Dimension>>&, const RefNodeList& ref_node_list)
: m_node_list(ref_node_list.list()), m_boundary_name(ref_node_list.refId().tagName())
: m_ref_node_list(ref_node_list), m_boundary_name(ref_node_list.refId().tagName())
{
if (not ref_node_list.isBoundary()) {
std::ostringstream ost;
......
src/mesh/MeshNodeBoundary.hpp
+ 9
− 2
View file @ 433431f0
......@@ -16,7 +16,7 @@ template <size_t Dimension>
class [[nodiscard]] MeshNodeBoundary // clazy:exclude=copyable-polymorphic
{
protected:
Array<const NodeId> m_node_list;
RefNodeList m_ref_node_list;
std::string m_boundary_name;
std::array<TinyVector<Dimension>, Dimension*(Dimension - 1)> _getBounds(const Mesh<Connectivity<Dimension>>& mesh)
......@@ -30,9 +30,16 @@ class [[nodiscard]] MeshNodeBoundary // clazy:exclude=copyable-polymorphic
MeshNodeBoundary& operator=(const MeshNodeBoundary&) = default;
MeshNodeBoundary& operator=(MeshNodeBoundary&&) = default;
PUGS_INLINE
const RefNodeList& refNodeList() const
{
return m_ref_node_list;
}
PUGS_INLINE
const Array<const NodeId>& nodeList() const
{
return m_node_list;
return m_ref_node_list.list();
}
protected:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment