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

Some clean-up adressing PR comments

Browse Source
This commit is contained in:
Tor Harald Sandve 2019-06-19 08:15:22 +02:00
parent 5c7cfd8c21
commit a7f718a368
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1495,7 +1495,6 @@ namespace Opm
assembleControlEq(Opm::DeferredLogger& deferred_logger) const assembleControlEq(Opm::DeferredLogger& deferred_logger) const
{ {
EvalWell control_eq(0.0); EvalWell control_eq(0.0);
const std::vector<double> g = {1.0, 1.0, 0.01};
switch (well_controls_get_current_type(well_controls_)) { switch (well_controls_get_current_type(well_controls_)) {
case THP: // not handling this one for now case THP: // not handling this one for now
@ -1520,6 +1519,7 @@ namespace Opm
} }
assert(number_phases_under_control > 0); assert(number_phases_under_control > 0);
const double target_rate = well_controls_get_current_target(well_controls_); const double target_rate = well_controls_get_current_target(well_controls_);
const std::vector<double> g = {1.0, 1.0, 0.01};
if (well_type_ == INJECTOR) { if (well_type_ == INJECTOR) {
assert(number_phases_under_control == 1); assert(number_phases_under_control == 1);
@ -1569,8 +1569,6 @@ namespace Opm
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);
} }
// using control_eq to update the matrix and residuals // using control_eq to update the matrix and residuals
resWell_[0][SPres] = control_eq.value(); resWell_[0][SPres] = control_eq.value();
@ -2455,16 +2453,9 @@ namespace Opm
for (int seg = 0; seg < numberOfSegments(); ++seg) { for (int seg = 0; seg < numberOfSegments(); ++seg) {
// special treatment is needed for segment 0 // special treatment is needed for segment 0
if (seg == 0) { if (seg == 0) {
if ( (well_type_ == INJECTOR)) { // we are not supposed to have injecting producers and producing injectors
// maybe it is safer to return -1 to make sure that we don't return the wrong segment number assert( ! (well_type_ == PRODUCER && primary_variables_evaluation_[seg][GTotal] > 0.) );
// for injectors assert( ! (well_type_ == INJECTOR && primary_variables_evaluation_[seg][GTotal] < 0.) );
upwinding_segments_[seg] = seg;
assert(primary_variables_evaluation_[seg][GTotal] >= 0.);
continue;
}
// we don't handle injecting producers.
assert(primary_variables_evaluation_[seg][GTotal] <= 0.);
upwinding_segments_[seg] = seg; upwinding_segments_[seg] = seg;
continue; continue;
} }