Get size from the other arguments

src/assemblers.cc

@@ -58,11 +58,13 @@ assemble_frictional(GridView const &gridView, FEBasis const &feBasis,
 template <class VectorType, class MatrixType>
 Dune::shared_ptr<Dune::GlobalNonlinearity<VectorType, MatrixType> const>
 assemble_nonlinearity(
-    int size, Dune::ParameterTree const &parset,
+    Dune::ParameterTree const &parset,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
         nodalIntegrals,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> state,
     double h) {
+  auto const size = (*nodalIntegrals).size();
+
   typedef Dune::BlockVector<Dune::FieldVector<double, 1>> SingletonVectorType;
   // {{{ Assemble terms for the nonlinearity
   auto mu = Dune::make_shared<SingletonVectorType>(size);

src/assemblers.hh

@@ -25,7 +25,7 @@ assemble_frictional(GridView const &gridView, FEBasis const &feBasis,
 template <class VectorType, class MatrixType>
 Dune::shared_ptr<Dune::GlobalNonlinearity<VectorType, MatrixType> const>
 assemble_nonlinearity(
-    int size, Dune::ParameterTree const &parset,
+    Dune::ParameterTree const &parset,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
         nodalIntegrals,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> state,

src/assemblers_tmpl.cc

@@ -30,7 +30,7 @@ assemble_frictional<GridType2, GridView2, SmallVector2, P1Basis2>(
 template Dune::shared_ptr<
     Dune::GlobalNonlinearity<VectorType2, OperatorType2> const>
 assemble_nonlinearity<VectorType2, OperatorType2>(
-    int size, Dune::ParameterTree const &parset,
+    Dune::ParameterTree const &parset,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
         nodalIntegrals,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> state,
@@ -61,7 +61,7 @@ assemble_frictional<GridType3, GridView3, SmallVector3, P1Basis3>(
 template Dune::shared_ptr<
     Dune::GlobalNonlinearity<VectorType3, OperatorType3> const>
 assemble_nonlinearity<VectorType3, OperatorType3>(
-    int size, Dune::ParameterTree const &parset,
+    Dune::ParameterTree const &parset,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
         nodalIntegrals,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> state,

src/one-body-sample.cc

@@ -277,8 +277,7 @@ int main(int argc, char *argv[]) {
              ++state_fpi) {
           auto myGlobalNonlinearity =
               assemble_nonlinearity<VectorType, OperatorType>(
-                  finestSize, parset.sub("boundary.friction"), nodalIntegrals,
-                  s4_new, h);
+                  parset.sub("boundary.friction"), nodalIntegrals, s4_new, h);
           MyConvexProblemType const myConvexProblem(stiffnessMatrix,
                                                     *myGlobalNonlinearity, b4);