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

Rename ItemId to ItemTypeId

parent 06b44fdf
No related branches found
No related tags found
1 merge request!7Feature/itemvalue
......@@ -97,7 +97,7 @@ void Connectivity<3>::_computeCellFaceAndFaceNodeConnectivities()
{
auto& cell_to_face_matrix
= m_item_to_item_matrix[itemId(ItemType::cell)][itemId(ItemType::face)];
= m_item_to_item_matrix[itemTId(ItemType::cell)][itemTId(ItemType::face)];
std::vector<std::vector<unsigned int>> cell_to_face_vector(this->numberOfCells());
for (size_t j=0; j<cell_to_face_vector.size(); ++j) {
cell_to_face_vector[j].resize(cell_nb_faces[j]);
......@@ -129,7 +129,7 @@ void Connectivity<3>::_computeCellFaceAndFaceNodeConnectivities()
{
auto& face_to_node_matrix
= m_item_to_item_matrix[itemId(ItemType::face)][itemId(ItemType::node)];
= m_item_to_item_matrix[itemTId(ItemType::face)][itemTId(ItemType::node)];
std::vector<std::vector<unsigned int>> face_to_node_vector(face_cells_map.size());
int l=0;
......@@ -192,7 +192,7 @@ void Connectivity<2>::_computeCellFaceAndFaceNodeConnectivities()
++l;
}
auto& face_to_node_matrix
= m_item_to_item_matrix[itemId(ItemType::face)][itemId(ItemType::node)];
= m_item_to_item_matrix[itemTId(ItemType::face)][itemTId(ItemType::node)];
face_to_node_matrix = face_to_node_vector;
}
......@@ -207,7 +207,7 @@ void Connectivity<2>::_computeCellFaceAndFaceNodeConnectivities()
++l;
}
auto& face_to_cell_matrix
= m_item_to_item_matrix[itemId(ItemType::face)][itemId(ItemType::cell)];
= m_item_to_item_matrix[itemTId(ItemType::face)][itemTId(ItemType::cell)];
face_to_cell_matrix = face_to_cell_vector;
}
}
......@@ -221,7 +221,7 @@ Connectivity(const std::vector<std::vector<unsigned int>>& cell_by_node_vector,
Assert(cell_by_node_vector.size() == cell_type_vector.size());
auto& cell_to_node_matrix
= m_item_to_item_matrix[itemId(ItemType::cell)][itemId(ItemType::node)];
= m_item_to_item_matrix[itemTId(ItemType::cell)][itemTId(ItemType::node)];
cell_to_node_matrix = cell_by_node_vector;
Assert(this->numberOfCells()>0);
......
......@@ -228,7 +228,7 @@ class Connectivity final
: public IConnectivity
{
private:
constexpr static auto& itemId = ItemId<Dimension>::itemId;
constexpr static auto& itemTId = ItemTypeId<Dimension>::itemTId;
public:
static constexpr size_t dimension = Dimension;
......@@ -289,7 +289,7 @@ class Connectivity final
const ItemType& item_type_1) const
{
const ConnectivityMatrix& connectivity_matrix
= m_item_to_item_matrix[itemId(item_type_0)][itemId(item_type_1)];
= m_item_to_item_matrix[itemTId(item_type_0)][itemTId(item_type_1)];
return connectivity_matrix.isBuilt();
}
......@@ -298,7 +298,7 @@ class Connectivity final
const ItemType& item_type_1) const
{
const ConnectivityMatrix& connectivity_matrix
= m_item_to_item_matrix[itemId(item_type_0)][itemId(item_type_1)];
= m_item_to_item_matrix[itemTId(item_type_0)][itemTId(item_type_1)];
if (not connectivity_matrix.isBuilt()) {
const_cast<ConnectivityMatrix&>(connectivity_matrix)
= m_connectivity_computer
......
......@@ -39,12 +39,12 @@ std::string_view itemName(const ItemType& item_type)
}
template <size_t Dimension>
struct ItemId {};
struct ItemTypeId {};
template <>
struct ItemId<1>
struct ItemTypeId<1>
{
inline static constexpr size_t itemId(const ItemType& item_type) {
inline static constexpr size_t itemTId(const ItemType& item_type) {
size_t i = std::numeric_limits<size_t>::max();
switch(item_type) {
case ItemType::cell: {
......@@ -64,9 +64,9 @@ struct ItemId<1>
};
template <>
struct ItemId<2>
struct ItemTypeId<2>
{
inline static constexpr size_t itemId(const ItemType& item_type) {
inline static constexpr size_t itemTId(const ItemType& item_type) {
size_t i = std::numeric_limits<size_t>::max();
switch(item_type) {
case ItemType::cell: {
......@@ -89,9 +89,9 @@ struct ItemId<2>
};
template <>
struct ItemId<3>
struct ItemTypeId<3>
{
inline static constexpr size_t itemId(const ItemType& item_type) {
inline static constexpr size_t itemTId(const ItemType& item_type) {
size_t i = std::numeric_limits<size_t>::max();
switch(item_type) {
case ItemType::cell: {
......
......@@ -26,23 +26,23 @@ TEST_CASE("ItemType", "[connectivity]") {
}
SECTION("checking for item ids in 1d") {
REQUIRE(ItemId<1>::itemId(cell_type)==0);
REQUIRE(ItemId<1>::itemId(edge_type)==1);
REQUIRE(ItemId<1>::itemId(face_type)==1);
REQUIRE(ItemId<1>::itemId(node_type)==1);
REQUIRE(ItemTypeId<1>::itemTId(cell_type)==0);
REQUIRE(ItemTypeId<1>::itemTId(edge_type)==1);
REQUIRE(ItemTypeId<1>::itemTId(face_type)==1);
REQUIRE(ItemTypeId<1>::itemTId(node_type)==1);
}
SECTION("checking for item ids in 2d") {
REQUIRE(ItemId<2>::itemId(cell_type)==0);
REQUIRE(ItemId<2>::itemId(edge_type)==1);
REQUIRE(ItemId<2>::itemId(face_type)==1);
REQUIRE(ItemId<2>::itemId(node_type)==2);
REQUIRE(ItemTypeId<2>::itemTId(cell_type)==0);
REQUIRE(ItemTypeId<2>::itemTId(edge_type)==1);
REQUIRE(ItemTypeId<2>::itemTId(face_type)==1);
REQUIRE(ItemTypeId<2>::itemTId(node_type)==2);
}
SECTION("checking for item ids in 3d") {
REQUIRE(ItemId<3>::itemId(cell_type)==0);
REQUIRE(ItemId<3>::itemId(edge_type)==1);
REQUIRE(ItemId<3>::itemId(face_type)==2);
REQUIRE(ItemId<3>::itemId(node_type)==3);
REQUIRE(ItemTypeId<3>::itemTId(cell_type)==0);
REQUIRE(ItemTypeId<3>::itemTId(edge_type)==1);
REQUIRE(ItemTypeId<3>::itemTId(face_type)==2);
REQUIRE(ItemTypeId<3>::itemTId(node_type)==3);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment