OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

#9363 StimPlan: Incorrect extraction size when changing extraction offsets from python

Browse Source
This commit is contained in:
Kristian Bendiksen 2022-10-21 10:07:16 +02:00
parent f7a2acc3cf
commit 3a77d77689
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp
View File

@ -167,10 +167,12 @@ RimStimPlanModel::RimStimPlanModel()
CAF_PDM_InitScriptableField( &m_extractionDepthTop, "ExtractionDepthTop", -1.0, "Depth" );
m_extractionDepthTop.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
m_extractionDepthTop.uiCapability()->setUiReadOnly( true );
m_extractionDepthTop.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitScriptableField( &m_extractionDepthBottom, "ExtractionDepthBottom", -1.0, "Depth" );
m_extractionDepthBottom.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
m_extractionDepthBottom.uiCapability()->setUiReadOnly( true );
m_extractionDepthBottom.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitScriptableField( &m_extractionType,
"ExtractionType",
@ -180,6 +182,7 @@ RimStimPlanModel::RimStimPlanModel()
CAF_PDM_InitScriptableFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position" );
m_anchorPosition.uiCapability()->setUiReadOnly( true );
m_anchorPosition.xmlCapability()->disableIO();
m_anchorPosition.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitFieldNoDefault( &m_anchorPositionForUi, "AnchorPositionForUi", "Anchor Position" );
m_anchorPositionForUi.registerGetMethod( this, &RimStimPlanModel::anchorPositionForUi );
@ -189,16 +192,19 @@ RimStimPlanModel::RimStimPlanModel()
CAF_PDM_InitScriptableFieldNoDefault( &m_thicknessDirection, "ThicknessDirection", "Thickness Direction" );
m_thicknessDirection.uiCapability()->setUiReadOnly( true );
m_thicknessDirection.xmlCapability()->disableIO();
m_thicknessDirection.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitScriptableFieldNoDefault( &m_originalThicknessDirection,
"OriginalThicknessDirection",
"Original Thickness Direction" );
m_originalThicknessDirection.uiCapability()->setUiReadOnly( true );
m_originalThicknessDirection.xmlCapability()->disableIO();
m_originalThicknessDirection.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitScriptableFieldNoDefault( &m_thicknessDirectionWellPath,
"ThicknessDirectionWellPath",
"Thickness Direction Well Path" );
m_thicknessDirectionWellPath.capability<caf::PdmAbstractFieldScriptingCapability>()->setIOWriteable( false );
CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal" );
CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical" );
@ -297,7 +303,7 @@ void RimStimPlanModel::initAfterRead()
m_stimPlanModelTemplate->changed.connect( this, &RimStimPlanModel::stimPlanModelTemplateChanged );
}
if ( m_extractionDepthTop() < 0.0 || m_extractionDepthBottom < 0.0 )
if ( m_extractionDepthTop() < 0.0 || m_extractionDepthBottom() < 0.0 )
{
updateExtractionDepthBoundaries();
}
@ -313,10 +319,10 @@ void RimStimPlanModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField
if ( changedField == &m_MD )
{
updatePositionFromMeasuredDepth();
updateExtractionDepthBoundaries();
}
if ( changedField == &m_extractionOffsetTop || changedField == &m_extractionOffsetBottom )
if ( changedField == &m_MD || changedField == &m_extractionOffsetTop || changedField == &m_extractionOffsetBottom ||
changedField == &m_extractionDepthTop || changedField == &m_extractionDepthBottom )
{
updateExtractionDepthBoundaries();
}
@ -325,8 +331,8 @@ void RimStimPlanModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField
changedField == &m_boundingBoxHorizontal || changedField == &m_fractureOrientation ||
changedField == &m_autoComputeBarrier || changedField == &m_azimuthAngle ||
changedField == &m_showOnlyBarrierFault || changedField == &m_eclipseCase ||
changedField == &m_extractionDepthTop || changedField == &m_extractionDepthBottom ||
changedField == &m_extractionOffsetTop || changedField == &m_extractionOffsetBottom ||
changedField == &m_extractionDepthTop || changedField == &m_extractionDepthBottom ||
changedField == &m_perforationLength )
{
updateThicknessDirection();
@ -824,28 +830,27 @@ RimAnnotationCollectionBase* RimStimPlanModel::annotationCollection()
//--------------------------------------------------------------------------------------------------
void RimStimPlanModel::updatePerforationInterval()
{
if ( m_thicknessDirectionWellPath && wellPath() && wellPath()->wellPathGeometry() )
if ( !m_thicknessDirectionWellPath || !wellPath() || !wellPath()->wellPathGeometry() ) return;
if ( !m_perforationInterval )
{
if ( !m_perforationInterval )
{
m_perforationInterval = new RimPerforationInterval;
m_thicknessDirectionWellPath->perforationIntervalCollection()->appendPerforation( m_perforationInterval );
}
double halfPerforationLength = m_perforationLength() * 0.5;
if ( m_fractureOrientation == FractureOrientation::ALONG_WELL_PATH )
{
// Adjust perforation interval for longitudinal fractures to correct TVD depth
cvf::Vec3d wellPathTangent = wellPath()->wellPathGeometry()->tangentAlongWellPath( m_MD() );
halfPerforationLength =
RigStimPlanModelTools::calculatePerforationLength( wellPathTangent, m_perforationLength() ) * 0.5;
}
double closestMd = m_thicknessDirectionWellPath->wellPathGeometry()->closestMeasuredDepth( m_anchorPosition );
m_perforationInterval->setStartAndEndMD( closestMd - halfPerforationLength, closestMd + halfPerforationLength );
m_perforationInterval->updateConnectedEditors();
updateViewsAndPlots();
m_perforationInterval = new RimPerforationInterval;
m_thicknessDirectionWellPath->perforationIntervalCollection()->appendPerforation( m_perforationInterval );
}
double halfPerforationLength = m_perforationLength() * 0.5;
if ( m_fractureOrientation == FractureOrientation::ALONG_WELL_PATH )
{
// Adjust perforation interval for longitudinal fractures to correct TVD depth
cvf::Vec3d wellPathTangent = wellPath()->wellPathGeometry()->tangentAlongWellPath( m_MD() );
halfPerforationLength =
RigStimPlanModelTools::calculatePerforationLength( wellPathTangent, m_perforationLength() ) * 0.5;
}
double closestMd = m_thicknessDirectionWellPath->wellPathGeometry()->closestMeasuredDepth( m_anchorPosition );
m_perforationInterval->setStartAndEndMD( closestMd - halfPerforationLength, closestMd + halfPerforationLength );
m_perforationInterval->updateConnectedEditors();
updateViewsAndPlots();
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.cpp
View File

@ -567,7 +567,7 @@ bool RimStimPlanModelWellLogCalculator::extractValuesForProperty( RiaDefines::Cu
auto eclipseCaseData = eclipseCase->eclipseCaseData();
if ( !eclipseCaseData )
{
RiaLogging::error( "Missing eclipse case data." );
RiaLogging::error( "Missing Eclipse case data." );
return false;
}
@ -643,7 +643,7 @@ bool RimStimPlanModelWellLogCalculator::replaceMissingValuesWithDefault( RiaDefi
auto eclipseCaseData = eclipseCase->eclipseCaseData();
if ( !eclipseCaseData )
{
RiaLogging::error( "Missing eclipse case data." );
RiaLogging::error( "Missing Eclipse case data." );
return false;
}
@ -794,7 +794,7 @@ bool RimStimPlanModelWellLogCalculator::replaceMissingValuesWithOtherKLayer( Ria
RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData();
if ( !caseData )
{
RiaLogging::error( "Missing eclipse case data." );
RiaLogging::error( "Missing Eclipse case data." );
return false;
}

2
GrpcInterface/RiaGrpcServiceInterface.cpp
View File

@ -222,7 +222,7 @@ bool RiaGrpcServiceInterface::assignFieldValue( const QString& string
CAF_ASSERT( oldValue && newValue );
auto scriptability = field->template capability<caf::PdmAbstractFieldScriptingCapability>();
if ( field && scriptability != nullptr )
if ( field && scriptability != nullptr && scriptability->isIOWriteable() )
{
auto* valueField = dynamic_cast<caf::PdmValueField*>( field );
QTextStream stream( stringValue.toLatin1() );