.

src/multi-body-problem-2D.cfg

 # -*- mode:conf -*-
 [boundary.friction]
-smallestDiameter = 0.1  # 2e-3 [m]
+smallestDiameter = 0.01  # 2e-3 [m]
 
 [timeSteps]
 refinementTolerance = 1e-5 # 1e-5

src/spatial-solving/fixedpointiterator.cc

@@ -124,11 +124,11 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorm>::run(
   std::cout << "- Problem assembled: success" << std::endl;
 
   // set up functional and TNMMG solver
-  using ZeroFactory = SolverFactory<Functional, IgnoreVector>;
+  /*using ZeroFactory = SolverFactory<Functional, IgnoreVector>;
   Functional J(bilinearForm, totalRhs, ZeroNonlinearity(), vLower, vUpper);
-  ZeroFactory solverFactory(parset_.sub("solver.tnnmg"), J, ignoreNodes_);
-  /*Functional J(bilinearForm, totalRhs, globalFriction_, vLower, vUpper);
-  Factory solverFactory(parset_.sub("solver.tnnmg"), J, ignoreNodes_);*/
+  ZeroFactory solverFactory(parset_.sub("solver.tnnmg"), J, ignoreNodes_);*/
+  Functional J(bilinearForm, totalRhs, globalFriction_, vLower, vUpper);
+  Factory solverFactory(parset_.sub("solver.tnnmg"), J, ignoreNodes_);
   auto step = solverFactory.step();
 
   std::cout << "- Functional and TNNMG step setup: success" << std::endl;

src/spatial-solving/fixedpointiterator.hh

@@ -31,7 +31,7 @@ class FixedPointIterator {
   using Vector = typename Factory::Vector;
   using Matrix = typename Factory::Matrix;
 
-  using Functional = Functional<Matrix&, Vector&, ZeroNonlinearity&, Vector&, Vector&, typename Matrix::field_type>; //typename Factory::Functional;
+  using Functional = typename Factory::Functional; //Functional<Matrix&, Vector&, ZeroNonlinearity&, Vector&, Vector&, typename Matrix::field_type>;
   using Nonlinearity = typename Factory::Functional::Nonlinearity;
 
   const static int dims = Vector::block_type::dimension;