[vector/matrix] Deprecate blocklevel member

dune/istl/bcrsmatrix.hh

@@ -499,6 +499,7 @@ namespace Dune {
     typedef ::Dune::CompressionStatistics<size_type> CompressionStatistics;
 
     //! increment block level counter
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     //! we support two modes

dune/istl/bdmatrix.hh

@@ -48,6 +48,7 @@ namespace Dune {
     typedef typename A::size_type size_type;
 
     //! increment block level counter
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     /** \brief Default constructor */

dune/istl/btdmatrix.hh

@@ -46,6 +46,7 @@ namespace Dune {
     typedef typename A::size_type size_type;
 
     //! increment block level counter
+    [[deprecated("Use free blockLevel function. Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     /** \brief Default constructor */

dune/istl/bvector.hh

@@ -417,6 +417,7 @@ namespace Imp {
     typedef typename A::size_type size_type;
 
     //! increment block level counter
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     //! make iterators available as types
@@ -648,6 +649,7 @@ namespace Imp {
     typedef typename A::size_type size_type;
 
     //! increment block level counter
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     //! make iterators available as types
@@ -1028,6 +1030,7 @@ namespace Imp {
     typedef typename A::size_type size_type;
 
     //! increment block level counter
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+1;
 
     //! make iterators available as types

dune/istl/matrix.hh

@@ -586,6 +586,7 @@ namespace MatrixImp
     typedef typename row_type::const_iterator ConstColIterator;
 
     //! The number of nesting levels the matrix contains.
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<T>::blockLevel()+1;
 
     /** \brief Create empty matrix */

dune/istl/scaledidmatrix.hh

@@ -41,10 +41,8 @@ namespace Dune {
     typedef std::size_t size_type;
 
     //! We are at the leaf of the block recursion
-    enum {
-      //! The number of block levels we contain. This is 1.
-      blocklevel = 1
-    };
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
+    static constexpr std::size_t blocklevel = 1;
 
     //! Each row is implemented by a field vector
     typedef DiagonalRowVector<K,n> row_type;

dune/istl/vbvector.hh

@@ -82,6 +82,7 @@ namespace Dune {
     /** increment block level counter, yes, it is two levels because
             VariableBlockVector is a container of containers
      */
+    [[deprecated("Use free function blockLevel(). Will be removed after 2.8.")]]
     static constexpr unsigned int blocklevel = Imp::BlockTraits<B>::blockLevel()+2;
 
     //===== constructors and such