From ac59050824ba8bbbfe61ee52529cc8d7b3b68bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Mon, 15 Jan 2018 13:32:13 +0100 Subject: [PATCH] #2358 Ellipse fracture template. Extracted conductivity method --- .../RimEllipseFractureTemplate.cpp | 31 ++++++++++++------- .../Completions/RimEllipseFractureTemplate.h | 1 + 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index e1448244c1..d69d25729a 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -218,17 +218,7 @@ void RimEllipseFractureTemplate::setupFractureGridCells() cellPolygon.push_back(cvf::Vec3d(X2, Y2, 0.0)); cellPolygon.push_back(cvf::Vec3d(X1, Y2, 0.0)); - 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); - } + double cond = conductivity(); std::vector ellipseFracPolygon = fractureBorderPolygon(fractureTemplateUnit()); std::vector ellipseFracPolygonDouble; @@ -298,6 +288,25 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit() 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; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h index 47ebcc2cb9..ff698a9e60 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h @@ -57,6 +57,7 @@ public: const RigFractureGrid* fractureGrid() const; void setDefaultValuesFromUnit(); + double conductivity() const; protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);