Renaming well is shut to well is stopped.

Rename the the meaning for shut as whats used in Eclipse.
STOP: Well stopped off above the formation. I.e. allow for flow in the
well.
SHUT: Well completely isolated from the formation. The well is removed
from the well list.
This commit is contained in:
Tor Harald Sandve 2014-11-18 08:32:55 +01:00
parent d50ec0d4d1
commit 82eafbb510
10 changed files with 16 additions and 16 deletions

View File

@ -869,7 +869,7 @@ assemble_completion_to_well(int i, int w, int c, int nc, int np,
W = wells->W; W = wells->W;
ctrl = W->ctrls[ w ]; ctrl = W->ctrls[ w ];
if (well_controls_well_is_shut( ctrl )) { if (well_controls_well_is_stopped( ctrl )) {
/* Interpreting a negative current control index to mean a shut well */ /* Interpreting a negative current control index to mean a shut well */
welleq_coeff_shut(np, h, &res, &w2c, &w2w); welleq_coeff_shut(np, h, &res, &w2c, &w2w);
} }

View File

@ -363,7 +363,7 @@ assemble_well_contrib(int nc ,
for (w = 0; w < W->number_of_wells; w++) { for (w = 0; w < W->number_of_wells; w++) {
ctrls = W->ctrls[ w ]; ctrls = W->ctrls[ w ];
if (well_controls_well_is_shut(ctrls) ) { if (well_controls_well_is_stopped(ctrls) ) {
/* Treat this well as a shut well, isolated from the domain. */ /* Treat this well as a shut well, isolated from the domain. */

View File

@ -49,7 +49,7 @@ namespace Opm
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
assert((wells->type[w] == INJECTOR) || (wells->type[w] == PRODUCER)); assert((wells->type[w] == INJECTOR) || (wells->type[w] == PRODUCER));
const WellControls* ctrl = wells->ctrls[w]; const WellControls* ctrl = wells->ctrls[w];
if (well_controls_well_is_shut(ctrl)) { if (well_controls_well_is_stopped(ctrl)) {
// Shut well: // Shut well:
// 1. Assign zero well rates. // 1. Assign zero well rates.
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {

View File

@ -70,7 +70,7 @@ well_controls_set_current( struct WellControls * ctrl, int current);
bool bool
well_controls_well_is_shut(const struct WellControls * ctrl); well_controls_well_is_stopped(const struct WellControls * ctrl);
bool bool
well_controls_well_is_open(const struct WellControls * ctrl); well_controls_well_is_open(const struct WellControls * ctrl);
@ -79,7 +79,7 @@ void
well_controls_open_well( struct WellControls * ctrl); well_controls_open_well( struct WellControls * ctrl);
void void
well_controls_shut_well( struct WellControls * ctrl); well_controls_stop_well( struct WellControls * ctrl);
int int
well_controls_add_new(enum WellControlType type , double target , const double * distr , struct WellControls * ctrl); well_controls_add_new(enum WellControlType type , double target , const double * distr , struct WellControls * ctrl);

View File

@ -747,7 +747,7 @@ namespace Opm
void WellNode::shutWell() void WellNode::shutWell()
{ {
if (shut_well_) { if (shut_well_) {
well_controls_shut_well( wells_->ctrls[self_index_]); well_controls_stop_well( wells_->ctrls[self_index_]);
} }
else { else {
const double target = 0.0; const double target = 0.0;

View File

@ -414,7 +414,7 @@ namespace Opm
if (well->getStatus(timeStep) == WellCommon::STOP) { if (well->getStatus(timeStep) == WellCommon::STOP) {
// STOPed wells are added to the well list with the given controll and closed. // STOPed wells are added to the well list with the given controll and closed.
well_controls_shut_well(w_->ctrls[well_index]); well_controls_stop_well(w_->ctrls[well_index]);
} }
if (well->getStatus(timeStep) == WellCommon::SHUT) { if (well->getStatus(timeStep) == WellCommon::SHUT) {

View File

@ -228,7 +228,7 @@ well_controls_clone(const struct WellControls *ctrl)
well_controls_open_well(new); well_controls_open_well(new);
} }
else { else {
well_controls_shut_well(new); well_controls_stop_well(new);
} }
} }
} }
@ -254,7 +254,7 @@ well_controls_set_current( struct WellControls * ctrl, int current) {
ctrl->current = current; ctrl->current = current;
} }
bool well_controls_well_is_shut(const struct WellControls * ctrl) { bool well_controls_well_is_stopped(const struct WellControls * ctrl) {
return !ctrl->well_is_open; return !ctrl->well_is_open;
} }
@ -266,7 +266,7 @@ void well_controls_open_well( struct WellControls * ctrl) {
ctrl->well_is_open = true; ctrl->well_is_open = true;
} }
void well_controls_shut_well( struct WellControls * ctrl) { void well_controls_stop_well( struct WellControls * ctrl) {
ctrl->well_is_open = false; ctrl->well_is_open = false;
} }

View File

@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(TestStoppedWells)
const Wells* wells = wellsManager.c_wells(); const Wells* wells = wellsManager.c_wells();
const struct WellControls* ctrls0 = wells->ctrls[0]; const struct WellControls* ctrls0 = wells->ctrls[0];
const struct WellControls* ctrls1 = wells->ctrls[1]; const struct WellControls* ctrls1 = wells->ctrls[1];
BOOST_CHECK(well_controls_well_is_shut(ctrls0)); // injector is stopped BOOST_CHECK(well_controls_well_is_stopped(ctrls0)); // injector is stopped
BOOST_CHECK(well_controls_well_is_open(ctrls1)); BOOST_CHECK(well_controls_well_is_open(ctrls1));
WellState wellstate; WellState wellstate;

View File

@ -103,15 +103,15 @@ BOOST_AUTO_TEST_CASE(OpenClose)
struct WellControls * ctrls = well_controls_create(); struct WellControls * ctrls = well_controls_create();
BOOST_CHECK_EQUAL( true , well_controls_well_is_open(ctrls) ); BOOST_CHECK_EQUAL( true , well_controls_well_is_open(ctrls) );
BOOST_CHECK_EQUAL( false , well_controls_well_is_shut(ctrls) ); BOOST_CHECK_EQUAL( false , well_controls_well_is_stopped(ctrls) );
well_controls_open_well( ctrls ); well_controls_open_well( ctrls );
BOOST_CHECK_EQUAL( true , well_controls_well_is_open(ctrls) ); BOOST_CHECK_EQUAL( true , well_controls_well_is_open(ctrls) );
BOOST_CHECK_EQUAL( false , well_controls_well_is_shut(ctrls) ); BOOST_CHECK_EQUAL( false , well_controls_well_is_stopped(ctrls) );
well_controls_shut_well( ctrls ); well_controls_stop_well( ctrls );
BOOST_CHECK_EQUAL( false , well_controls_well_is_open(ctrls) ); BOOST_CHECK_EQUAL( false , well_controls_well_is_open(ctrls) );
BOOST_CHECK_EQUAL( true , well_controls_well_is_shut(ctrls) ); BOOST_CHECK_EQUAL( true , well_controls_well_is_stopped(ctrls) );
well_controls_destroy( ctrls ); well_controls_destroy( ctrls );
} }

View File

@ -294,6 +294,6 @@ BOOST_AUTO_TEST_CASE(WellSTOPOK) {
const struct WellControls* ctrls0 = wells->ctrls[0]; const struct WellControls* ctrls0 = wells->ctrls[0];
const struct WellControls* ctrls1 = wells->ctrls[1]; const struct WellControls* ctrls1 = wells->ctrls[1];
BOOST_CHECK(well_controls_well_is_shut(ctrls0)); // The first well is closed BOOST_CHECK(well_controls_well_is_stopped(ctrls0)); // The first well is closed
BOOST_CHECK(well_controls_well_is_open(ctrls1)); // The second well is open BOOST_CHECK(well_controls_well_is_open(ctrls1)); // The second well is open
} }