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

Merge pull request #2032 from joakim-hove/MULTIREG

Browse Source 
Multireg
This commit is contained in:
Joakim Hove 2020-10-22 08:06:37 +02:00 committed by GitHub
commit 0894f7e774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp
View File

@ -874,7 +874,7 @@ void FieldProps::handle_COPY(const DeckKeyword& keyword, Box box, bool region) {
if (region) { if (region) {
int region_value = record.getItem(2).get<int>(0); int region_value = record.getItem(2).get<int>(0);
const auto& region_item = record.getItem(4); const auto& region_item = record.getItem(3);
const auto& region_name = this->region_name( region_item ); const auto& region_name = this->region_name( region_item );
index_list = this->region_index(region_name, region_value); index_list = this->region_index(region_name, region_value);
} else { } else {

48
tests/parser/FieldPropsTests.cpp
View File

@ -2293,3 +2293,51 @@ MAXVALUE
// and some special casing might be required. // and some special casing might be required.
BOOST_CHECK_NO_THROW( FieldPropsManager(deck3, Phases{true, true, true}, grid, TableManager())); BOOST_CHECK_NO_THROW( FieldPropsManager(deck3, Phases{true, true, true}, grid, TableManager()));
} }
BOOST_AUTO_TEST_CASE(REGION_OPERATION) {
std::string deck_string1 = R"(
GRID
PORO
200*0.15 /
PERMX
200*1 /
REGIONS
FIPNUM
200*1 /
MULTNUM
50*1 50*2 100*3 /
EDIT
MULTIREG
PERMX 1 1 M/
PERMX 2 2 M/
PERMX 3 3 M/
/
COPYREG
PERMX PERMY 1 M /
PERMX PERMY 2 M /
PERMX PERMY 3 M /
/
)";
UnitSystem unit_system(UnitSystem::UnitType::UNIT_TYPE_METRIC);
auto to_si = [&unit_system](double raw_value) { return unit_system.to_si(UnitSystem::measure::permeability, raw_value); };
EclipseGrid grid(10,10, 2);
Deck deck1 = Parser{}.parseString(deck_string1);
FieldPropsManager fp(deck1, Phases{true, true, true}, grid, TableManager());
const auto& permx = fp.get_double("PERMX");
const auto& permy = fp.get_double("PERMY");
const auto& multn = fp.get_int("MULTNUM");
for (std::size_t g = 0; g < 200; g++) {
BOOST_CHECK_CLOSE(to_si(multn[g]), permx[g], 1e-5);
BOOST_CHECK_EQUAL(permx[g], permy[g]);
}
}