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();
}
//--------------------------------------------------------------------------------------------------