From 71f4827ca8f4955b899505b65b8d170c26ae90f0 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Thu, 4 Apr 2019 16:13:05 +0200
Subject: [PATCH] Rename ConnectivityDescriptor::cell_by_node_vector

ConnectivityDescriptor::cell_by_node_vector ->  ConnectivityDescriptor::cell_to_node_vector
---
 src/mesh/Connectivity.cpp           |  4 ++--
 src/mesh/Connectivity.hpp           |  4 ++--
 src/mesh/ConnectivityDispatcher.cpp |  5 ++--
 src/mesh/GmshReader.cpp             | 36 ++++++++++++++---------------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/mesh/Connectivity.cpp b/src/mesh/Connectivity.cpp
index 0ea63e141..58543870f 100644
--- a/src/mesh/Connectivity.cpp
+++ b/src/mesh/Connectivity.cpp
@@ -11,7 +11,7 @@ void Connectivity<Dimension>::
 _buildFrom(const ConnectivityDescriptor& descriptor)
 {
 #warning All of these should be checked by ConnectivityDescriptor
-  Assert(descriptor.cell_by_node_vector.size() == descriptor.cell_type_vector.size());
+  Assert(descriptor.cell_to_node_vector.size() == descriptor.cell_type_vector.size());
   Assert(descriptor.cell_number_vector.size() == descriptor.cell_type_vector.size());
   if constexpr (Dimension>1) {
     Assert(descriptor.cell_to_face_vector.size() == descriptor.cell_type_vector.size());
@@ -21,7 +21,7 @@ _buildFrom(const ConnectivityDescriptor& descriptor)
 
   auto& cell_to_node_matrix
       = m_item_to_item_matrix[itemTId(ItemType::cell)][itemTId(ItemType::node)];
-  cell_to_node_matrix = descriptor.cell_by_node_vector;
+  cell_to_node_matrix = descriptor.cell_to_node_vector;
 
   {
     WeakCellValue<CellType> cell_type(*this);
diff --git a/src/mesh/Connectivity.hpp b/src/mesh/Connectivity.hpp
index bd8021403..b6ce4b429 100644
--- a/src/mesh/Connectivity.hpp
+++ b/src/mesh/Connectivity.hpp
@@ -45,7 +45,7 @@ class ConnectivityDescriptor
   std::vector<RefFaceList> m_ref_face_list;
 
  public:
-  std::vector<std::vector<unsigned int>> cell_by_node_vector;
+  std::vector<std::vector<unsigned int>> cell_to_node_vector;
 
 #warning should be set in 2d
   std::vector<std::vector<unsigned int>> cell_to_face_vector;
@@ -56,7 +56,7 @@ class ConnectivityDescriptor
   auto& itemOfItemVector()
   {
     if constexpr (std::is_same_v<ItemOfItemT,NodeOfCell>) {
-      return cell_by_node_vector;
+      return cell_to_node_vector;
     } else if constexpr (std::is_same_v<ItemOfItemT,FaceOfCell>) {
       return cell_to_face_vector;
     } else if constexpr (std::is_same_v<ItemOfItemT,NodeOfCell>) {
diff --git a/src/mesh/ConnectivityDispatcher.cpp b/src/mesh/ConnectivityDispatcher.cpp
index b16f6bd7d..88b2238cb 100644
--- a/src/mesh/ConnectivityDispatcher.cpp
+++ b/src/mesh/ConnectivityDispatcher.cpp
@@ -202,7 +202,6 @@ _gatherFrom(const SubItemValuePerItem<DataType, ItemOfItem, ConnectivityPtr>& da
   }
 }
 
-
 template <int Dimension>
 void
 ConnectivityDispatcher<Dimension>::
@@ -399,7 +398,7 @@ ConnectivityDispatcher<Dimension>::_dispatchFaces()
             Assert(searched_face_id != face_number_id_map.end());
             face_vector.push_back(searched_face_id->second);
           }
-          m_new_descriptor.cell_to_face_vector.emplace_back(face_vector);
+          m_new_descriptor.itemOfItemVector<FaceOfCell>().emplace_back(face_vector);
         }
       }
     }
@@ -647,7 +646,7 @@ ConnectivityDispatcher<Dimension>::ConnectivityDispatcher(const ConnectivityType
           Assert(searched_node_id != node_number_id_map.end());
           node_vector.push_back(searched_node_id->second);
         }
-        m_new_descriptor.cell_by_node_vector.emplace_back(node_vector);
+        m_new_descriptor.cell_to_node_vector.emplace_back(node_vector);
       }
     }
   }
