Skip to content

Commit

Permalink
#11109 Improve visualization of MSW with valve branches
Browse files Browse the repository at this point in the history 
Increase default segment threshold to 4
Add an optional setting to override the default value
Use this threshold to merge short branches into parent branch
  • Loading branch information
@magnesj
magnesj committed Jan 25, 2024
1 parent af43e47 commit 4e92a39
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 39 deletions.
18 changes: 1 addition & 17 deletions ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,23 +166,7 @@ void RivSimWellPipesPartMgr::buildWellPipeParts( const caf::DisplayCoordTransfor
m_wellBranches.clear();
m_flattenedBranchWellHeadOffsets.clear();

auto createSimWells = []( RimSimWellInView* simWellInView ) -> std::vector<SimulationWellCellBranch>
{
std::vector<SimulationWellCellBranch> simWellBranches;
const RigSimWellData* simWellData = simWellInView->simWellData();
if ( simWellData && simWellData->isMultiSegmentWell() )
{
simWellBranches = RigMswCenterLineCalculator::calculateMswWellPipeGeometry( simWellInView );
}
else
{
simWellBranches = RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( simWellInView );
}

return simWellBranches;
};

auto simWells = createSimWells( m_simWellInView );
auto simWells = m_simWellInView->wellBranchesForVisualization();
const auto& [coords, wellCells] = RigSimulationWellCenterLineCalculator::extractBranchData( simWells );

auto pipeBranchesCLCoords = coords;
Expand Down
10 changes: 5 additions & 5 deletions ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RigWellPath.h"

#include "Rim2dIntersectionView.h"
Expand Down Expand Up @@ -868,11 +869,10 @@ void RimExtrudedCurveIntersection::updateSimulationWellCenterline() const
{
if ( m_simulationWellBranchCenterlines.empty() )
{
auto branches = m_simulationWell->wellPipeBranches();
for ( const auto& branch : branches )
{
m_simulationWellBranchCenterlines.push_back( branch->wellPathPoints() );
}
auto simWells = m_simulationWell()->wellBranchesForVisualization();
const auto& [coords, wellCells] = RigSimulationWellCenterLineCalculator::extractBranchData( simWells );

m_simulationWellBranchCenterlines = coords;
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ class RimExtrudedCurveIntersection : public RimIntersection

caf::PdmField<bool> m_kFilterCollectionOverride;
caf::PdmField<QString> m_kFilterCollectionText;
};
};
29 changes: 29 additions & 0 deletions ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@
#include "RimEclipseInputPropertyCollection.h"
#include "RimEclipseView.h"
#include "RimFlowDiagSolution.h"
#include "RimIntersectionCollection.h"
#include "RimMockModelSettings.h"
#include "RimProject.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimTimeStepFilter.h"
#include "RimTools.h"

#include "cafPdmUiCheckBoxAndTextEditor.h"
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiPropertyViewDialog.h"
#include "cafProgressInfo.h"
Expand Down Expand Up @@ -102,6 +104,9 @@ RimEclipseResultCase::RimEclipseResultCase()
#ifndef USE_HDF5
m_sourSimFileName.uiCapability()->setUiHidden( true );
#endif

CAF_PDM_InitField( &m_mswMergeThreshold, "MswMergeThreshold", std::make_pair( false, 3 ), "MSW Short Well Merge Threshold" );
m_mswMergeThreshold.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxAndTextEditor::uiEditorTypeName() );
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -561,6 +566,19 @@ RifReaderRftInterface* RimEclipseResultCase::rftReader()
return m_readerEclipseRft.p();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimEclipseResultCase::mswMergeThreshold() const
{
if ( m_mswMergeThreshold().first )
{
return m_mswMergeThreshold().second;
}

return 4;
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -607,6 +625,7 @@ void RimEclipseResultCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
group->add( &m_activeFormationNames );
group->add( &m_flipXAxis );
group->add( &m_flipYAxis );
group->add( &m_mswMergeThreshold );

if ( eclipseCaseData() && eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL ) &&
eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->maxTimeStepCount() > 0 )
Expand All @@ -627,6 +646,16 @@ void RimEclipseResultCase::fieldChangedByUi( const caf::PdmFieldHandle* changedF
loadAndUpdateSourSimData();
}

if ( changedField == &m_mswMergeThreshold )
{
for ( auto resView : reservoirViews() )
{
resView->scheduleSimWellGeometryRegen();
resView->scheduleCreateDisplayModelAndRedraw();
resView->intersectionCollection()->recomputeSimWellBranchData();
}
}

return RimEclipseCase::fieldChangedByUi( changedField, oldValue, newValue );
}

