diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh index 03f6a325990e1455b5c679160b5d692e63b32325..b94d3dcf21b77503edd90cc43ddef0d28ca006c3 100644 --- a/dune/tectonic/myblockproblem.hh +++ b/dune/tectonic/myblockproblem.hh @@ -61,12 +61,7 @@ template <class ConvexProblemTypeTEMPLATE> class MyBlockProblem { MyBlockProblem(Dune::ParameterTree const &parset, ConvexProblemType const &problem) : parset(parset), problem(problem) { - bisection = Bisection(0.0, // acceptError: Stop if the search interval has - // become smaller than this number - parset.get<double>("bisection.acceptFactor"), - parset.get<double>("bisection.requiredResidual"), - true, // fastQuadratic - 0); // acceptance factor for inexact minimization + bisection = Bisection(); } std::string getOutput(bool header = false) const { @@ -113,7 +108,7 @@ template <class ConvexProblemTypeTEMPLATE> class MyBlockProblem { return 0; int bisectionsteps = 0; - Bisection bisection(0.0, 1.0, 1e-12, true, 0); // TODO + Bisection bisection; return bisection.minimize(psi, vnorm, 0.0, bisectionsteps) / vnorm; // TODO } diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset index e6945cbc9f578af586cdc721247197cd2c484bfa..6339c69bebe4ba940468dcf0c81ad9fbc71da206 100644 --- a/src/one-body-sample.parset +++ b/src/one-body-sample.parset @@ -45,10 +45,6 @@ post = 0 [localsolver] steps = 1 -[bisection] -acceptFactor = 1.0 -requiredResidual = 1e-12 - [boundary.friction] mu0 = 0.6 mumin = 0.0 diff --git a/src/state/compute_state_dieterich_euler.cc b/src/state/compute_state_dieterich_euler.cc index a95bcefcddb0951e67c6f0d2b9a26159db1e3cd1..1a551016c8f2836b0f37b8c10587d6a8bad522fd 100644 --- a/src/state/compute_state_dieterich_euler.cc +++ b/src/state/compute_state_dieterich_euler.cc @@ -16,7 +16,7 @@ double state_update_dieterich_euler_bisection(double tau, double VoL, 1.0 / tau, old_state / tau, phi, start, direction); int bisectionsteps = 0; - Bisection const bisection(0.0, 1.0, 1e-12, true, 0); // TODO + Bisection const bisection; return bisection.minimize(J, 0.0, 0.0, bisectionsteps); // TODO }