From 12d35925356b33ed27d20d4c4a1be16ece4e920e Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@mi.fu-berlin.de>
Date: Fri, 19 Jul 2019 13:56:28 +0200
Subject: [PATCH] .
---
src/multi-body-problem-2D.cfg | 2 +-
src/spatial-solving/fixedpointiterator.cc | 8 ++++----
src/spatial-solving/fixedpointiterator.hh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/multi-body-problem-2D.cfg b/src/multi-body-problem-2D.cfg
index 9112827c..a308c80b 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 4e9309e2..fcac6335 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 9aa61196..a11a23c4 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;
--
GitLab