#7595 MSW : Move MSW parameters to well path

Move msw parameters to well path
Make it clear when options are taken from top level well path or well path lateral
Use well path lateral custom values for diameter and roughness
This commit is contained in:
Magne Sjaastad committed 2021-04-20 21:13:02 +02:00
1 parent 8e569bc944
commit 4f89e38334
17 files changed
+216 -296

No files matched your search

@@ -23,7 +23,6 @@
#include "Rim3dView.h"
#include "RimEclipseCase.h"
#include "RimMswCompletionParameters.h"
#include "RimNonDarcyPerforationParameters.h"
#include "RimPerforationInterval.h"
#include "RimProject.h"
@@ -34,17 +33,6 @@
#include "Riu3DMainWindowTools.h"
namespace caf
{
template <>
void RimPerforationCollection::ReferenceMDEnum::setUp()
{
addItem( RimPerforationCollection::AUTO_REFERENCE_MD, "GridIntersectionRefMD", "Grid Entry Point" );
addItem( RimPerforationCollection::MANUAL_REFERENCE_MD, "ManualRefMD", "User Defined" );
setDefault( RimPerforationCollection::AUTO_REFERENCE_MD );
}
} // namespace caf
CAF_PDM_SOURCE_INIT( RimPerforationCollection, "PerforationCollection" );
//--------------------------------------------------------------------------------------------------
@@ -60,11 +48,6 @@ RimPerforationCollection::RimPerforationCollection()
CAF_PDM_InitFieldNoDefault( &m_perforations, "Perforations", "Perforations", "", "", "" );
m_perforations.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_mswParameters, "MswParameters", "Multi Segment Well Parameters", "", "", "" );
m_mswParameters = new RimMswCompletionParameters;
m_mswParameters.uiCapability()->setUiTreeHidden( true );
m_mswParameters.uiCapability()->setUiTreeChildrenHidden( true );
CAF_PDM_InitFieldNoDefault( &m_nonDarcyParameters, "NonDarcyParameters", "Non-Darcy Parameters", "", "", "" );
m_nonDarcyParameters = new RimNonDarcyPerforationParameters();
m_nonDarcyParameters.uiCapability()->setUiTreeHidden( true );
@@ -176,21 +159,11 @@ std::vector<const RimPerforationInterval*> RimPerforationCollection::activePerfo
return myActivePerforations;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimMswCompletionParameters* RimPerforationCollection::mswParameters() const
{
return m_mswParameters();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPerforationCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* mswGroup = uiOrdering.addNewGroup( "Multi Segment Well Options" );
m_mswParameters->uiOrdering( uiConfigName, *mswGroup );
m_nonDarcyParameters->uiOrdering( uiConfigName, uiOrdering );
uiOrdering.skipRemainingFields( true );
}