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

Set number of columns in ROCKTAB to three

Browse Source 
Throw if unsuppored directional and stress option is used
This commit is contained in:
Tor Harald Sandve 2020-09-28 08:13:54 +02:00
parent 6ee4e5ce9a
commit fc7ccd1603
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@ -774,6 +774,12 @@ namespace Opm {
const auto rocktabKeyword = deck.getKeyword("ROCKTAB");
bool isDirectional = deck.hasKeyword<ParserKeywords::RKTRMDIR>();
if (isDirectional) {
const std::string msg = "RKTRMDIR is in the deck. Flow does not support directional rock compaction mulipliers. \n"
"Make sure that your ROCKTAB table only has 3 columns";
throw std::invalid_argument(msg);
}
bool useStressOption = false;
if (deck.hasKeyword<ParserKeywords::ROCKOPTS>()) {
const auto rockoptsKeyword = deck.getKeyword<ParserKeywords::ROCKOPTS>();
@ -781,6 +787,10 @@ namespace Opm {
const auto& item = rockoptsRecord.getItem<ParserKeywords::ROCKOPTS::METHOD>();
useStressOption = (item.getTrimmedString(0) == "STRESS");
}
if (useStressOption) {
const std::string msg = "STRESS option is set in ROCKOPTS. Flow does not support stress option in rock compaction mulipliers";
throw std::invalid_argument(msg);
}
for (size_t tableIdx = 0; tableIdx < rocktabKeyword.size(); ++tableIdx) {
const auto& tableRecord = rocktabKeyword.getRecord( tableIdx );

2
src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp
View File

@ -891,7 +891,7 @@ RocktabTable::RocktabTable(
Table::ColumnOrderEnum POOrder;
if (hasStressOption)
if (!hasStressOption)
POOrder = Table::STRICTLY_INCREASING;
else
POOrder = Table::STRICTLY_DECREASING;

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB
View File

@ -15,8 +15,6 @@
"dimension": [
"Pressure",
"1",
"1",
"1",
"1"
]
}