OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 16:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3197 Refactoring : Add const keyword

Browse Source 
Removed fractureBorderPolygon from RimFractureTemplate
This commit is contained in:
Magne Sjaastad 2018-08-10 14:28:52 +02:00
parent d612362d4b
commit a672e1fa7f
7 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha
///
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices)
std::vector<cvf::uint>* triangleIndices) const
{
RigEllipsisTesselator tesselator(20);
@ -121,7 +121,7 @@ void RimEllipseFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3f
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<cvf::Vec3f> RimEllipseFractureTemplate::fractureBorderPolygon()
std::vector<cvf::Vec3f> RimEllipseFractureTemplate::fractureBorderPolygon() const
{
std::vector<cvf::Vec3f> polygon;

6
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
View File

@ -46,9 +46,8 @@ public:
RimEllipseFractureTemplate();
virtual ~RimEllipseFractureTemplate();
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords, std::vector<cvf::uint>* polygonIndices) override;
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords, std::vector<cvf::uint>* polygonIndices) const override;
std::vector<cvf::Vec3f> fractureBorderPolygon() override;
void changeUnits();
const RigFractureGrid* fractureGrid() const override;
void setDefaultValuesFromUnit();
@ -74,7 +73,8 @@ protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
void assignConductivityToCellsInsideEllipse();
void assignConductivityToCellsInsideEllipse();
std::vector<cvf::Vec3f> fractureBorderPolygon() const;
FractureWidthAndConductivity widthAndConductivityAtWellPathIntersection() const override;

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

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

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

@ -776,7 +776,7 @@ QString RimFractureTemplate::nameAndUnit() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::wellDiameter()
double RimFractureTemplate::wellDiameter() const
{
return m_wellDiameter;
}
@ -784,7 +784,7 @@ double RimFractureTemplate::wellDiameter()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureTemplate::perforationLength()
double RimFractureTemplate::perforationLength() const
{
return m_perforationLength;
}
@ -792,7 +792,7 @@ double RimFractureTemplate::perforationLength()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimFractureContainment * RimFractureTemplate::fractureContainment()
const RimFractureContainment * RimFractureTemplate::fractureContainment() const
{
return m_fractureContainment();
}

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

@ -124,16 +124,15 @@ public:
FracOrientationEnum orientationType() const;
float azimuthAngle() const;
float skinFactor() const;
double wellDiameter();
double wellDiameter() const;
FracConductivityEnum conductivityType() const;
double perforationLength();
double perforationLength() const;
virtual void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices) = 0;
std::vector<cvf::uint>* triangleIndices) const = 0;
virtual std::vector<cvf::Vec3f> fractureBorderPolygon() = 0;
virtual const RigFractureGrid* fractureGrid() const = 0;
const RimFractureContainment* fractureContainment();
const RimFractureContainment* fractureContainment() const;
virtual void appendDataToResultStatistics(const QString& resultName,
const QString& unit,

19
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@ -814,14 +814,9 @@ void RimStimPlanFractureTemplate::updateFractureGrid()
///
//--------------------------------------------------------------------------------------------------
void RimStimPlanFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices)
std::vector<cvf::uint>* triangleIndices) const
{
if (m_stimPlanFractureDefinitionData.isNull())
{
loadDataAndUpdate();
}
else
if (m_stimPlanFractureDefinitionData.notNull())
{
m_stimPlanFractureDefinitionData->createFractureTriangleGeometry(m_wellPathDepthAtFracture,
name(),
@ -830,16 +825,6 @@ void RimStimPlanFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fractureBorderPolygon()
{
// Not implemented
return std::vector<cvf::Vec3f>();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@ -68,8 +68,7 @@ public:
const RigFractureGrid* fractureGrid() const override;
void updateFractureGrid();
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices) override;
std::vector<cvf::Vec3f> fractureBorderPolygon() override;
std::vector<cvf::uint>* triangleIndices) const override;
// Result Access