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

fixing bugs spotted in the review comments

Browse Source
This commit is contained in:
Kai Bao
2019-05-15 15:56:33 +02:00
parent 4593453d10
commit 28f0274fb5
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@@ -2151,7 +2151,6 @@ namespace Opm
assert(int(B_avg.size() ) == num_components_); assert(int(B_avg.size() ) == num_components_);
std::vector<Scalar> residuals(numWellEq + 1, 0.0); std::vector<Scalar> residuals(numWellEq + 1, 0.0);
// TODO: maybe we should distinguish the bhp control or rate control equations here
for (int seg = 0; seg < numberOfSegments(); ++seg) { for (int seg = 0; seg < numberOfSegments(); ++seg) {
for (int eq_idx = 0; eq_idx < numWellEq; ++eq_idx) { for (int eq_idx = 0; eq_idx < numWellEq; ++eq_idx) {
double residual = 0.; double residual = 0.;
@@ -2238,18 +2237,21 @@ namespace Opm
} }
} }
const double control_tolerance = getControlTolerance(deferred_logger); const double pressure_tolerance = param_.tolerance_pressure_ms_wells_;
if (residuals[SPres] > pressure_tolerance) {
sum += residuals[SPres] / pressure_tolerance;
++count;
}
// const double pressure_tolerance = param_.tolerance_pressure_ms_wells_; const double control_tolerance = getControlTolerance(deferred_logger);
if (residuals[SPres] > control_tolerance) { if (residuals[SPres + 1] > control_tolerance) {
sum += residuals[SPres] / control_tolerance; sum += residuals[SPres + 1] / control_tolerance;
++count; ++count;
} }
// if (count == 0), it should be converged. // if (count == 0), it should be converged.
assert(count != 0); assert(count != 0);
// return sum / double(count);
return sum; return sum;
} }
@@ -2266,11 +2268,11 @@ namespace Opm
switch(well_controls_get_current_type(well_controls_) ) { switch(well_controls_get_current_type(well_controls_) ) {
case BHP: case BHP:
case THP: case THP:
control_tolerance = param_.tolerance_wells_; control_tolerance = param_.tolerance_pressure_ms_wells_;
break; break;
case RESERVOIR_RATE: case RESERVOIR_RATE:
case SURFACE_RATE: case SURFACE_RATE:
control_tolerance = param_.tolerance_pressure_ms_wells_; control_tolerance = param_.tolerance_wells_;
break; break;
default: default:
OPM_DEFLOG_THROW(std::runtime_error, "Unknown well control control types for well " << name(), deferred_logger); OPM_DEFLOG_THROW(std::runtime_error, "Unknown well control control types for well " << name(), deferred_logger);