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

#5936 Fix use of LAS for PP Non-Reservoir

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-05-15 12:35:29 +02:00
parent ebde4495fb
commit 5a7f7888ca
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@@ -237,7 +237,8 @@ std::vector<RigGeoMechWellLogExtractor::WbsParameterSource>
return finalSourcesPerSegment;
}
bool isPPresult = parameter == RigWbsParameter::PP_Reservoir() || parameter == RigWbsParameter::PP_NonReservoir();
bool isPPResResult = parameter == RigWbsParameter::PP_Reservoir();
bool isPPresult = isPPResResult || parameter == RigWbsParameter::PP_NonReservoir();
std::vector<WbsParameterSource> allSources = parameter.sources();
auto primary_it = std::find( allSources.begin(), allSources.end(), primarySource );
@@ -315,9 +316,11 @@ std::vector<RigGeoMechWellLogExtractor::WbsParameterSource>
{
if ( !lasFileValues.empty() )
{
double lasValue = getWellLogIntersectionValue( intersectionIdx, lasFileValues );
if ( lasValue != std::numeric_limits<double>::infinity() && intersectionIdx < gridValues.size() &&
gridValues[intersectionIdx] != std::numeric_limits<double>::infinity() )
double lasValue = getWellLogIntersectionValue( intersectionIdx, lasFileValues );
// Only accept las-values for reservoir if the result is PP Reservoir
bool invalidLasRegion = isPPResResult && intersectionIdx < gridValues.size() &&
gridValues[intersectionIdx] != std::numeric_limits<double>::infinity();
if ( lasValue != std::numeric_limits<double>::infinity() && !invalidLasRegion )
{
unscaledValues[intersectionIdx] = lasValue;
finalSourcesPerSegment[intersectionIdx] = RigWbsParameter::LAS_FILE;