OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use user-supplied tolerance also for endpoints.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen committed 2012-01-20 14:38:29 +01:00
1 parent ba61341cab
commit 7cb74b09cf
1 file changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files
opm/core/transport/reorder/nlsolvers.c
+6 -7
View File
@@ -27,7 +27,6 @@ static const char no_root_str[]=
" In %s:\n"
" With G(0) =% 5f, G(1) =% 5f, G(s) cannot have a zero in [0,1]!\n";
static const double EPS = 1e-14;
/*---------------------------------------------------------------------------*/
@@ -73,11 +72,11 @@ ridders (double (*G)(double, void*), void *data, struct NonlinearSolverCtrl *ctr
s0 = 0.0;
G0 = G(s0, data);
if (fabs(G0)<EPS) { return s0; }
if (fabs(G0) < ctrl->nltolerance) { return s0; }
s1 = 1.0;
G1 = G(s1, data);
if (fabs(G1)<EPS) { return s1; }
if (fabs(G1) < ctrl->nltolerance) { return s1; }
if (G0*G1 > 0)
{
@@ -174,11 +173,11 @@ regulafalsi (double (*G)(double, void*), void *data, struct NonlinearSolverCtrl
/* Initial guess is interval [0,1] of course */
s0 = 0.0;
G0 = G(s0, data);
if (fabs(G0) < EPS) { return s0; }
if (fabs(G0) < ctrl->nltolerance) { return s0; }
s1 = 1.0;
G1 = G(s1, data);
if (fabs(G1) < EPS) { return s1; }
if (fabs(G1) < ctrl->nltolerance) { return s1; }
if (G0*G1 > 0)
{
@@ -259,11 +258,11 @@ bisection (double (*G)(double, void*), void *data, struct NonlinearSolverCtrl *c
/* Initial guess is interval [0,1] of course */
s0 = 0.0;
G0 = G(s0, data);
if (fabs(G0) < EPS) { return s0; }
if (fabs(G0) < ctrl->nltolerance) { return s0; }
s1 = 1.0;
G1 = G(s1, data);
if (fabs(G1) < EPS) { return s1; }
if (fabs(G1) < ctrl->nltolerance) { return s1; }
if (G0*G1 > 0.0)
{