Remove ConnectivityMatrixShort

src/mesh/Connectivity.cpp

@@ -109,22 +109,17 @@ void Connectivity<3>::_computeFaceCellConnectivities()
     m_cell_to_face_matrix = cell_to_face_vector;
   }
 
+  FaceValuePerCell<bool> cell_to_face_is_reversed(*this);
   {
-    std::vector<std::vector<unsigned short>> cell_to_face_is_reversed_vector(this->numberOfCells());
-    for (size_t j=0; j<cell_to_face_is_reversed_vector.size(); ++j) {
-      cell_to_face_is_reversed_vector[j].resize(cell_nb_faces[j]);
-    }
-    int l=0;
     for (const auto& face_cells_vector : face_cells_map) {
       const auto& cells_vector = face_cells_vector.second;
       for (unsigned short lj=0; lj<cells_vector.size(); ++lj) {
         const auto& [cell_number, cell_local_face, reversed] = cells_vector[lj];
-        cell_to_face_is_reversed_vector[cell_number][cell_local_face] = reversed;
+        cell_to_face_is_reversed(cell_number, cell_local_face) = reversed;
       }
-      ++l;
     }
 
-    m_cell_to_face_is_reversed_matrix = cell_to_face_is_reversed_vector;
+    m_cell_to_face_is_reversed_matrix = cell_to_face_is_reversed;
   }
 
   {

src/mesh/Connectivity.hpp

@@ -232,7 +232,7 @@ public:
   ConnectivityMatrix m_cell_to_node_matrix;
 
   ConnectivityMatrix m_cell_to_face_matrix;
-  ConnectivityMatrixShort m_cell_to_face_is_reversed_matrix;
+  FaceValuePerCell<bool> m_cell_to_face_is_reversed_matrix;
 
   ConnectivityMatrix m_face_to_cell_matrix;
   CellValuePerFace<unsigned short> m_face_to_cell_local_face_matrix;
@@ -498,6 +498,9 @@ itemToItemMatrix(const TypeOfItem& item_type_0,
         case TypeOfItem::node: {
           return itemToItemMatrix<TypeOfItem::cell, TypeOfItem::node>();
         }
+        case TypeOfItem::face: {
+          return itemToItemMatrix<TypeOfItem::cell, TypeOfItem::face>();
+        }
         default: {
           std::cerr << __FILE__ << ":" << __LINE__ << ": NIY " << int(item_type_1) << "\n";
           std::exit(1);

src/mesh/ConnectivityMatrix.hpp

@@ -77,7 +77,4 @@ class ConnectivityMatrix
   ~ConnectivityMatrix() = default;
 };
 
-#warning use right type (unsigned short) instead of a clone of ConnectivityMatrix
-using ConnectivityMatrixShort = ConnectivityMatrix;
-
 #endif // CONNECTIVITY_MATRIX_HPP

src/mesh/MeshData.hpp

@@ -134,11 +134,11 @@ class MeshData
             node_id_to_local[cell_nodes(R)] = R;
           }
           const auto& cell_faces = m_mesh.connectivity().m_cell_to_face_matrix.rowConst(j);
-          const auto& cell_faces_is_reversed = m_mesh.connectivity().m_cell_to_face_is_reversed_matrix.rowConst(j);
+          const auto& cell_faces_is_reversed = m_mesh.connectivity().m_cell_to_face_is_reversed_matrix.itemValues(j);
           for (size_t L=0; L<cell_faces.length; ++L) {
             const size_t l = cell_faces(L);
             const auto& face_nodes = m_mesh.connectivity().m_face_to_node_matrix.rowConst(l);
-            if (cell_faces_is_reversed(L)) {
+            if (cell_faces_is_reversed[L]) {
               for (size_t rl = 0; rl<face_nodes.length; ++rl) {
                 m_Cjr(j, node_id_to_local[face_nodes(rl)]) -= Nlr(l,rl);
               }

src/mesh/SubItemValuePerItem.hpp

@@ -174,6 +174,9 @@ class SubItemValuePerItem
 template <typename DataType>
 using NodeValuePerCell = SubItemValuePerItem<DataType, TypeOfItem::node, TypeOfItem::cell>;
 
+template <typename DataType>
+using FaceValuePerCell = SubItemValuePerItem<DataType, TypeOfItem::face, TypeOfItem::cell>;
+
 template <typename DataType>
 using CellValuePerNode = SubItemValuePerItem<DataType, TypeOfItem::cell, TypeOfItem::node>;