no friction for debugging purposes

src/spatial-solving/fixedpointiterator.cc

@@ -30,6 +30,7 @@
 #include "../utils/tobool.hh"
 #include "../utils/debugutils.hh"
 
+#include "solverfactory.hh"
 
 void FixedPointIterationCounter::operator+=(
     FixedPointIterationCounter const &other) {
@@ -123,8 +124,11 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorm>::run(
   std::cout << "- Problem assembled: success" << std::endl;
 
   // set up functional and TNMMG solver
-  Functional J(bilinearForm, totalRhs, globalFriction_, vLower, vUpper);
-  Factory solverFactory(parset_.sub("solver.tnnmg"), J, ignoreNodes_);
+  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_);*/
   auto step = solverFactory.step();
 
   std::cout << "- Functional and TNNMG step setup: success" << std::endl;

src/spatial-solving/fixedpointiterator.hh

@@ -13,6 +13,8 @@
 
 #include <dune/contact/assemblers/nbodyassembler.hh>
 
+#include "tnnmg/zerononlinearity.hh"
+#include "tnnmg/functional.hh"
 struct FixedPointIterationCounter {
   size_t iterations = 0;
   size_t multigridIterations = 0;
@@ -25,10 +27,11 @@ std::ostream &operator<<(std::ostream &stream,
 
 template <class Factory, class NBodyAssembler, class Updaters, class ErrorNorm>
 class FixedPointIterator {
-  using Functional = typename Factory::Functional;
   using ScalarVector = typename Updaters::StateUpdater::ScalarVector;
   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 Nonlinearity = typename Factory::Functional::Nonlinearity;
 
   const static int dims = Vector::block_type::dimension;