Expand Down
6 changes: 6 additions & 0 deletions ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ class RimEclipseResultCase : public RimEclipseCase

RifReaderRftInterface* rftReader();

// A multi segment well can have multiple well paths. Valves can be modeled using short branches. This threshold defines the limit for
// merging branches into the upstream branch.
int mswMergeThreshold() const;

protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
Expand All @@ -95,6 +99,8 @@ class RimEclipseResultCase : public RimEclipseCase
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<caf::FilePath> m_sourSimFileName;

caf::PdmField<std::pair<bool, int>> m_mswMergeThreshold;

bool m_gridAndWellDataIsReadFromFile;
bool m_activeCellInfoIsReadFromFile;
bool m_useOpmRftReader;
Expand Down
16 changes: 16 additions & 0 deletions ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "RigCell.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigMswCenterLineCalculator.h"
#include "RigSimWellData.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RigWellResultFrame.h"
Expand Down Expand Up @@ -188,6 +189,21 @@ std::vector<const RigWellPath*> RimSimWellInView::wellPipeBranches() const
return std::vector<const RigWellPath*>();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<SimulationWellCellBranch> RimSimWellInView::wellBranchesForVisualization() const
{
const RigSimWellData* simWellData = this->simWellData();

if ( simWellData && simWellData->isMultiSegmentWell() )
{
return RigMswCenterLineCalculator::calculateMswWellPipeGeometry( this );
}

return RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( this );
}

//--------------------------------------------------------------------------------------------------
/// frameIndex = -1 will use the static well frame
//--------------------------------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions ApplicationLibCode/ProjectDataModel/RimSimWellInView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "Rim3dPropertiesInterface.h"

#include "RigWellDiskData.h"
#include "RigWellResultBranch.h"

#include "cafAppEnum.h"
#include "cafPdmChildField.h"
Expand Down Expand Up @@ -76,6 +77,8 @@ class RimSimWellInView : public caf::PdmObject, public Rim3dPropertiesInterface

std::vector<const RigWellPath*> wellPipeBranches() const;

std::vector<SimulationWellCellBranch> wellBranchesForVisualization() const;

void wellHeadTopBottomPosition( int frameIndex, cvf::Vec3d* top, cvf::Vec3d* bottom );
double pipeRadius();
int pipeCrossSectionVertexCount();
Expand Down
24 changes: 15 additions & 9 deletions ApplicationLibCode/ReservoirDataModel/RigMswCenterLineCalculator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "RigWellResultFrame.h"

#include "RimEclipseCase.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
Expand All @@ -37,7 +38,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<SimulationWellCellBranch> RigMswCenterLineCalculator::calculateMswWellPipeGeometry( RimSimWellInView* rimWell )
std::vector<SimulationWellCellBranch> RigMswCenterLineCalculator::calculateMswWellPipeGeometry( const RimSimWellInView* rimWell )
{
CVF_ASSERT( rimWell );

Expand All @@ -50,7 +51,13 @@ std::vector<SimulationWellCellBranch> RigMswCenterLineCalculator::calculateMswWe
auto eclipseCaseData = eclipseView->eclipseCase()->eclipseCaseData();
int timeStepIndex = eclipseView->currentTimeStep();

return calculateMswWellPipeGeometryForTimeStep( eclipseCaseData, simWellData, timeStepIndex );
int shortBranchMergeThreshold = 4;
if ( auto eclipseResultCase = dynamic_cast<RimEclipseResultCase*>( eclipseView->eclipseCase() ) )
{
shortBranchMergeThreshold = eclipseResultCase->mswMergeThreshold();
}

return calculateMswWellPipeGeometryForTimeStep( eclipseCaseData, simWellData, timeStepIndex, shortBranchMergeThreshold );
}

