OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Endpointscaling.threepoint() instead of deck.haskeyword("SCALECRS")

Browse Source
This commit is contained in:
Joakim Hove
2020-03-13 08:46:27 +01:00
parent 1d2b24f54f
commit 3c6c889623
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
View File

@@ -55,6 +55,7 @@ namespace Opm {
const auto& global_cell = Opm::UgGridHelpers::globalCell(grid); const auto& global_cell = Opm::UgGridHelpers::globalCell(grid);
const auto dims = Opm::UgGridHelpers::cartDims(grid); const auto dims = Opm::UgGridHelpers::cartDims(grid);
const auto& compressedToCartesianIdx = Opm::compressedToCartesian(nc, global_cell); const auto& compressedToCartesianIdx = Opm::compressedToCartesian(nc, global_cell);
const bool threepoint = eclState.runspec().endpointScaling().threepoint();
scaledEpsInfo_.resize(nc); scaledEpsInfo_.resize(nc);
EclEpsGridProperties epsGridProperties(eclState, false); EclEpsGridProperties epsGridProperties(eclState, false);
const std::string tag = "Scaled endpoints"; const std::string tag = "Scaled endpoints";
@@ -85,7 +86,7 @@ namespace Opm {
OpmLog::warning(tag, msg); OpmLog::warning(tag, msg);
} }
if (deck.hasKeyword("SCALECRS") && fluidSystem_ == FluidSystem::BlackOil) { if (threepoint && fluidSystem_ == FluidSystem::BlackOil) {
// Mobilility check. // Mobilility check.
if ((scaledEpsInfo_[c].Sowcr + scaledEpsInfo_[c].Swcr) >= (1.0 + tolerance)) { if ((scaledEpsInfo_[c].Sowcr + scaledEpsInfo_[c].Swcr) >= (1.0 + tolerance)) {
const std::string msg = "For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOWCR + SWCR exceed 1.0"; const std::string msg = "For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOWCR + SWCR exceed 1.0";