Merge pull request #3014 from bska/chase-eps-api-update

Chase Unscaled Endpoint API Update
This commit is contained in:
Bård Skaflestad 2021-01-27 18:31:17 +01:00 committed by GitHub
commit 1c81dca30f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -652,7 +652,6 @@ namespace Opm{
const auto& phases = runspec.phases(); const auto& phases = runspec.phases();
const auto tolcrit = runspec.saturationFunctionControls() const auto tolcrit = runspec.saturationFunctionControls()
.minimumRelpermMobilityThreshold(); .minimumRelpermMobilityThreshold();
const auto family = runspec.saturationFunctionControls().family();
const auto rtepPtr = const auto rtepPtr =
satfunc::getRawTableEndpoints(tables, phases, tolcrit); satfunc::getRawTableEndpoints(tables, phases, tolcrit);
@ -668,7 +667,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) {
this->unscaledEpsInfo_[satnumIdx] this->unscaledEpsInfo_[satnumIdx]
.extractUnscaled(*rtepPtr, *rfuncPtr, family, satnumIdx); .extractUnscaled(*rtepPtr, *rfuncPtr, satnumIdx);
const std::string regionIdx = std::to_string(satnumIdx + 1); const std::string regionIdx = std::to_string(satnumIdx + 1);
///Consistency check. ///Consistency check.