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

#2619 Fracture Sensitivity Support: Add conductivity scale for Ellipse fractures

Browse Source
This commit is contained in:
Magne Sjaastad
2018-03-20 08:22:38 +01:00
parent 0dc48db993
commit 0b123044a1
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,8 @@ double RimEllipseFractureTemplate::conductivity() const
//Conductivity should be md-ft, but width is in inches
cond = m_userDefinedEffectivePermeability * RiaEclipseUnitTools::inchToFeet(m_width);
}
return cond;
return m_conductivityScaleFactor * cond;
}
//--------------------------------------------------------------------------------------------------

7
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@@ -324,11 +324,8 @@ void RimFractureTemplate::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
group->add(&m_heightScaleFactor);
group->add(&m_widthScaleFactor);
group->add(&m_dFactorScaleFactor);
group->add(&m_conductivityScaleFactor);
if (supportsConductivityScaling())
{
group->add(&m_conductivityScaleFactor);
}
group->add(&m_scaleApplyButton);
}
@@ -680,7 +677,7 @@ void RimFractureTemplate::setScaleFactors(double width, double height, double dF
m_widthScaleFactor = width;
m_heightScaleFactor = height;
m_dFactorScaleFactor = dFactor;
m_conductivityScaleFactor = supportsConductivityScaling() ? conductivity : 1.0;
m_conductivityScaleFactor = conductivity;
}
//--------------------------------------------------------------------------------------------------

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

@@ -160,8 +160,6 @@ protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual bool supportsConductivityScaling() const { return false; }
private:
void prepareFieldsForUiDisplay();
virtual FractureWidthAndConductivity widthAndConductivityAtWellPathIntersection() const = 0;

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

@@ -99,8 +99,6 @@ protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
virtual bool supportsConductivityScaling() const override { return true; }
private:
void setDefaultConductivityResultIfEmpty();
bool setBorderPolygonResultNameToDefault();