From 2ae05147109ea654e7f3a1ce90d6a044b73be3a7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 21 Jul 2013 11:42:27 +0200
Subject: [PATCH] [Algorit] Use default for the bisection
---
dune/tectonic/myblockproblem.hh | 9 ++-------
src/one-body-sample.parset | 4 ----
src/state/compute_state_dieterich_euler.cc | 2 +-
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 03f6a325..b94d3dcf 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 e6945cbc..6339c69b 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 a95bcefc..1a551016 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
}
--
GitLab