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

Rewrite item local number in sub-item in a generic way 

- had to reintroduce IConnectivity for cross declaration purpose
- need some more clean-up, added few #warning on this topic
parent 44578541
No related branches found
No related tags found
1 merge request!6Feature/crs
Show whitespace changes
Inline Side-by-side
src/mesh/Connectivity.cpp
+ 50
− 5
View file @ 4008c4e1
......@@ -158,11 +158,9 @@ void Connectivity<3>::_computeFaceCellConnectivities()
m_connectivity_computer.computeInverseConnectivityMatrix(cell_to_face_matrix,
face_to_cell_matrix);
CellValuePerFace<unsigned short> face_to_cell_local_face(*this);
m_connectivity_computer.computeLocalChildItemNumberInItem(cell_to_face_matrix,
face_to_cell_matrix,
face_to_cell_local_face);
m_face_to_cell_local_face = face_to_cell_local_face;
m_face_to_cell_local_face
= m_connectivity_computer.computeLocalItemNumberInChildItem<TypeOfItem::face,
TypeOfItem::cell>(*this);
const auto& face_to_node_matrix
= m_item_to_item_matrix[itemId(TypeOfItem::face)][itemId(TypeOfItem::node)];
......@@ -253,3 +251,50 @@ void Connectivity<2>::_computeFaceCellConnectivities()
face_to_cell_matrix = face_to_cell_vector;
}
}
template<size_t Dimension>
Connectivity<Dimension>::
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector)
{
auto& cell_to_node_matrix
= m_item_to_item_matrix[itemId(TypeOfItem::cell)][itemId(TypeOfItem::node)];
cell_to_node_matrix = cell_by_node_vector;
Assert(this->numberOfCells()>0);
{
Kokkos::View<double*> inv_cell_nb_nodes("inv_cell_nb_nodes", this->numberOfCells());
Kokkos::parallel_for(this->numberOfCells(), KOKKOS_LAMBDA(const int& j){
const auto& cell_nodes = cell_to_node_matrix.rowConst(j);
inv_cell_nb_nodes[j] = 1./cell_nodes.length;
});
m_inv_cell_nb_nodes = inv_cell_nb_nodes;
}
auto& node_to_cell_matrix
= m_item_to_item_matrix[itemId(TypeOfItem::node)][itemId(TypeOfItem::cell)];
m_connectivity_computer.computeInverseConnectivityMatrix(cell_to_node_matrix,
node_to_cell_matrix);
m_node_to_cell_local_node
= m_connectivity_computer.computeLocalItemNumberInChildItem<TypeOfItem::node, TypeOfItem::cell>(*this);
m_cell_to_node_local_cell
= m_connectivity_computer.computeLocalItemNumberInChildItem<TypeOfItem::cell, TypeOfItem::node>(*this);
if constexpr (Dimension>1) {
this->_computeFaceCellConnectivities();
}
}
template Connectivity1D::
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector);
template Connectivity2D::
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector);
template Connectivity3D::
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector);
src/mesh/Connectivity.hpp
+ 15
− 41
View file @ 4008c4e1
......@@ -6,9 +6,11 @@
#include <Kokkos_Core.hpp>
#include <IConnectivity.hpp>
#include <ConnectivityMatrix.hpp>
#include <ConnectivityComputer.hpp>
#include <SubItemValuePerItem.hpp>
#include <ConnectivityComputer.hpp>
#include <vector>
#include <unordered_map>
......@@ -219,7 +221,8 @@ class ConnectivityFace<3>
};
template <size_t Dimension>
class Connectivity
class Connectivity final
: public IConnectivity
{
private:
constexpr static auto& itemId = ItemId<Dimension>::itemId;
......@@ -233,11 +236,19 @@ class Connectivity
return m_item_to_item_matrix[itemId(item_type_0)][itemId(item_type_1)];
};
const ConnectivityMatrix& getMatrix(const TypeOfItem& item_type_0,
const TypeOfItem& item_type_1) const
{
return m_item_to_item_matrix[itemId(item_type_0)][itemId(item_type_1)];
}
const auto& cellFaceIsReversed() const
{
static_assert(dimension>1, "reversed faces makes no sense in dimension 1");
return m_cell_face_is_reversed;
}
[[deprecated("These member functions are poorly named")]]
const auto& cellToNodeLocalCell() const
{
return m_cell_to_node_local_cell;
......@@ -268,6 +279,7 @@ private:
FaceValuePerCell<const bool> m_cell_face_is_reversed;
[[deprecated("These members are poorly named")]]
NodeValuePerCell<const unsigned short> m_cell_to_node_local_cell;
CellValuePerFace<const unsigned short> m_face_to_cell_local_face;
......@@ -370,45 +382,7 @@ private:
Connectivity(const Connectivity&) = delete;
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector)
{
auto& cell_to_node_matrix
= m_item_to_item_matrix[itemId(TypeOfItem::cell)][itemId(TypeOfItem::node)];
cell_to_node_matrix = cell_by_node_vector;
Assert(this->numberOfCells()>0);
{
Kokkos::View<double*> inv_cell_nb_nodes("inv_cell_nb_nodes", this->numberOfCells());
Kokkos::parallel_for(this->numberOfCells(), KOKKOS_LAMBDA(const int& j){
const auto& cell_nodes = cell_to_node_matrix.rowConst(j);
inv_cell_nb_nodes[j] = 1./cell_nodes.length;
});
m_inv_cell_nb_nodes = inv_cell_nb_nodes;
}
auto& node_to_cell_matrix
= m_item_to_item_matrix[itemId(TypeOfItem::node)][itemId(TypeOfItem::cell)];
m_connectivity_computer.computeInverseConnectivityMatrix(cell_to_node_matrix,
node_to_cell_matrix);
CellValuePerNode<unsigned short> node_to_cell_local_node(*this);
m_connectivity_computer.computeLocalChildItemNumberInItem(cell_to_node_matrix,
node_to_cell_matrix,
node_to_cell_local_node);
m_node_to_cell_local_node = node_to_cell_local_node;
NodeValuePerCell<unsigned short> cell_to_node_local_cell(*this);
m_connectivity_computer.computeLocalChildItemNumberInItem(node_to_cell_matrix,
cell_to_node_matrix,
cell_to_node_local_cell);
m_cell_to_node_local_cell = cell_to_node_local_cell;
if constexpr (Dimension>1) {
this->_computeFaceCellConnectivities();
}
}
Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector);
~Connectivity()
{
......
src/mesh/ConnectivityComputer.cpp
+ 64
− 43
View file @ 4008c4e1
#include <Connectivity.hpp>
#include <ConnectivityUtils.hpp>
#include <ConnectivityComputer.hpp>
#include <map>
......@@ -33,11 +36,19 @@ computeInverseConnectivityMatrix(const ConnectivityMatrix& item_to_child_item_ma
child_item_to_item_matrix = child_item_to_items_vector;
}
void ConnectivityComputer::
computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
CellValuePerNode<unsigned short>& child_item_number_in_item_matrix) const
template <TypeOfItem child_item_type,
TypeOfItem item_type,
typename ConnectivityType>
SubItemValuePerItem<const unsigned short, item_type, child_item_type>
ConnectivityComputer::computeLocalItemNumberInChildItem(const ConnectivityType& connectivity) const
{
#warning check that these connectivities are named correctly
const ConnectivityMatrix& child_item_to_items_matrix
= getConnectivityMatrix<child_item_type, item_type>(connectivity);
const ConnectivityMatrix& item_to_child_items_matrix
= getConnectivityMatrix<item_type, child_item_type>(connectivity);
SubItemValuePerItem<unsigned short, item_type, child_item_type> item_number_in_child_item(connectivity);
for (unsigned int r=0; r<child_item_to_items_matrix.numRows(); ++r) {
const auto& child_item_to_items = child_item_to_items_matrix.rowConst(r);
for (unsigned short J=0; J<child_item_to_items.length; ++J) {
......@@ -46,54 +57,64 @@ computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_
for (unsigned int R=0; R<item_to_child_items.length; ++R) {
if (item_to_child_items(R) == r) {
child_item_number_in_item_matrix(r,J) = R;
item_number_in_child_item(r,J) = R;
break;
}
}
}
}
return item_number_in_child_item;
}
// 1D
void ConnectivityComputer::
computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
NodeValuePerCell<unsigned short>& child_item_number_in_item_matrix) const
{
for (unsigned int r=0; r<child_item_to_items_matrix.numRows(); ++r) {
const auto& child_item_to_items = child_item_to_items_matrix.rowConst(r);
for (unsigned short J=0; J<child_item_to_items.length; ++J) {
const unsigned int j = child_item_to_items(J);
const auto& item_to_child_items = item_to_child_items_matrix.rowConst(j);
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::node,
TypeOfItem::cell>(const Connectivity1D& connectivity) const;
for (unsigned int R=0; R<item_to_child_items.length; ++R) {
if (item_to_child_items(R) == r) {
child_item_number_in_item_matrix(r,J) = R;
break;
}
}
}
}
}
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::face,
TypeOfItem::cell>(const Connectivity1D& connectivity) const;
template SubItemValuePerItem<const unsigned short, TypeOfItem::node, TypeOfItem::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::cell,
TypeOfItem::node>(const Connectivity1D& connectivity) const;
void ConnectivityComputer::
computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
CellValuePerFace<unsigned short>& child_item_number_in_item_matrix) const
{
for (unsigned int r=0; r<child_item_to_items_matrix.numRows(); ++r) {
const auto& child_item_to_items = child_item_to_items_matrix.rowConst(r);
for (unsigned short J=0; J<child_item_to_items.length; ++J) {
const unsigned int j = child_item_to_items(J);
const auto& item_to_child_items = item_to_child_items_matrix.rowConst(j);
// 2D
for (unsigned int R=0; R<item_to_child_items.length; ++R) {
if (item_to_child_items(R) == r) {
child_item_number_in_item_matrix(r,J) = R;
break;
}
}
}
}
}
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::node,
TypeOfItem::cell>(const Connectivity2D& connectivity) const;
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::face,
TypeOfItem::cell>(const Connectivity2D& connectivity) const;
template SubItemValuePerItem<const unsigned short, TypeOfItem::node, TypeOfItem::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::cell,
TypeOfItem::node>(const Connectivity2D& connectivity) const;
// 3D
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::node,
TypeOfItem::cell>(const Connectivity3D& connectivity) const;
template SubItemValuePerItem<const unsigned short, TypeOfItem::cell, TypeOfItem::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::face,
TypeOfItem::cell>(const Connectivity3D& connectivity) const;
template SubItemValuePerItem<const unsigned short, TypeOfItem::node, TypeOfItem::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<TypeOfItem::cell,
TypeOfItem::node>(const Connectivity3D& connectivity) const;
src/mesh/ConnectivityComputer.hpp
+ 5
− 11
View file @ 4008c4e1
......@@ -9,17 +9,11 @@ struct ConnectivityComputer
void computeInverseConnectivityMatrix(const ConnectivityMatrix& item_to_child_item_matrix,
ConnectivityMatrix& child_item_to_item_matrix) const;
void computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
CellValuePerNode<unsigned short>& child_item_number_in_item_matrix) const;
void computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
NodeValuePerCell<unsigned short>& child_item_number_in_item_matrix) const;
void computeLocalChildItemNumberInItem(const ConnectivityMatrix& item_to_child_items_matrix,
const ConnectivityMatrix& child_item_to_items_matrix,
CellValuePerFace<unsigned short>& child_item_number_in_item_matrix) const;
template <TypeOfItem child_item_type,
TypeOfItem item_type,
typename ConnectivityType>
SubItemValuePerItem<const unsigned short, item_type, child_item_type>
computeLocalItemNumberInChildItem(const ConnectivityType& c) const;
};
#endif // CONNECTIVITY_COMPUTER_HPP
src/mesh/IConnectivity.hpp 0 → 100644
+ 18
− 0
View file @ 4008c4e1
#ifndef ICONNECTIVITY_HPP
#define ICONNECTIVITY_HPP
#include <TypeOfItem.hpp>
#include <ConnectivityMatrix.hpp>
struct IConnectivity
{
virtual const ConnectivityMatrix&
getMatrix(const TypeOfItem& item_type_0,
const TypeOfItem& item_type_1) const = 0;
IConnectivity() = default;
IConnectivity(const IConnectivity&) = delete;
~IConnectivity() = default;
};
#endif // ICONNECTIVITY_HPP
src/mesh/SubItemValuePerItem.hpp
+ 17
− 7
View file @ 4008c4e1
......@@ -6,6 +6,7 @@
#include <PastisAssert.hpp>
#include <ConnectivityMatrix.hpp>
#include <IConnectivity.hpp>
#include <ConnectivityUtils.hpp>
template <typename DataType,
......@@ -129,26 +130,35 @@ class SubItemValuePerItem
}
template <typename DataType2>
KOKKOS_INLINE_FUNCTION
SubItemValuePerItem&
operator=(const SubItemValuePerItem<DataType2, SubItemType, ItemType>& sub_item_value_per_item)
{
// ensures that DataType is the same as source DataType2 or that it is
// decorated by a const
static_assert(std::is_same<DataType, DataType2>() or std::is_same<DataType, std::add_const_t<DataType2>>(),
"Cannot assign const view to a non const view");
// ensures that DataType is the same as source DataType2
static_assert(std::is_same<std::remove_const_t<DataType>, std::remove_const_t<DataType2>>(),
"Cannot assign SubItemValuePerItem of different type");
// ensures that const is not lost through copy
static_assert(((std::is_const<DataType2>() and std::is_const<DataType>())
or not std::is_const<DataType2>()),
"Cannot assign const SubItemValuePerItem to a non const SubItemValuePerItem");
m_host_row_map = sub_item_value_per_item.m_host_row_map;
m_values = sub_item_value_per_item.m_values;
return *this;
}
template <typename DataType2>
KOKKOS_INLINE_FUNCTION
SubItemValuePerItem(const SubItemValuePerItem<DataType2, SubItemType, ItemType>& sub_item_value_per_item)
{
this->operator=(sub_item_value_per_item);
}
SubItemValuePerItem() = default;
template <typename ConnectivityType>
SubItemValuePerItem(const ConnectivityType& connectivity)
SubItemValuePerItem(const IConnectivity& connectivity)
{
ConnectivityMatrix connectivity_matrix
= getConnectivityMatrix<ItemType,SubItemType>(connectivity);
= connectivity.getMatrix(ItemType,SubItemType);
m_host_row_map = connectivity_matrix.rowsMap();
m_values = Kokkos::View<DataType*>("values", connectivity_matrix.numEntries());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment