diff --git a/src/multi-body-problem-2D.cfg b/src/multi-body-problem-2D.cfg index 9112827cdd0dcee0ccd8e19324e54dd778f4ffb5..a308c80b63b9cb2b48f0cc096ade7d9cdf464e57 100644 --- a/src/multi-body-problem-2D.cfg +++ b/src/multi-body-problem-2D.cfg @@ -1,6 +1,6 @@ # -*- mode:conf -*- [boundary.friction] -smallestDiameter = 0.1 # 2e-3 [m] +smallestDiameter = 0.01 # 2e-3 [m] [timeSteps] refinementTolerance = 1e-5 # 1e-5 diff --git a/src/spatial-solving/fixedpointiterator.cc b/src/spatial-solving/fixedpointiterator.cc index 4e9309e22e6608caeb7135d30fb9c35455ea3441..fcac6335650a97a403a854a58eb6d3558c157583 100644 --- a/src/spatial-solving/fixedpointiterator.cc +++ b/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; diff --git a/src/spatial-solving/fixedpointiterator.hh b/src/spatial-solving/fixedpointiterator.hh index 9aa6119642451406c2537f569e7091f55e4c8cf3..a11a23c4dfacb04821c5b3988c201bd56f4c4886 100644 --- a/src/spatial-solving/fixedpointiterator.hh +++ b/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;