mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
MSW : Restore MSW settings per completion type
Remove the common MSW settings on well path
This commit is contained in:
@@ -57,11 +57,10 @@ RimFishbonesCollection::RimFishbonesCollection()
|
||||
CAF_PDM_InitField( &m_startMD, "StartMD", HUGE_VAL, "Start MD", "", "", "" );
|
||||
CAF_PDM_InitField( &m_mainBoreDiameter, "MainBoreDiameter", 0.216, "Main Bore Diameter", "", "", "" );
|
||||
CAF_PDM_InitField( &m_skinFactor, "MainBoreSkinFactor", 0., "Main Bore Skin Factor [0..1]", "", "", "" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_mswParameters_OBSOLETE, "MswParameters", "Multi Segment Well Parameters", "", "", "" );
|
||||
m_mswParameters_OBSOLETE = new RimMswCompletionParameters( false );
|
||||
m_mswParameters_OBSOLETE.uiCapability()->setUiTreeHidden( true );
|
||||
m_mswParameters_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
|
||||
m_mswParameters_OBSOLETE.xmlCapability()->setIOWritable( false );
|
||||
CAF_PDM_InitFieldNoDefault( &m_mswParameters, "MswParameters", "Multi Segment Well Parameters", "", "", "" );
|
||||
m_mswParameters = new RimMswCompletionParameters( false );
|
||||
m_mswParameters.uiCapability()->setUiTreeHidden( true );
|
||||
m_mswParameters.uiCapability()->setUiTreeChildrenHidden( true );
|
||||
manuallyModifiedStartMD = false;
|
||||
|
||||
// Moved to RimMswCompletionParameters and obsoleted
|
||||
@@ -136,6 +135,8 @@ void RimFishbonesCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiO
|
||||
wellGroup->add( &m_startMD );
|
||||
wellGroup->add( &m_mainBoreDiameter );
|
||||
wellGroup->add( &m_skinFactor );
|
||||
caf::PdmUiGroup* mswGroup = uiOrdering.addNewGroup( "Multi Segment Well Options" );
|
||||
m_mswParameters->uiOrdering( uiConfigName, *mswGroup );
|
||||
uiOrdering.skipRemainingFields( true );
|
||||
}
|
||||
|
||||
@@ -146,19 +147,19 @@ void RimFishbonesCollection::initAfterRead()
|
||||
{
|
||||
if ( m_linerDiameter_OBSOLETE() != m_linerDiameter_OBSOLETE.defaultValue() )
|
||||
{
|
||||
m_mswParameters_OBSOLETE->setLinerDiameter( m_linerDiameter_OBSOLETE() );
|
||||
m_mswParameters->setLinerDiameter( m_linerDiameter_OBSOLETE() );
|
||||
}
|
||||
if ( m_roughnessFactor_OBSOLETE() != m_roughnessFactor_OBSOLETE.defaultValue() )
|
||||
{
|
||||
m_mswParameters_OBSOLETE->setRoughnessFactor( m_roughnessFactor_OBSOLETE() );
|
||||
m_mswParameters->setRoughnessFactor( m_roughnessFactor_OBSOLETE() );
|
||||
}
|
||||
if ( m_pressureDrop_OBSOLETE() != m_pressureDrop_OBSOLETE.defaultValue() )
|
||||
{
|
||||
m_mswParameters_OBSOLETE->setPressureDrop( m_pressureDrop_OBSOLETE() );
|
||||
m_mswParameters->setPressureDrop( m_pressureDrop_OBSOLETE() );
|
||||
}
|
||||
if ( m_lengthAndDepth_OBSOLETE() != m_lengthAndDepth_OBSOLETE.defaultValue() )
|
||||
{
|
||||
m_mswParameters_OBSOLETE->setLengthAndDepth( m_lengthAndDepth_OBSOLETE() );
|
||||
m_mswParameters->setLengthAndDepth( m_lengthAndDepth_OBSOLETE() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,6 +175,14 @@ void RimFishbonesCollection::appendFishbonesSubs( RimFishbones* subs )
|
||||
subs->recomputeLateralLocations();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
const RimMswCompletionParameters* RimFishbonesCollection::mswParameters() const
|
||||
{
|
||||
return m_mswParameters();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user