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

Relperm Diagnostics: Chase EPS API Update

Browse Source 
The API for extracting unscaled (raw) saturation end-points has
changed in opm-material.  Follow that change here.
This commit is contained in:
Bård Skaflestad 2020-12-09 09:51:17 +01:00
parent 6b1c6e7d9e
commit cc6d0e35a3
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,21 @@
#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp>
namespace Opm{
@ -609,10 +621,27 @@ namespace Opm{
void RelpermDiagnostics::unscaledEndPointsCheck_(const EclipseState& eclState)
{
// get the number of saturation regions and the number of cells in the deck
const int numSatRegions = eclState.runspec().tabdims().getNumSatTables();
const auto& runspec = eclState.runspec();
const int numSatRegions = runspec.tabdims().getNumSatTables();
if (numSatRegions < 1) {
return;
}
unscaledEpsInfo_.resize(numSatRegions);
const auto& tables = eclState.getTableManager();
const auto& phases = runspec.phases();
const auto tolcrit = runspec.saturationFunctionControls()
.minimumRelpermMobilityThreshold();
const auto family = runspec.saturationFunctionControls().family();
const auto rtepPtr =
satfunc::getRawTableEndpoints(tables, phases, tolcrit);
const auto rfuncPtr =
satfunc::getRawFunctionValues(tables, phases, *rtepPtr);
const TableContainer& swofTables = tables.getSwofTables();
const TableContainer& sgofTables = tables.getSgofTables();
const TableContainer& slgofTables = tables.getSlgofTables();
@ -620,7 +649,9 @@ namespace Opm{
// std::cout << "***************\nEnd-Points In all the Tables\n";
for (int satnumIdx = 0; satnumIdx < numSatRegions; ++satnumIdx) {
unscaledEpsInfo_[satnumIdx].extractUnscaled(eclState, satnumIdx);
this->unscaledEpsInfo_[satnumIdx]
.extractUnscaled(*rtepPtr, *rfuncPtr, family, satnumIdx);
const std::string regionIdx = std::to_string(satnumIdx + 1);
///Consistency check.
if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) {

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

@ -62,10 +62,10 @@ namespace Opm {
std::string cellIdx;
{
std::array<int, 3> ijk;
const int cartIdx = compressedToCartesianIdx[c];
ijk[0] = cartIdx % dims[0];
ijk[1] = (cartIdx / dims[0]) % dims[1];
ijk[2] = cartIdx / dims[0] / dims[1];
int cartIdx = compressedToCartesianIdx[c];
ijk[0] = cartIdx % dims[0]; cartIdx /= dims[0];
ijk[1] = cartIdx % dims[1];
ijk[2] = cartIdx / dims[1];
cellIdx = "(" + std::to_string(ijk[0]) + ", " +
std::to_string(ijk[1]) + ", " +
std::to_string(ijk[2]) + ")";