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

pre-proto - Rename RigFractureStimPlanCellData to RigStimPlanFractureCell

Browse Source
This commit is contained in:
astridkbjorke 2017-05-11 12:20:09 +02:00
parent df9e434c74
commit 45321d0821
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifEclipseExportTools.cpp
View File

@ -289,7 +289,7 @@ void RifEclipseExportTools::printStimPlanCellsMatrixTransContributions(const std
//continue;
}
RigFractureStimPlanCellData fracStimPlanCellData(stimPlanCell.getI(), stimPlanCell.getJ());
RigStimPlanFractureCell fracStimPlanCellData(stimPlanCell.getI(), stimPlanCell.getJ());
transmissibilityCalculator.calculateStimPlanCellsMatrixTransmissibility(&stimPlanCell, &fracStimPlanCellData);

6
ApplicationCode/ReservoirDataModel/RigFracture.cpp
View File

@ -29,7 +29,7 @@ RigFractureData::RigFractureData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFractureStimPlanCellData::RigFractureStimPlanCellData(size_t i, size_t j)
RigStimPlanFractureCell::RigStimPlanFractureCell(size_t i, size_t j)
{
m_i = i;
m_j = j;
@ -38,7 +38,7 @@ RigFractureStimPlanCellData::RigFractureStimPlanCellData(size_t i, size_t j)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFractureStimPlanCellData::addContributingEclipseCell(size_t eclipseCell, double transmissibility)
void RigStimPlanFractureCell::addContributingEclipseCell(size_t eclipseCell, double transmissibility)
{
contributingEclipseCells.push_back(eclipseCell);
contributingEclipseCellTransmissibilities.push_back(transmissibility);
@ -95,7 +95,7 @@ const std::vector<RigFractureData>& RigFracture::fractureData() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFracture::addStimPlanCellFractureCell(RigFractureStimPlanCellData fracStimPlanCellData)
void RigFracture::addStimPlanCellFractureCell(RigStimPlanFractureCell fracStimPlanCellData)
{
m_stimPlanCellsFractureData.push_back(fracStimPlanCellData);
}

8
ApplicationCode/ReservoirDataModel/RigFracture.h
View File

@ -52,10 +52,10 @@ public:
};
class RigFractureStimPlanCellData
class RigStimPlanFractureCell
{
public:
RigFractureStimPlanCellData(size_t i, size_t j);
RigStimPlanFractureCell(size_t i, size_t j);
size_t m_i;
size_t m_j;
@ -92,13 +92,13 @@ public:
std::vector<RigFractureData> m_fractureData;
void addStimPlanCellFractureCell(RigFractureStimPlanCellData fracStimPlanCellData);
void addStimPlanCellFractureCell(RigStimPlanFractureCell fracStimPlanCellData);
private:
std::vector<cvf::uint> m_triangleIndices;
std::vector<cvf::Vec3f> m_nodeCoords;
std::vector<RigFractureStimPlanCellData> m_stimPlanCellsFractureData;
std::vector<RigStimPlanFractureCell> m_stimPlanCellsFractureData;
std::vector<size_t> m_perforatedStimPlanCellsIndex;
};

2
ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
View File

@ -246,7 +246,7 @@ void RigFractureTransCalc::computeTransmissibilityFromPolygonWithInfiniteConduct
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFractureTransCalc::calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigFractureStimPlanCellData* fracStimPlanCellData)
void RigFractureTransCalc::calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigStimPlanFractureCell* fracStimPlanCellData)
{
//Not calculating flow into fracture if stimPlan cell cond value is 0 (assumed to be outside the fracture):

4
ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
View File

@ -36,7 +36,7 @@ class RimFracture;
class RimEclipseCase;
class RigStimPlanCell;
class RimStimPlanFractureTemplate;
class RigFractureStimPlanCellData;
class RigStimPlanFractureCell;
//==================================================================================================
///
@ -59,7 +59,7 @@ public:
static double arithmeticAverage(std::vector<double> values);
// Calculations based on StimPlan grid
void calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigFractureStimPlanCellData* fracStimPlanCellData);
void calculateStimPlanCellsMatrixTransmissibility(RigStimPlanCell* stimPlanCell, RigStimPlanFractureCell* fracStimPlanCellData);
static void computeStimPlanCellTransmissibilityInFracture(const RigStimPlanCell& stimPlanCell);
double computeRadialTransmissibilityToWellinStimPlanCell(const RigStimPlanCell& stimPlanCell);
double computeLinearTransmissibilityToWellinStimPlanCell(const RigStimPlanCell& stimPlanCell, double perforationLengthVertical, double perforationLengthHorizontal);