return {};
Expand All @@ -62,10 +69,9 @@ std::vector<SimulationWellCellBranch> RigMswCenterLineCalculator::calculateMswWe
std::vector<SimulationWellCellBranch>
RigMswCenterLineCalculator::calculateMswWellPipeGeometryForTimeStep( const RigEclipseCaseData* eclipseCaseData,
const RigSimWellData* wellResults,
int timeStepIndex )
int timeStepIndex,
int shortBranchMergeThreshold )
{
if ( timeStepIndex >= 0 && !wellResults->hasAnyValidCells( timeStepIndex ) ) return {};

const RigWellResultFrame* wellFramePtr = nullptr;

if ( timeStepIndex < 0 )
Expand All @@ -80,7 +86,7 @@ std::vector<SimulationWellCellBranch>
const RigWellResultFrame& wellFrame = *wellFramePtr;
const std::vector<RigWellResultBranch> resultBranches = wellFrame.wellResultBranches();

std::vector<WellBranch> wellBranches = mergeShortBranchesIntoLongBranches( resultBranches );
std::vector<WellBranch> wellBranches = mergeShortBranchesIntoLongBranches( resultBranches, shortBranchMergeThreshold );

// Connect outlet segment of branches to parent branch

Expand Down Expand Up @@ -290,7 +296,8 @@ SimulationWellCellBranch
///
//--------------------------------------------------------------------------------------------------
std::vector<RigMswCenterLineCalculator::WellBranch>
RigMswCenterLineCalculator::mergeShortBranchesIntoLongBranches( const std::vector<RigWellResultBranch>& resBranches )
RigMswCenterLineCalculator::mergeShortBranchesIntoLongBranches( const std::vector<RigWellResultBranch>& resBranches,
int shortBranchMergeThreshold )
{
std::vector<WellBranch> longWellBranches;
std::vector<WellBranch> shortWellBranches;
Expand All @@ -314,8 +321,7 @@ std::vector<RigMswCenterLineCalculator::WellBranch>
}
}

const int resultPointThreshold = 3;
if ( resultBranch.branchResultPoints().size() > resultPointThreshold )
if ( resultBranch.branchResultPoints().size() > shortBranchMergeThreshold )
{
longWellBranches.push_back( branch );
}
Expand Down
8 changes: 5 additions & 3 deletions ApplicationLibCode/ReservoirDataModel/RigMswCenterLineCalculator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class RigSimWellData;
class RigMswCenterLineCalculator
{
public:
static std::vector<SimulationWellCellBranch> calculateMswWellPipeGeometry( RimSimWellInView* rimWell );
static std::vector<SimulationWellCellBranch> calculateMswWellPipeGeometry( const RimSimWellInView* rimWell );

private:
struct OutputSegment
Expand Down Expand Up @@ -69,11 +69,13 @@ class RigMswCenterLineCalculator
private:
static std::vector<SimulationWellCellBranch> calculateMswWellPipeGeometryForTimeStep( const RigEclipseCaseData* eclipseCaseData,
const RigSimWellData* simWellData,
int timeStepIndex );
int timeStepIndex,
int shortBranchMergeThreshold );

static SimulationWellCellBranch addCoordsAtCellFaceIntersectionsAndCreateBranch( const std::vector<cvf::Vec3d> branchCoords,
const std::vector<RigWellResultPoint>& resultPoints,
const RigEclipseCaseData* eclipseCaseData );

static std::vector<WellBranch> mergeShortBranchesIntoLongBranches( const std::vector<RigWellResultBranch>& resBranches );
static std::vector<WellBranch> mergeShortBranchesIntoLongBranches( const std::vector<RigWellResultBranch>& resBranches,
int shortBranchMergeThreshold );
};
4 changes: 2 additions & 2 deletions ApplicationLibCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<SimulationWellCellBranch> RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( RimSimWellInView* rimWell )
std::vector<SimulationWellCellBranch> RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( const RimSimWellInView* rimWell )
{
std::vector<std::vector<cvf::Vec3d>> pipeBranchesCLCoords;
std::vector<std::vector<RigWellResultPoint>> pipeBranchesCellIds;
Expand Down Expand Up @@ -118,7 +118,7 @@ std::pair<std::vector<std::vector<cvf::Vec3d>>, std::vector<std::vector<RigWellR
/// The returned CellIds is one less than the number of centerline points,
/// and are describing the lines between the points, starting with the first line
//--------------------------------------------------------------------------------------------------
void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( RimSimWellInView* rimWell,
void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( const RimSimWellInView* rimWell,
std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds )
{
Expand Down
4 changes: 2 additions & 2 deletions ApplicationLibCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RigWellResultFrame;
class RigSimulationWellCenterLineCalculator
{
public:
static std::vector<SimulationWellCellBranch> calculateWellPipeStaticCenterline( RimSimWellInView* rimWell );
static std::vector<SimulationWellCellBranch> calculateWellPipeStaticCenterline( const RimSimWellInView* rimWell );

static std::vector<SimulationWellCellBranch> calculateWellPipeCenterlineForTimeStep( const RigEclipseCaseData* eclipseCaseData,
const RigSimWellData* simWellData,
Expand All @@ -49,7 +49,7 @@ class RigSimulationWellCenterLineCalculator
extractBranchData( const std::vector<SimulationWellCellBranch> simulationBranch );

private:
static void calculateWellPipeStaticCenterline( RimSimWellInView* rimWell,
static void calculateWellPipeStaticCenterline( const RimSimWellInView* rimWell,
std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds );

Expand Down

0 comments on commit 4e92a39

Please sign in to comment.