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

Apply correct frame indices for OBG0 and SH_MK WBS curve calculation

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-12-04 11:31:44 +01:00
parent df5c5fb2a8
commit 2e7d581c3e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@ -156,6 +156,10 @@ void RigGeoMechWellLogExtractor::curveData( const RigFemResultAddress& resAddr,
RigWbsParameter param;
if ( RigWbsParameter::findParameter( QString::fromStdString( resAddr.fieldName ), &param ) )
{
if ( param == RigWbsParameter::OBG0() )
{
frameIndex = 0;
}
calculateWbsParameterForAllSegments( param, frameIndex, values );
if ( param == RigWbsParameter::UCS() ) // UCS is reported as UCS/100
{
@ -652,9 +656,9 @@ void RigGeoMechWellLogExtractor::wellBoreSH_MatthewsKelly( int frameIndex, std::
curveData( ppAddr, frameIndex, &PP );
curveData( ppAddr, 0, &PP0 );
calculateWbsParameterForAllSegments( RigWbsParameter::K0_SH(), 0, &K0_SH );
calculateWbsParameterForAllSegments( RigWbsParameter::K0_SH(), frameIndex, &K0_SH );
calculateWbsParameterForAllSegments( RigWbsParameter::OBG0(), 0, &OBG0 );
calculateWbsParameterForAllSegments( RigWbsParameter::DF(), 0, &DF );
calculateWbsParameterForAllSegments( RigWbsParameter::DF(), frameIndex, &DF );
values->resize( m_intersections.size(), std::numeric_limits<double>::infinity() );

2
ApplicationCode/ReservoirDataModel/RigWbsParameter.cpp
View File

@ -227,7 +227,7 @@ RigWbsParameter RigWbsParameter::OBG()
//--------------------------------------------------------------------------------------------------
RigWbsParameter RigWbsParameter::OBG0()
{
std::vector<std::pair<Source, SourceAddress>> sources = {{GRID, SourceAddress( "ST", "S33", 0 )}};
std::vector<std::pair<Source, SourceAddress>> sources = {{GRID, SourceAddress( "ST", "S33" )}};
return RigWbsParameter( "OBG0", true, sources );
}

4
ApplicationCode/ReservoirDataModel/RigWbsParameter.h
View File

@ -87,11 +87,9 @@ private:
RigFemResultPosEnum resType;
QString primary; // i.e. grid field name, las entry, etc.
QString secondary; // i.e. grid component name
int timeStep;
SourceAddress( QString primary = "", QString secondary = "", int timeStep = -1 )
SourceAddress( QString primary = "", QString secondary = "" )
: primary( primary )
, secondary( secondary )
, timeStep( timeStep )
{
}
};