#5160 Fix wording around FG in shale calculation

This commit is contained in:
Gaute Lindkvist 2019-12-04 14:13:12 +01:00
parent b5ab1d6e82
commit a7e3cc154a
4 changed files with 7 additions and 5 deletions

View File

@ -231,7 +231,7 @@ void RicNewWellBoreStabilityPlotFeature::createParametersTrack( RimWellBoreStabi
paramCurvesTrack->setColSpan( RimPlot::THREE );
paramCurvesTrack->setVisibleXRange( 0.0, 1.0 );
paramCurvesTrack->setAutoScaleXEnabled( true );
paramCurvesTrack->setTickIntervals( 0.5, 0.05 );
paramCurvesTrack->setTickIntervals( 0.5, 0.1 );
paramCurvesTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR );
paramCurvesTrack->setFormationWellPath( wellPath );
paramCurvesTrack->setFormationCase( geoMechCase );

View File

@ -603,7 +603,7 @@ void RigGeoMechWellLogExtractor::wellBoreWallCurveData( const RigFemResultAddres
void RigGeoMechWellLogExtractor::wellBoreFGShale( int frameIndex, std::vector<double>* values )
{
WbsParameterSource source = m_parameterSources.at( RigWbsParameter::FG_Shale() );
if ( source == RigWbsParameter::MATTHEWS_KELLY )
if ( source == RigWbsParameter::DERIVED_FROM_K0FG )
{
std::vector<double> PP0; // results
std::vector<double> K0_FG, OBG0; // parameters

View File

@ -29,7 +29,7 @@ void RigWbsParameter::SourceEnum::setUp()
addItem( RigWbsParameter::ELEMENT_PROPERTY_TABLE, "ELEMENT_PROPERTY_TABLE", "Property Table" );
addItem( RigWbsParameter::USER_DEFINED, "USER_DEFINED", "User Defined" );
addItem( RigWbsParameter::HYDROSTATIC, "HYDROSTATIC", "Hydrostatic" );
addItem( RigWbsParameter::MATTHEWS_KELLY, "MATTHEWS_KELLY", "Matthews & Kelly" );
addItem( RigWbsParameter::DERIVED_FROM_K0FG, "K0FG", "FG derived from K0_FG" );
addItem( RigWbsParameter::PROPORTIONAL_TO_SH, "PROPORTIONAL_TO_SH", "Proportional to SH" );
addItem( RigWbsParameter::INVALID, "UNDEFINED", "Undefined" );
setDefault( RigWbsParameter::INVALID );
@ -273,7 +273,9 @@ RigWbsParameter RigWbsParameter::K0_SH()
//--------------------------------------------------------------------------------------------------
RigWbsParameter RigWbsParameter::FG_Shale()
{
RigWbsParameter param( "FG Shale", true, {{MATTHEWS_KELLY, SourceAddress()}, {PROPORTIONAL_TO_SH, SourceAddress()}} );
RigWbsParameter param( "FG Shale",
true,
{{DERIVED_FROM_K0FG, SourceAddress()}, {PROPORTIONAL_TO_SH, SourceAddress()}} );
param.setOptionsExclusive( true );
return param;
}

View File

@ -37,7 +37,7 @@ public:
ELEMENT_PROPERTY_TABLE,
USER_DEFINED,
HYDROSTATIC,
MATTHEWS_KELLY, // FG in shale
DERIVED_FROM_K0FG, // FG in shale
PROPORTIONAL_TO_SH, // FG in shale
INVALID = 1000,
};