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

Few clean-up

Marked use of ConnectivityMatrix as deprecated to describe subitem per item
global numbering in SubItemIdPerItemMatrix. Results in lots of warning.
parent 7358cfdc
No related branches found
No related tags found
1 merge request!6Feature/crs
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
#include <Kokkos_Core.hpp> #include <Kokkos_Core.hpp>
#include <Kokkos_StaticCrsGraph.hpp> #include <Kokkos_StaticCrsGraph.hpp>
#if 0
typedef Kokkos::StaticCrsGraph<unsigned int, Kokkos::HostSpace> ConnectivityMatrix;
#else
class ConnectivityMatrix class ConnectivityMatrix
{ {
private: private:
...@@ -41,18 +36,17 @@ class ConnectivityMatrix ...@@ -41,18 +36,17 @@ class ConnectivityMatrix
} }
KOKKOS_INLINE_FUNCTION KOKKOS_INLINE_FUNCTION
ConnectivityMatrix& operator=(const std::vector<std::vector<unsigned int>>& initializer) ConnectivityMatrix(const std::vector<std::vector<unsigned int>>& initializer)
: m_host_matrix(Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer))
{ {
m_host_matrix = Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer); ;
return *this;
} }
[[deprecated("Must only define connectivities so that only unsigned int should be treated")]] [[deprecated("Must only define connectivities so that only unsigned int should be treated")]]
KOKKOS_INLINE_FUNCTION ConnectivityMatrix(const std::vector<std::vector<unsigned short>>& initializer)
ConnectivityMatrix& operator=(const std::vector<std::vector<unsigned short>>& initializer) : m_host_matrix(Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer))
{ {
m_host_matrix = Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer); ;
return *this;
} }
ConnectivityMatrix& operator=(const ConnectivityMatrix&) = default; ConnectivityMatrix& operator=(const ConnectivityMatrix&) = default;
...@@ -64,10 +58,7 @@ class ConnectivityMatrix ...@@ -64,10 +58,7 @@ class ConnectivityMatrix
~ConnectivityMatrix() = default; ~ConnectivityMatrix() = default;
}; };
#endif
#warning use right type (unsigned short) instead of a clone of ConnectivityMatrix #warning use right type (unsigned short) instead of a clone of ConnectivityMatrix
using ConnectivityMatrixShort = ConnectivityMatrix; using ConnectivityMatrixShort = ConnectivityMatrix;
#endif // CONNECTIVITY_MATRIX_HPP #endif // CONNECTIVITY_MATRIX_HPP
...@@ -15,6 +15,7 @@ class SubItemValuePerItem ...@@ -15,6 +15,7 @@ class SubItemValuePerItem
{ {
#warning should eventually filter const from DataType #warning should eventually filter const from DataType
private: private:
[[deprecated ("must use a specific class for subitem per item numbering")]]
ConnectivityMatrix m_subitem_id_per_item_matrix; ConnectivityMatrix m_subitem_id_per_item_matrix;
Kokkos::View<DataType*> m_values; Kokkos::View<DataType*> m_values;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment