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 : Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-21 10:10:22 +01:00
parent 0acab5cd65
commit 81bb4481ed
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,11 +298,11 @@ double RimFracture::wellRadius() const
{
if (m_fractureUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
return m_wellDiameter / 2;
return m_wellDiameter / 2.0;
}
else if (m_fractureUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
return RiaEclipseUnitTools::inchToFeet(m_wellDiameter / 2);
return RiaEclipseUnitTools::inchToFeet(m_wellDiameter / 2.0);
}
return cvf::UNDEFINED_DOUBLE;
@ -657,8 +657,8 @@ void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
{
this->updateAzimuthBasedOnWellAzimuthAngle();
}
this->m_wellDiameter = fractureTemplate->wellDiameterInFractureUnit();
this->m_perforationLength = fractureTemplate->perforationLengthInFractureUnit();
this->m_wellDiameter = fractureTemplate->wellDiameter();
this->m_perforationLength = fractureTemplate->perforationLength();
}
//--------------------------------------------------------------------------------------------------

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

@ -621,7 +621,7 @@ QString RimFractureTemplate::nameAndUnit() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::wellDiameterInFractureUnit()
double RimFractureTemplate::wellDiameter()
{
return m_wellDiameter;
}
@ -629,7 +629,7 @@ double RimFractureTemplate::wellDiameterInFractureUnit()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::perforationLengthInFractureUnit()
double RimFractureTemplate::perforationLength()
{
return m_perforationLength;
}

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

@ -114,12 +114,12 @@ public:
FracOrientationEnum orientationType() const;
float azimuthAngle() const;
float skinFactor() const;
double wellDiameterInFractureUnit();
double wellDiameter();
FracConductivityEnum conductivityType() const;
double perforationLengthInFractureUnit();
double perforationLength();
virtual void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices) = 0;
virtual void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices) = 0;
virtual std::vector<cvf::Vec3f> fractureBorderPolygon() = 0;
virtual const RigFractureGrid* fractureGrid() const = 0;