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

Added ADD modifier for TranCalculator.

Browse Source
This commit is contained in:
Markus Blatt 2020-09-17 16:40:10 +02:00
parent e6893caa89
commit d3d91c2a08
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp
View File

@ -167,6 +167,10 @@ void apply_tran(const std::unordered_map<std::string, TranCalculator>& tran,
data[index] *= action_data.data[index];
break;
case ScalarOperation::ADD:
data[index] += action_data.data[index];
break;
case ScalarOperation::MAX:
data[index] = std::min(action_data.data[index], data[index]);
break;
@ -174,6 +178,7 @@ void apply_tran(const std::unordered_map<std::string, TranCalculator>& tran,
case ScalarOperation::MIN:
data[index] = std::max(action_data.data[index], data[index]);
break;
default:
throw std::logic_error("Unhandled value in switch");
}

15
tests/parser/FieldPropsTests.cpp
View File

@ -1805,12 +1805,18 @@ MULTIPLY
TRANY 2.0 /
/
ADD
TRANY 3 1 10 1 10 2 2 /
/
MAXVALUE
TRANZ 0 1 10 1 10 1 1 /
/
MINVALUE
TRANZ 3 1 10 1 10 2 2 /
/
)";
UnitSystem unit_system(UnitSystem::UnitType::UNIT_TYPE_METRIC);
auto to_si = [&unit_system](double raw_value) { return unit_system.to_si(UnitSystem::measure::transmissibility, raw_value); };
@ -1840,7 +1846,14 @@ MINVALUE
BOOST_CHECK_EQUAL(tranx[i], to_si(0.10));
BOOST_CHECK_EQUAL(trany[0], to_si(2.0));
for (std::size_t i=0; i < trany.size(); i++)
for (std::size_t i=0; i < 50; i++)
BOOST_CHECK_EQUAL(trany[i], to_si(2.0));
for (std::size_t i=50; i < 100; i++)
BOOST_CHECK_EQUAL(trany[i], to_si(5.0));
for (std::size_t i=100; i < trany.size(); i++)
BOOST_CHECK_EQUAL(trany[i], to_si(2.0));
for (std::size_t i=0; i < 50; i++)