From 7a317161859be4e6612382fe537476c599a2c5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 4 Jun 2012 16:54:41 +0200 Subject: [PATCH] Comment and indent bracketZero(). --- opm/core/utility/RootFinders.hpp | 62 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/opm/core/utility/RootFinders.hpp b/opm/core/utility/RootFinders.hpp index 742eddc0..ef2be9f4 100644 --- a/opm/core/utility/RootFinders.hpp +++ b/opm/core/utility/RootFinders.hpp @@ -293,37 +293,41 @@ namespace Opm - - template - inline void bracketZero(const Functor& f, - const double x0, - const double dx, - double& a, - double& b) - { - const int max_iters = 100; - double f0 = f(x0); - double cur_dx = dx; - int i = 0; - for (; i < max_iters; ++i) { - double x = x0 + cur_dx; - double f_new = f(x); - if (f0*f_new <= 0.0) { - break; - } - cur_dx = -2.0*cur_dx; - } - if (i == max_iters) { - THROW("Could not bracket zero in " << max_iters << "iterations."); - } - if (cur_dx < 0.0) { - a = x0 + cur_dx; - b = i < 2 ? x0 : x0 + 0.25*cur_dx; - } else { - a = i < 2 ? x0 : x0 + 0.25*cur_dx; - b = x0 + cur_dx; + /// Attempts to find an interval bracketing a zero by successive + /// enlargement of search interval. + template + inline void bracketZero(const Functor& f, + const double x0, + const double dx, + double& a, + double& b) + { + const int max_iters = 100; + double f0 = f(x0); + double cur_dx = dx; + int i = 0; + for (; i < max_iters; ++i) { + double x = x0 + cur_dx; + double f_new = f(x); + if (f0*f_new <= 0.0) { + break; } + cur_dx = -2.0*cur_dx; } + if (i == max_iters) { + THROW("Could not bracket zero in " << max_iters << "iterations."); + } + if (cur_dx < 0.0) { + a = x0 + cur_dx; + b = i < 2 ? x0 : x0 + 0.25*cur_dx; + } else { + a = i < 2 ? x0 : x0 + 0.25*cur_dx; + b = x0 + cur_dx; + } + } + + + } // namespace Opm