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

Use common ICDStatus class for both Valve and SpiralICD

Browse Source
This commit is contained in:
Joakim Hove
2020-02-12 14:21:49 +01:00
parent e2b58cecda
commit 9bed25f035
9 changed files with 39 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/parser/MultisegmentWellTests.cpp
View File

@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(MultisegmentWellTest) {
const std::shared_ptr<Opm::SpiralICD> sicd_ptr = segment.spiralICD();
BOOST_CHECK_GT(sicd_ptr->maxAbsoluteRate(), 1.e99);
BOOST_CHECK(sicd_ptr->status()==Opm::SpiralICD::Status::SHUT);
BOOST_CHECK(sicd_ptr->status()==Opm::ICDStatus::SHUT);
// 0.002 bars*day*day/Volume^2
BOOST_CHECK_EQUAL(sicd_ptr->strength(), 0.002*1.e5*86400.*86400.);
BOOST_CHECK_EQUAL(sicd_ptr->length(), -0.7);
@@ -413,7 +413,7 @@ BOOST_AUTO_TEST_CASE(testwsegvalv) {
BOOST_CHECK_EQUAL(valv1->pipeDiameter(), 0.2);
BOOST_CHECK_EQUAL(valv1->pipeRoughness(), 0.00015);
BOOST_CHECK_EQUAL(valv1->pipeCrossArea(), 0.031415926535897934);
BOOST_CHECK(valv1->status()==Opm::Valve::Status::OPEN);
BOOST_CHECK(valv1->status()==Opm::ICDStatus::OPEN);
const int segment_number2 = segvalv_vector[1].first;
BOOST_CHECK_EQUAL(9, segment_number2);
@@ -436,7 +436,7 @@ BOOST_AUTO_TEST_CASE(testwsegvalv) {
BOOST_CHECK_EQUAL(valv2->pipeDiameter(), 1.2);
BOOST_CHECK_EQUAL(valv2->pipeRoughness(), 0.1);
BOOST_CHECK_EQUAL(valv2->pipeCrossArea(), 8.);
BOOST_CHECK(valv2->status()==Opm::Valve::Status::SHUT);
BOOST_CHECK(valv2->status()==Opm::ICDStatus::SHUT);
// valve changes the segment data
BOOST_CHECK_EQUAL(segment2.internalDiameter(), valv2->pipeDiameter());