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

ebos: use the correct min() function in the well residual

Browse Source 
i.e., the method provided by the MathToolbox for the evaluation, not
std::min(). I wonder why this even compiled (and more surprisingly:
worked).
This commit is contained in:
Andreas Lauser
2016-03-30 11:15:11 +02:00
parent 4360201416
commit dd1c6c61fb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/ebos/eclpeacemanwell.hh
View File

@@ -1430,6 +1430,8 @@ protected:
const DofVariables *replacementDofVars = 0,
int replacedGridIdx = -1) const
{
typedef Opm::MathToolbox<BhpEval> BhpEvalToolbox;
// compute the volumetric reservoir and surface rates for the complete well
BhpEval resvRate = 0.0;
@@ -1485,17 +1487,17 @@ protected:
if (wellType_ == Injector) {
// for injectors the computed rates are positive and the target BHP is the
// maximum allowed pressure ...
result = std::min<BhpEval>(maxSurfaceRate - surfaceRate, result);
result = std::min<BhpEval>(maxResvRate - resvRate, result);
result = std::min<BhpEval>(1e-7*(targetBottomHolePressure_ - bhp), result);
result = BhpEvalToolbox::min(maxSurfaceRate - surfaceRate, result);
result = BhpEvalToolbox::min(maxResvRate - resvRate, result);
result = BhpEvalToolbox::min(1e-7*(targetBottomHolePressure_ - bhp), result);
}
else {
assert(wellType_ == Producer);
// ... for producers the rates are negative and the bottom hole pressure is
// is the minimum
result = std::min<BhpEval>(maxSurfaceRate + surfaceRate, result);
result = std::min<BhpEval>(maxResvRate + resvRate, result);
result = std::min<BhpEval>(1e-7*(bhp - targetBottomHolePressure_), result);
result = BhpEvalToolbox::min(maxSurfaceRate + surfaceRate, result);
result = BhpEvalToolbox::min(maxResvRate + resvRate, result);
result = BhpEvalToolbox::min(1e-7*(bhp - targetBottomHolePressure_), result);
}
const Scalar scalingFactor = 1e-3;