Retrieve dimension from VectorType

dune/tectonic/globallaursennonlinearity.hh

@@ -13,10 +13,12 @@
 #include "nicefunction.hh"
 
 namespace Dune {
-template <int dim, class OuterFunctionType, class VectorType, class MatrixType>
+template <int dimZ, class OuterFunctionType, class VectorType, class MatrixType>
 class GlobalLaursenNonlinearity
-    : public GlobalNonlinearity<dim, VectorType, MatrixType> {
+    : public GlobalNonlinearity<dimZ, VectorType, MatrixType> {
 public:
+  using GlobalNonlinearity<dimZ, VectorType, MatrixType>::dim;
+
   GlobalLaursenNonlinearity(
       shared_ptr<BlockVector<FieldVector<double, 1>> const> mu,
       shared_ptr<BlockVector<FieldVector<double, 1>> const> normalStress,

dune/tectonic/globalnonlinearity.hh

@@ -12,11 +12,12 @@
 #include "localnonlinearity.hh"
 
 namespace Dune {
-template <int dim, class VectorTypeTEMPLATE, class MatrixTypeTEMPLATE>
+template <int dimX, class VectorTypeTEMPLATE, class MatrixTypeTEMPLATE>
 class GlobalNonlinearity {
 public:
   typedef VectorTypeTEMPLATE VectorType;
   typedef MatrixTypeTEMPLATE MatrixType;
+  int static const dim = VectorTypeTEMPLATE::block_type::dimension;
 
   double operator()(VectorType const &x) const {
     double tmp = 0;

dune/tectonic/globalruinanonlinearity.hh

@@ -14,10 +14,12 @@
 #include "nicefunction.hh"
 
 namespace Dune {
-template <int dim, class VectorType, class MatrixType>
+template <int dimX, class VectorType, class MatrixType>
 class GlobalRuinaNonlinearity
-    : public GlobalNonlinearity<dim, VectorType, MatrixType> {
+    : public GlobalNonlinearity<dimX, VectorType, MatrixType> {
 public:
+  using GlobalNonlinearity<dimX, VectorType, MatrixType>::dim;
+
   GlobalRuinaNonlinearity(
       shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals,
       shared_ptr<BlockVector<FieldVector<double, 1>> const> a,