OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3038 Remove code duplication

Browse Source
This commit is contained in:
Magne Sjaastad 2018-08-07 09:23:29 +02:00
parent 9617128464
commit 69d8d84612
4 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@ -623,48 +623,12 @@ bool RimFracture::isEclipseCellWithinContainment(const RigMainGrid* mainGri
CVF_ASSERT(fractureTemplate());
if (!fractureTemplate()->fractureContainment()->isEnabled()) return true;
size_t anchorEclipseCell = findAnchorEclipseCell(mainGrid);
size_t anchorEclipseCell = mainGrid->findReservoirCellIndexFromPoint(m_anchorPosition);
return fractureTemplate()->fractureContainment()->isEclipseCellWithinContainment(
mainGrid, anchorEclipseCell, globalCellIndex, containmentCells);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimFracture::findAnchorEclipseCell(const RigMainGrid* mainGrid ) const
{
cvf::BoundingBox pointBBox;
pointBBox.add(m_anchorPosition);
std::vector<size_t> cellIndices;
mainGrid->findIntersectingCells(pointBBox, &cellIndices);
size_t cellContainingAchorPoint = cvf::UNDEFINED_SIZE_T;
for ( size_t cellIndex : cellIndices )
{
auto cornerIndices = mainGrid->globalCellArray()[cellIndex].cornerIndices();
cvf::Vec3d vertices[8];
vertices[0] = (mainGrid->nodes()[cornerIndices[0]]);
vertices[1] = (mainGrid->nodes()[cornerIndices[1]]);
vertices[2] = (mainGrid->nodes()[cornerIndices[2]]);
vertices[3] = (mainGrid->nodes()[cornerIndices[3]]);
vertices[4] = (mainGrid->nodes()[cornerIndices[4]]);
vertices[5] = (mainGrid->nodes()[cornerIndices[5]]);
vertices[6] = (mainGrid->nodes()[cornerIndices[6]]);
vertices[7] = (mainGrid->nodes()[cornerIndices[7]]);
if ( RigHexIntersectionTools::isPointInCell(m_anchorPosition, vertices) )
{
cellContainingAchorPoint = cellIndex;
break;
}
}
return cellContainingAchorPoint;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Completions/RimFracture.h
View File

@ -70,8 +70,6 @@ public:
const std::set<size_t>& containmentCells,
size_t globalCellIndex) const;
size_t findAnchorEclipseCell(const RigMainGrid* mainGrid) const;
cvf::Mat4d transformMatrix() const;
double dip() const;
double tilt() const;

2
ApplicationCode/ProjectDataModel/Completions/RimFractureContainmentTools.cpp
View File

@ -228,7 +228,7 @@ std::set<size_t> RimFractureContainmentTools::fracturedCellsTruncatedByFaults(co
if (maximumFaultThrow > -1.0)
{
size_t anchorCellGlobalIndex = fracture->findAnchorEclipseCell(mainGrid);
size_t anchorCellGlobalIndex = mainGrid->findReservoirCellIndexFromPoint(fracture->anchorPosition());
appendNeighborCells(cellsIntersectingFracturePlane,
mainGrid,
anchorCellGlobalIndex,

3
ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
View File

@ -358,7 +358,8 @@ QString RimSimWellFracture::createOneBasedIJKText() const
{
RigMainGrid* mainGrid = ownerCaseMainGrid();
size_t i,j,k;
size_t anchorCellIdx = findAnchorEclipseCell(mainGrid);
size_t anchorCellIdx= mainGrid->findReservoirCellIndexFromPoint(anchorPosition());
if (anchorCellIdx == cvf::UNDEFINED_SIZE_T) return "";
size_t gridLocalCellIdx;