OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-10 08:03:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fracture Completion Report : Use areaOpenForFlow() and remove unused function

Browse Source
This commit is contained in:
Magne Sjaastad 2018-09-28 13:42:02 +02:00
parent 719061ae62
commit 70a7b3ae5c
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp
View File

@ -55,7 +55,6 @@ RigEclipseToStimPlanCalculator::RigEclipseToStimPlanCalculator(const RimEclipseC
, m_fractureGrid(fractureGrid) , m_fractureGrid(fractureGrid)
, m_fracture(fracture) , m_fracture(fracture)
{ {
computeValues(); computeValues();
} }
@ -71,8 +70,13 @@ void RigEclipseToStimPlanCalculator::computeValues()
const RigFractureCell& fractureCell = m_fractureGrid.fractureCells()[i]; const RigFractureCell& fractureCell = m_fractureGrid.fractureCells()[i];
if (!fractureCell.hasNonZeroConductivity()) continue; if (!fractureCell.hasNonZeroConductivity()) continue;
RigEclipseToStimPlanCellTransmissibilityCalculator eclToFractureTransCalc( RigEclipseToStimPlanCellTransmissibilityCalculator eclToFractureTransCalc(m_case,
m_case, m_fractureTransform, m_fractureSkinFactor, m_cDarcy, fractureCell, reservoirCellIndicesOpenForFlow, m_fracture); m_fractureTransform,
m_fractureSkinFactor,
m_cDarcy,
fractureCell,
reservoirCellIndicesOpenForFlow,
m_fracture);
const std::vector<size_t>& fractureCellContributingEclipseCells = const std::vector<size_t>& fractureCellContributingEclipseCells =
eclToFractureTransCalc.globalIndiciesToContributingEclipseCells(); eclToFractureTransCalc.globalIndiciesToContributingEclipseCells();
@ -121,7 +125,7 @@ void RigEclipseToStimPlanCalculator::appendDataToTransmissibilityCondenser(bool
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigEclipseToStimPlanCalculator::totalEclipseAreaOpenForFlow() const double RigEclipseToStimPlanCalculator::totalEclipseAreaOpenForFlow() const
{ {
@ -129,16 +133,12 @@ double RigEclipseToStimPlanCalculator::totalEclipseAreaOpenForFlow() const
for (const auto& singleCellCalc : m_singleFractureCellCalculators) for (const auto& singleCellCalc : m_singleFractureCellCalculators)
{ {
const auto& cellAreas = singleCellCalc.second.contributingEclipseCellAreas(); double cellArea = singleCellCalc.second.areaOpenForFlow();
for (const auto& cellArea : cellAreas) area += cellArea;
{
area += cellArea;
}
} }
return area; return area;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
View File

@ -72,14 +72,6 @@ const std::vector<double>& RigEclipseToStimPlanCellTransmissibilityCalculator::c
return m_contributingEclipseCellTransmissibilities; return m_contributingEclipseCellTransmissibilities;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigEclipseToStimPlanCellTransmissibilityCalculator::contributingEclipseCellAreas() const
{
return m_contributingEclipseCellAreas;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h
View File

@ -54,7 +54,6 @@ public:
// These three vectors have the same size // These three vectors have the same size
const std::vector<size_t>& globalIndiciesToContributingEclipseCells() const; const std::vector<size_t>& globalIndiciesToContributingEclipseCells() const;
const std::vector<double>& contributingEclipseCellTransmissibilities() const; const std::vector<double>& contributingEclipseCellTransmissibilities() const;
const std::vector<double>& contributingEclipseCellAreas() const;
double areaOpenForFlow() const; double areaOpenForFlow() const;
double aggregatedMatrixTransmissibility() const; double aggregatedMatrixTransmissibility() const;