OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved logic from schedule to well->setStatus

Browse Source 
Only set status for well to open if well has open completions is now verified for all
This commit is contained in:
Fredrik Gundersen 2015-01-21 14:07:02 +01:00
parent 4d7213651c
commit 4f066af438
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -481,14 +481,8 @@ namespace Opm {
}
else if(!haveCompletionData) {
WellCommon::StatusEnum status = WellCommon::StatusFromString( record->getItem("STATUS")->getTrimmedString(0));
well->setStatus(currentStep, status);
if ((WellCommon::StatusEnum::OPEN == status) && well->getCompletions(currentStep)->allCompletionsShut()) {
std::cerr << "ERROR when handling WELOPEN for well "<< well->name() << ": Cannot open a well where all completions are shut" << std::endl;
throw std::exception();
} else
{
well->setStatus(currentStep, status);
}
}

8
opm/parser/eclipse/EclipseState/Schedule/Well.cpp
View File

@ -129,7 +129,13 @@ namespace Opm {
}
void Well::setStatus(size_t timeStep, WellCommon::StatusEnum status) {
m_status->add( timeStep , status );
if ((WellCommon::StatusEnum::OPEN == status) && this->getCompletions(timeStep)->allCompletionsShut()) {
std::cerr << "ERROR when handling WELOPEN for well "<< this->name() << ": Cannot open a well where all completions are shut" << std::endl;
} else
{
m_status->add( timeStep , status );
}
}
bool Well::isProducer(size_t timeStep) const {

10
opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp
View File

@ -401,7 +401,7 @@ BOOST_AUTO_TEST_CASE(CreateScheduleDeckWellsAndCompletionDataWithWELOPEN) {
BOOST_AUTO_TEST_CASE(CreateScheduleDeckWithWELOPEN_OpenWellWithShutCompletionsThrowsExcpetion) {
BOOST_AUTO_TEST_CASE(CreateScheduleDeckWithWELOPEN_TryToOpenWellWithShutCompletionsDoNotOpenWell) {
Opm::Parser parser;
std::string input =
"START -- 0 \n"
@ -439,7 +439,13 @@ BOOST_AUTO_TEST_CASE(CreateScheduleDeckWithWELOPEN_OpenWellWithShutCompletionsTh
DeckPtr deck = parser.parseString(input);
BOOST_CHECK_THROW(Schedule schedule(deck), std::exception);
Schedule schedule(deck);
WellPtr well;
well = schedule.getWell("OP_1");
size_t currentStep = 3;
BOOST_CHECK_EQUAL(WellCommon::StatusEnum::SHUT, well->getStatus(currentStep));
currentStep = 3;
BOOST_CHECK_EQUAL(WellCommon::StatusEnum::SHUT, well->getStatus(currentStep));
}