diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp index 3d0fdd5888..ffa5bff6ed 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index e9a8df40b2..b99f6908fe 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -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; } diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h index 13c578ffff..8ab1a5ce8d 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h @@ -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* nodeCoords, - std::vector* triangleIndices) = 0; + virtual void fractureTriangleGeometry(std::vector* nodeCoords, + std::vector* triangleIndices) = 0; virtual std::vector fractureBorderPolygon() = 0; virtual const RigFractureGrid* fractureGrid() const = 0;