OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use new interface for regula falsi, switch to non-throwing error policy.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-05-24 10:27:27 +02:00
parent 00a628fa87
commit c3dac20d65
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/polymer/TransportModelPolymer.cpp
View File

@@ -26,6 +26,10 @@
#include <cmath> #include <cmath>
// Choose error policy for scalar solves here.
typedef Opm::RegulaFalsi<Opm::WarnAndContinueOnError> RootFinder;
class Opm::TransportModelPolymer::ResidualEquation class Opm::TransportModelPolymer::ResidualEquation
{ {
public: public:
@@ -371,7 +375,7 @@ namespace Opm
// Solve for s first. // Solve for s first.
// s = modifiedRegulaFalsi(res_s, std::max(tm.smin_[2*cell], dps), tm.smax_[2*cell], // s = modifiedRegulaFalsi(res_s, std::max(tm.smin_[2*cell], dps), tm.smax_[2*cell],
// tm.maxit_, tm.tol_, iters_used); // tm.maxit_, tm.tol_, iters_used);
s = modifiedRegulaFalsi(res_s, s0, 0.0, 1.0, s = RootFinder::solve(res_s, s0, 0.0, 1.0,
tm.maxit_, tm.tol_, iters_used); tm.maxit_, tm.tol_, iters_used);
double ff; double ff;
tm.fracFlow(s, c, cmax0, cell, ff); tm.fracFlow(s, c, cmax0, cell, ff);
@@ -639,7 +643,7 @@ namespace Opm
return; return;
} }
concentration_[cell] = modifiedRegulaFalsi(res, a, b, maxit_, tol_, iters_used); concentration_[cell] = RootFinder::solve(res, a, b, maxit_, tol_, iters_used);
cmax_[cell] = std::max(cmax_[cell], concentration_[cell]); cmax_[cell] = std::max(cmax_[cell], concentration_[cell]);
saturation_[cell] = res.lastSaturation(); saturation_[cell] = res.lastSaturation();
fracFlow(saturation_[cell], concentration_[cell], cmax_[cell], cell, fracFlow(saturation_[cell], concentration_[cell], cmax_[cell], cell,
@@ -799,7 +803,7 @@ namespace Opm
} }
} }
// Note: In some experiments modifiedRegularFalsi does not yield a result under the given tolerance. // Note: In some experiments modifiedRegularFalsi does not yield a result under the given tolerance.
t = modifiedRegulaFalsi(res_s_on_curve, 0., t_max, maxit_, falsi_tol, iters_used_falsi); t = RootFinder::solve(res_s_on_curve, 0., t_max, maxit_, falsi_tol, iters_used_falsi);
res_s_on_curve.curve.computeXOfT(x, t); res_s_on_curve.curve.computeXOfT(x, t);
} else { } else {
if (res[1] < 0) { if (res[1] < 0) {
@@ -817,7 +821,7 @@ namespace Opm
t_max = t_out; t_max = t_out;
} }
} }
t = modifiedRegulaFalsi(res_c_on_curve, 0., t_max, maxit_, falsi_tol, iters_used_falsi); t = RootFinder::solve(res_c_on_curve, 0., t_max, maxit_, falsi_tol, iters_used_falsi);
res_c_on_curve.curve.computeXOfT(x, t); res_c_on_curve.curve.computeXOfT(x, t);
} }
@@ -967,7 +971,7 @@ namespace Opm
{ {
c_ = c; c_ = c;
int iters_used; int iters_used;
return modifiedRegulaFalsi(*this, res_c_eq_.s0, 0.0, 1.0, return RootFinder::solve(*this, res_c_eq_.s0, 0.0, 1.0,
res_c_eq_.tm.maxit_, res_c_eq_.tm.tol_, res_c_eq_.tm.maxit_, res_c_eq_.tm.tol_,
iters_used); iters_used);
} }
@@ -1130,7 +1134,7 @@ namespace Opm
const double a = 0.0; const double a = 0.0;
const double b = polyprops_.cMax()*1.1; // Add 10% to account for possible non-monotonicity of hyperbolic system. const double b = polyprops_.cMax()*1.1; // Add 10% to account for possible non-monotonicity of hyperbolic system.
int iters_used; int iters_used;
concentration_[cell] = modifiedRegulaFalsi(res_c, a, b, maxit_, tol_, iters_used); concentration_[cell] = RootFinder::solve(res_c, a, b, maxit_, tol_, iters_used);
ResidualSGrav res_s(res_c); ResidualSGrav res_s(res_c);
saturation_[cell] = res_s.sOfc(concentration_[cell]); saturation_[cell] = res_s.sOfc(concentration_[cell]);
cmax_[cell] = std::max(cmax0_[cell], concentration_[cell]); cmax_[cell] = std::max(cmax0_[cell], concentration_[cell]);