diff --git a/src/mesh/GmshReader.cpp b/src/mesh/GmshReader.cpp
index 2ecaa0696..662507e90 100644
--- a/src/mesh/GmshReader.cpp
+++ b/src/mesh/GmshReader.cpp
@@ -797,10 +797,10 @@ GmshReader::__computeCellFaceAndFaceNodeConnectivities(ConnectivityDescriptor& d
   using Face = ConnectivityFace<Dimension>;
 
   const auto& node_number_vector = descriptor.node_number_vector;
-  Array<unsigned short> cell_nb_faces(descriptor.cell_by_node_vector.size());
+  Array<unsigned short> cell_nb_faces(descriptor.cell_to_node_vector.size());
   std::map<Face, std::vector<CellFaceInfo>> face_cells_map;
-  for (CellId j=0; j<descriptor.cell_by_node_vector.size(); ++j) {
-    const auto& cell_nodes = descriptor.cell_by_node_vector[j];
+  for (CellId j=0; j<descriptor.cell_to_node_vector.size(); ++j) {
+    const auto& cell_nodes = descriptor.cell_to_node_vector[j];
 
     if constexpr (Dimension==2) {
       switch (descriptor.cell_type_vector[j]) {
@@ -929,7 +929,7 @@ GmshReader::__computeCellFaceAndFaceNodeConnectivities(ConnectivityDescriptor& d
   }
 
   {
-    descriptor.cell_to_face_vector.resize(descriptor.cell_by_node_vector.size());
+    descriptor.cell_to_face_vector.resize(descriptor.cell_to_node_vector.size());
     for (CellId j=0; j<descriptor.cell_to_face_vector.size(); ++j) {
       descriptor.cell_to_face_vector[j].resize(cell_nb_faces[j]);
     }
@@ -945,7 +945,7 @@ GmshReader::__computeCellFaceAndFaceNodeConnectivities(ConnectivityDescriptor& d
   }
 
   {
-    descriptor.cell_face_is_reversed_vector.resize(descriptor.cell_by_node_vector.size());
+    descriptor.cell_face_is_reversed_vector.resize(descriptor.cell_to_node_vector.size());
     for (CellId j=0; j<descriptor.cell_face_is_reversed_vector.size(); ++j) {
       descriptor.cell_face_is_reversed_vector[j] = Array<bool>(cell_nb_faces[j]);
     }
@@ -1263,13 +1263,13 @@ GmshReader::__proceedData()
     descriptor.node_number_vector = __verticesNumbers;
     descriptor.cell_type_vector.resize(nb_cells);
     descriptor.cell_number_vector.resize(nb_cells);
-    descriptor.cell_by_node_vector.resize(nb_cells);
+    descriptor.cell_to_node_vector.resize(nb_cells);
 
     const size_t nb_tetrahedra = __tetrahedra.size();
     for (size_t j=0; j<nb_tetrahedra; ++j) {
-      descriptor.cell_by_node_vector[j].resize(4);
+      descriptor.cell_to_node_vector[j].resize(4);
       for (int r=0; r<4; ++r) {
-        descriptor.cell_by_node_vector[j][r] = __tetrahedra[j][r];
+        descriptor.cell_to_node_vector[j][r] = __tetrahedra[j][r];
       }
       descriptor.cell_type_vector[j] = CellType::Tetrahedron;
       descriptor.cell_number_vector[j] = __tetrahedra_number[j];
@@ -1277,9 +1277,9 @@ GmshReader::__proceedData()
     const size_t nb_hexahedra = __hexahedra.size();
     for (size_t j=0; j<nb_hexahedra; ++j) {
       const size_t jh = nb_tetrahedra+j;
-      descriptor.cell_by_node_vector[jh].resize(8);
+      descriptor.cell_to_node_vector[jh].resize(8);
       for (int r=0; r<8; ++r) {
-        descriptor.cell_by_node_vector[jh][r] = __hexahedra[j][r];
+        descriptor.cell_to_node_vector[jh][r] = __hexahedra[j][r];
       }
       descriptor.cell_type_vector[jh] = CellType::Hexahedron;
       descriptor.cell_number_vector[jh] = __hexahedra_number[j];
@@ -1427,13 +1427,13 @@ GmshReader::__proceedData()
     descriptor.node_number_vector = __verticesNumbers;
     descriptor.cell_type_vector.resize(nb_cells);
     descriptor.cell_number_vector.resize(nb_cells);
-    descriptor.cell_by_node_vector.resize(nb_cells);
+    descriptor.cell_to_node_vector.resize(nb_cells);
 
     const size_t nb_triangles = __triangles.size();
     for (size_t j=0; j<nb_triangles; ++j) {
-      descriptor.cell_by_node_vector[j].resize(3);
+      descriptor.cell_to_node_vector[j].resize(3);
       for (int r=0; r<3; ++r) {
-        descriptor.cell_by_node_vector[j][r] = __triangles[j][r];
+        descriptor.cell_to_node_vector[j][r] = __triangles[j][r];
       }
       descriptor.cell_type_vector[j] = CellType::Triangle;
       descriptor.cell_number_vector[j] = __triangles_number[j];
@@ -1442,9 +1442,9 @@ GmshReader::__proceedData()
     const size_t nb_quadrangles = __quadrangles.size();
     for (size_t j=0; j<nb_quadrangles; ++j) {
       const size_t jq = j+nb_triangles;
-      descriptor.cell_by_node_vector[jq].resize(4);
+      descriptor.cell_to_node_vector[jq].resize(4);
       for (int r=0; r<4; ++r) {
-        descriptor.cell_by_node_vector[jq][r] = __quadrangles[j][r];
+        descriptor.cell_to_node_vector[jq][r] = __quadrangles[j][r];
       }
       descriptor.cell_type_vector[jq] = CellType::Quadrangle;
       descriptor.cell_number_vector[jq] = __quadrangles_number[j];
@@ -1569,12 +1569,12 @@ GmshReader::__proceedData()
     descriptor.node_number_vector = __verticesNumbers;
     descriptor.cell_type_vector.resize(nb_cells);
     descriptor.cell_number_vector.resize(nb_cells);
-    descriptor.cell_by_node_vector.resize(nb_cells);
+    descriptor.cell_to_node_vector.resize(nb_cells);
 
     for (size_t j=0; j<nb_cells; ++j) {
-      descriptor.cell_by_node_vector[j].resize(2);
+      descriptor.cell_to_node_vector[j].resize(2);
       for (int r=0; r<2; ++r) {
-        descriptor.cell_by_node_vector[j][r] = __edges[j][r];
+        descriptor.cell_to_node_vector[j][r] = __edges[j][r];
       }
       descriptor.cell_type_vector[j] = CellType::Line;
       descriptor.cell_number_vector[j] =  __edges_number[j];
-- 
GitLab