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

Ellipse Fracture : Rename to assignConductivityToCellsInsideEllipse

Browse Source
This commit is contained in:
Magne Sjaastad
2018-03-08 20:35:04 +01:00
parent 7c554b8ff8
commit 12b7ddf90b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@@ -59,7 +59,7 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void)
CAF_PDM_InitField(&m_userDefinedEffectivePermeability,"Permeability", 0.0, "Permeability [mD]", "", "", "");
m_fractureGrid = new RigFractureGrid();
setupFractureGridCells();
assignConductivityToCellsInsideEllipse();
}
//--------------------------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ RimEllipseFractureTemplate::~RimEllipseFractureTemplate()
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::loadDataAndUpdate()
{
setupFractureGridCells();
assignConductivityToCellsInsideEllipse();
RimEclipseView* activeView = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView());
if (activeView) activeView->loadDataAndUpdate();
@@ -101,7 +101,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (changedField == &m_width || changedField == &m_userDefinedEffectivePermeability)
{
setupFractureGridCells();
assignConductivityToCellsInsideEllipse();
}
}
@@ -159,7 +159,7 @@ void RimEllipseFractureTemplate::changeUnits()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::setupFractureGridCells()
void RimEllipseFractureTemplate::assignConductivityToCellsInsideEllipse()
{
std::vector<RigFractureCell> fractureCells;
std::pair<size_t, size_t> wellCenterFractureCellIJ = std::make_pair(0, 0);
@@ -329,7 +329,7 @@ void RimEllipseFractureTemplate::reload()
{
//Regenerate geometry
proj->createDisplayModelAndRedrawAllViews();
setupFractureGridCells();
assignConductivityToCellsInsideEllipse();
}
}

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

@@ -71,7 +71,7 @@ protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
void setupFractureGridCells();
void assignConductivityToCellsInsideEllipse();
FractureWidthAndConductivity widthAndConductivityAtWellPathIntersection() const override;