OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-13 09:51:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove deck parameter from RelpermDiagnostics::unscaledEndPointsCheck_

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-09 10:29:30 +01:00
parent 9dc3f926ba
commit 1565456280
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,8 +606,7 @@ namespace Opm{
void RelpermDiagnostics::unscaledEndPointsCheck_(const Deck& deck, void RelpermDiagnostics::unscaledEndPointsCheck_(const EclipseState& eclState)
const EclipseState& eclState)
{ {
// get the number of saturation regions and the number of cells in the deck // get the number of saturation regions and the number of cells in the deck
const int numSatRegions = eclState.runspec().tabdims().getNumSatTables(); const int numSatRegions = eclState.runspec().tabdims().getNumSatTables();
@ -621,7 +620,7 @@ namespace Opm{
// std::cout << "***************\nEnd-Points In all the Tables\n"; // std::cout << "***************\nEnd-Points In all the Tables\n";
for (int satnumIdx = 0; satnumIdx < numSatRegions; ++satnumIdx) { for (int satnumIdx = 0; satnumIdx < numSatRegions; ++satnumIdx) {
unscaledEpsInfo_[satnumIdx].extractUnscaled(deck, eclState, satnumIdx); unscaledEpsInfo_[satnumIdx].extractUnscaled(eclState, satnumIdx);
const std::string regionIdx = std::to_string(satnumIdx + 1); const std::string regionIdx = std::to_string(satnumIdx + 1);
///Consistency check. ///Consistency check.
if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) { if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) {

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

@ -92,8 +92,7 @@ namespace Opm {
void tableCheck_(const EclipseState& eclState); void tableCheck_(const EclipseState& eclState);
///Check endpoints in the saturation tables. ///Check endpoints in the saturation tables.
void unscaledEndPointsCheck_(const Deck& deck, void unscaledEndPointsCheck_(const EclipseState& eclState);
const EclipseState& eclState);
template <class GridT> template <class GridT>
void scaledEndPointsCheck_(const Deck& deck, void scaledEndPointsCheck_(const Deck& deck,

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

@ -40,7 +40,7 @@ namespace Opm {
phaseCheck_(eclState); phaseCheck_(eclState);
satFamilyCheck_(eclState); satFamilyCheck_(eclState);
tableCheck_(eclState); tableCheck_(eclState);
unscaledEndPointsCheck_(deck, eclState); unscaledEndPointsCheck_(eclState);
scaledEndPointsCheck_(deck, eclState, grid); scaledEndPointsCheck_(deck, eclState, grid);
} }