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

Merge pull request #1063 from totto82/fix_miscNum_diagnostics

Browse Source 
Bugfix: Let NTMISC determine number of MISC tables
This commit is contained in:
Atgeirr Flø Rasmussen 2016-09-16 13:15:50 +02:00 committed by GitHub
commit ff7be8eced
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/core/props/satfunc/RelpermDiagnostics.cpp
View File

@ -160,13 +160,21 @@ namespace Opm{
if (deck->hasKeyword("SSFN")) { if (deck->hasKeyword("SSFN")) {
ssfnTableCheck_(ssfnTables.getTable<SsfnTable>(satnumIdx), satnumIdx+1); ssfnTableCheck_(ssfnTables.getTable<SsfnTable>(satnumIdx), satnumIdx+1);
} }
if (deck->hasKeyword("MISC")) {
miscTableCheck_(miscTables.getTable<MiscTable>(satnumIdx), satnumIdx+1);
}
if (deck->hasKeyword("MSFN")) { if (deck->hasKeyword("MSFN")) {
msfnTableCheck_(msfnTables.getTable<MsfnTable>(satnumIdx), satnumIdx+1); msfnTableCheck_(msfnTables.getTable<MsfnTable>(satnumIdx), satnumIdx+1);
} }
} }
if (deck->hasKeyword("MISCIBLE")) {
const int numMiscNumIdx = miscTables.size();
const std::string msg = "Number of misc regions: " + std::to_string(numMiscNumIdx) + "\n";
OpmLog::info(msg);
for (int miscNumIdx = 0; miscNumIdx < numMiscNumIdx; ++miscNumIdx) {
miscTableCheck_(miscTables.getTable<MiscTable>(miscNumIdx), miscNumIdx+1);
}
}
} }
@ -522,21 +530,21 @@ namespace Opm{
void RelpermDiagnostics::miscTableCheck_(const Opm::MiscTable& miscTables, void RelpermDiagnostics::miscTableCheck_(const Opm::MiscTable& miscTables,
const int satnumIdx) const int miscnumIdx)
{ {
const auto& frac = miscTables.getSolventFractionColumn(); const auto& frac = miscTables.getSolventFractionColumn();
const auto& misc = miscTables.getMiscibilityColumn(); const auto& misc = miscTables.getMiscibilityColumn();
const std::string regionIdx = std::to_string(satnumIdx); const std::string regionIdx = std::to_string(miscnumIdx);
//Check phase fraction column. //Check phase fraction column.
if (frac.front() < 0.0 || frac.back() > 1.0) { if (frac.front() < 0.0 || frac.back() > 1.0) {
const std::string msg = "In MISC table SATNUM = " + regionIdx + ", phase fraction should be in range [0,1]."; const std::string msg = "In MISC table MISCNUM = " + regionIdx + ", phase fraction should be in range [0,1].";
OpmLog::error(msg); OpmLog::error(msg);
} }
//Check miscibility column. //Check miscibility column.
if (misc.front() < 0.0 || misc.back() > 1.0) { if (misc.front() < 0.0 || misc.back() > 1.0) {
const std::string msg = "In MISC table SATNUM = " + regionIdx + ", miscibility should be in range [0,1]."; const std::string msg = "In MISC table MISCNUM = " + regionIdx + ", miscibility should be in range [0,1].";
OpmLog::error(msg); OpmLog::error(msg);
} }
} }

2
opm/core/props/satfunc/RelpermDiagnostics.hpp
View File

@ -129,7 +129,7 @@ namespace Opm {
void ssfnTableCheck_(const Opm::SsfnTable& ssfnTables, void ssfnTableCheck_(const Opm::SsfnTable& ssfnTables,
const int satnumIdx); const int satnumIdx);
void miscTableCheck_(const Opm::MiscTable& miscTables, void miscTableCheck_(const Opm::MiscTable& miscTables,
const int satnumIdx); const int miscnumIdx);
void msfnTableCheck_(const Opm::MsfnTable& msfnTables, void msfnTableCheck_(const Opm::MsfnTable& msfnTables,
const int satnumIdx); const int satnumIdx);
}; };