From d1bd755e5f9a31774bcdd6aff8a446c5923d4f16 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Mon, 30 Jul 2018 12:43:58 +0200 Subject: [PATCH] Rename subItemIdPerItemMatrix() to itemToItemMatrix() This gives a generic way to access to item connectivities --- src/mesh/Connectivity.hpp | 14 +++++++------- src/scheme/SubItemValuePerItem.hpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesh/Connectivity.hpp b/src/mesh/Connectivity.hpp index 0ba7c101a..dd765a173 100644 --- a/src/mesh/Connectivity.hpp +++ b/src/mesh/Connectivity.hpp @@ -239,7 +239,7 @@ public: template <TypeOfItem SubItemType, TypeOfItem ItemType> - const ConnectivityMatrix& subItemIdPerItemMatrix() const = delete; + const ConnectivityMatrix& itemToItemMatrix() const = delete; private: ConnectivityComputer m_connectivity_computer; @@ -364,8 +364,8 @@ using Connectivity3D = Connectivity<3>; template <> template <> inline const ConnectivityMatrix& -Connectivity<3>::subItemIdPerItemMatrix<TypeOfItem::node, - TypeOfItem::cell>() const +Connectivity<3>::itemToItemMatrix<TypeOfItem::cell, + TypeOfItem::node>() const { return m_cell_to_node_matrix; } @@ -375,8 +375,8 @@ using Connectivity2D = Connectivity<2>; template <> template <> inline const ConnectivityMatrix& -Connectivity<2>::subItemIdPerItemMatrix<TypeOfItem::node, - TypeOfItem::cell>() const +Connectivity<2>::itemToItemMatrix<TypeOfItem::cell, + TypeOfItem::node>() const { return m_cell_to_node_matrix; } @@ -386,8 +386,8 @@ using Connectivity1D = Connectivity<1>; template <> template <> inline const ConnectivityMatrix& -Connectivity<1>::subItemIdPerItemMatrix<TypeOfItem::node, - TypeOfItem::cell>() const +Connectivity<1>::itemToItemMatrix<TypeOfItem::cell, + TypeOfItem::node>() const { return m_cell_to_node_matrix; } diff --git a/src/scheme/SubItemValuePerItem.hpp b/src/scheme/SubItemValuePerItem.hpp index d2dd8596d..ce866cf0f 100644 --- a/src/scheme/SubItemValuePerItem.hpp +++ b/src/scheme/SubItemValuePerItem.hpp @@ -165,7 +165,7 @@ class SubItemValuePerItem SubItemValuePerItem(const ConnectivityType& connectivity) { ConnectivityMatrix connectivity_matrix - = connectivity.template subItemIdPerItemMatrix<SubItemType,ItemType>(); + = connectivity.template itemToItemMatrix<ItemType,SubItemType>(); m_host_row_map = connectivity_matrix.rowsMap(); m_values = Kokkos::View<DataType*>("values", connectivity_matrix.numEntries()); } -- GitLab