From 8d8112301539ffe309c2233cd57b481b2cfdc1aa Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Mon, 25 Feb 2019 14:59:03 +0100
Subject: [PATCH] Use WeakSubItemValuePerItem in
computeLocalItemNumberInChildItem
---
src/mesh/ConnectivityComputer.cpp | 22 +++++++++++-----------
src/mesh/ConnectivityComputer.hpp | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mesh/ConnectivityComputer.cpp b/src/mesh/ConnectivityComputer.cpp
index 0dfc1de04..b82037098 100644
--- a/src/mesh/ConnectivityComputer.cpp
+++ b/src/mesh/ConnectivityComputer.cpp
@@ -79,7 +79,7 @@ _computeInverse(const ConnectivityMatrix& item_to_child_matrix) const
template <ItemType item_type,
ItemType child_item_type,
typename ConnectivityType>
-SubItemValuePerItem<const unsigned short, child_item_type, item_type>
+WeakSubItemValuePerItem<const unsigned short, child_item_type, item_type>
ConnectivityComputer::computeLocalItemNumberInChildItem(const ConnectivityType& connectivity) const
{
const ConnectivityMatrix& child_item_to_items_matrix
@@ -87,7 +87,7 @@ ConnectivityComputer::computeLocalItemNumberInChildItem(const ConnectivityType&
const ConnectivityMatrix& item_to_child_items_matrix
= connectivity._getMatrix(item_type, child_item_type);
- SubItemValuePerItem<unsigned short, child_item_type, item_type> item_number_in_child_item(connectivity);
+ WeakSubItemValuePerItem<unsigned short, child_item_type, item_type> item_number_in_child_item(connectivity);
for (ItemIdT<item_type> r=0; r<item_to_child_items_matrix.numRows(); ++r) {
const auto& item_to_child_items = item_to_child_items_matrix.rowConst(r);
for (unsigned short J=0; J<item_to_child_items.length; ++J) {
@@ -108,51 +108,51 @@ ConnectivityComputer::computeLocalItemNumberInChildItem(const ConnectivityType&
// 1D
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::node,
ItemType::cell>(const Connectivity1D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::face,
ItemType::cell>(const Connectivity1D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::cell,
ItemType::node>(const Connectivity1D&) const;
// 2D
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::node,
ItemType::cell>(const Connectivity2D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::face,
ItemType::cell>(const Connectivity2D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::cell,
ItemType::node>(const Connectivity2D&) const;
// 3D
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::node>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::node,
ItemType::cell>(const Connectivity3D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::cell, ItemType::face>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::face,
ItemType::cell>(const Connectivity3D&) const;
-template SubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
+template WeakSubItemValuePerItem<const unsigned short, ItemType::node, ItemType::cell>
ConnectivityComputer::
computeLocalItemNumberInChildItem<ItemType::cell,
ItemType::node>(const Connectivity3D&) const;
diff --git a/src/mesh/ConnectivityComputer.hpp b/src/mesh/ConnectivityComputer.hpp
index 8b4fdfc3a..17b620459 100644
--- a/src/mesh/ConnectivityComputer.hpp
+++ b/src/mesh/ConnectivityComputer.hpp
@@ -21,7 +21,7 @@ class ConnectivityComputer
template <ItemType item_type,
ItemType child_item_type,
typename ConnectivityType>
- SubItemValuePerItem<const unsigned short, child_item_type, item_type>
+ WeakSubItemValuePerItem<const unsigned short, child_item_type, item_type>
computeLocalItemNumberInChildItem(const ConnectivityType& connectivity) const;
ConnectivityComputer(const ConnectivityComputer&) = default;
--
GitLab