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

#2509 Fracture : Remove obsolete unit conversion

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-21 09:10:08 +01:00
parent f67918eba3
commit 28ab07b199
6 changed files with 16 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -295,30 +295,17 @@ cvf::BoundingBox RimFracture::boundingBoxInDomainCoords()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFracture::wellRadius(RiaEclipseUnitTools::UnitSystem unitSystem) const
double RimFracture::wellRadius() const
{
if (m_fractureUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
if (unitSystem == RiaEclipseUnitTools::UNITS_FIELD)
{
return RiaEclipseUnitTools::meterToFeet(m_wellDiameter / 2);
}
else
{
return m_wellDiameter / 2;
}
return m_wellDiameter / 2;
}
else if (m_fractureUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
if (unitSystem == RiaEclipseUnitTools::UNITS_METRIC)
{
return RiaEclipseUnitTools::inchToMeter(m_wellDiameter / 2);
}
else
{
return RiaEclipseUnitTools::inchToFeet(m_wellDiameter / 2);
}
return RiaEclipseUnitTools::inchToFeet(m_wellDiameter / 2);
}
return cvf::UNDEFINED_DOUBLE;
}
@@ -657,8 +644,8 @@ void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
{
this->updateAzimuthBasedOnWellAzimuthAngle();
}
this->m_wellDiameter = fractureTemplate->wellDiameterInFractureUnit(m_fractureUnit());
this->m_perforationLength = fractureTemplate->perforationLengthInFractureUnit(m_fractureUnit());
this->m_wellDiameter = fractureTemplate->wellDiameterInFractureUnit();
this->m_perforationLength = fractureTemplate->perforationLengthInFractureUnit();
}
//--------------------------------------------------------------------------------------------------

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

@@ -60,7 +60,7 @@ public:
void setStimPlanTimeIndexToPlot(int timeIndex);
double wellRadius(RiaEclipseUnitTools::UnitSystem unitSystem) const;
double wellRadius() const;
cvf::Vec3d anchorPosition() const ;
void setAnchorPosition(const cvf::Vec3d& pos);
RiaEclipseUnitTools::UnitSystem fractureUnit() const;

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

@@ -602,47 +602,17 @@ QString RimFractureTemplate::nameAndUnit() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::wellDiameterInFractureUnit(RiaEclipseUnitTools::UnitSystemType fractureUnit)
double RimFractureTemplate::wellDiameterInFractureUnit()
{
if (fractureUnit == m_fractureTemplateUnit())
{
return m_wellDiameter;
}
else if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC
&& fractureUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
return RiaEclipseUnitTools::meterToInch(m_wellDiameter);
}
else if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD
&& fractureUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
return RiaEclipseUnitTools::inchToMeter(m_wellDiameter);
}
return cvf::UNDEFINED_DOUBLE;
return m_wellDiameter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::perforationLengthInFractureUnit(RiaEclipseUnitTools::UnitSystemType fractureUnit)
double RimFractureTemplate::perforationLengthInFractureUnit()
{
if (fractureUnit == m_fractureTemplateUnit())
{
return m_perforationLength;
}
else if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC
&& fractureUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
return RiaEclipseUnitTools::meterToFeet(m_perforationLength);
}
else if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD
&& fractureUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
return RiaEclipseUnitTools::feetToMeter(m_perforationLength);
}
return cvf::UNDEFINED_DOUBLE;
return m_perforationLength;
}
//--------------------------------------------------------------------------------------------------

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

@@ -114,9 +114,9 @@ public:
FracOrientationEnum orientationType() const;
float azimuthAngle() const;
float skinFactor() const;
double wellDiameterInFractureUnit(RiaEclipseUnitTools::UnitSystemType fractureUnit);
double wellDiameterInFractureUnit();
FracConductivityEnum conductivityType() const;
double perforationLengthInFractureUnit(RiaEclipseUnitTools::UnitSystemType fractureUnit);
double perforationLengthInFractureUnit();
virtual void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices) = 0;