#2358 Ellipse fracture template. Extracted conductivity method

This commit is contained in:
Bjørn Erik Jensen 2018-01-15 13:32:13 +01:00
parent 523c623d39
commit ac59050824
2 changed files with 21 additions and 11 deletions

View File

@ -218,17 +218,7 @@ void RimEllipseFractureTemplate::setupFractureGridCells()
cellPolygon.push_back(cvf::Vec3d(X2, Y2, 0.0)); cellPolygon.push_back(cvf::Vec3d(X2, Y2, 0.0));
cellPolygon.push_back(cvf::Vec3d(X1, Y2, 0.0)); cellPolygon.push_back(cvf::Vec3d(X1, Y2, 0.0));
double cond = cvf::UNDEFINED_DOUBLE; double cond = conductivity();
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
//Conductivity should be md-m, width is in m
cond = m_permeability * m_width;
}
else if(fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
//Conductivity should be md-ft, but width is in inches
cond = m_permeability * RiaEclipseUnitTools::inchToFeet(m_width);
}
std::vector<cvf::Vec3f> ellipseFracPolygon = fractureBorderPolygon(fractureTemplateUnit()); std::vector<cvf::Vec3f> ellipseFracPolygon = fractureBorderPolygon(fractureTemplateUnit());
std::vector<cvf::Vec3d> ellipseFracPolygonDouble; std::vector<cvf::Vec3d> ellipseFracPolygonDouble;
@ -298,6 +288,25 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
this->setDefaultWellDiameterFromUnit(); this->setDefaultWellDiameterFromUnit();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimEllipseFractureTemplate::conductivity() const
{
double cond = cvf::UNDEFINED_DOUBLE;
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
//Conductivity should be md-m, width is in m
cond = m_permeability * m_width;
}
else if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
//Conductivity should be md-ft, but width is in inches
cond = m_permeability * RiaEclipseUnitTools::inchToFeet(m_width);
}
return cond;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -57,6 +57,7 @@ public:
const RigFractureGrid* fractureGrid() const; const RigFractureGrid* fractureGrid() const;
void setDefaultValuesFromUnit(); void setDefaultValuesFromUnit();
double conductivity() const;
protected: protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);