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

#3197 Refactoring : Add const keyword and use const ref

Browse Source
This commit is contained in:
Magne Sjaastad 2018-08-10 14:12:14 +02:00
parent 25ac317639
commit d612362d4b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@ -203,7 +203,7 @@ void RigStimPlanFractureDefinition::generateXsFromFileXs(bool xMirrorMode)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<std::vector<double>> RigStimPlanFractureDefinition::generateDataLayoutFromFileDataLayout(std::vector<std::vector<double>> fileXYData) std::vector<std::vector<double>> RigStimPlanFractureDefinition::generateDataLayoutFromFileDataLayout(std::vector<std::vector<double>> fileXYData) const
{ {
if (m_xMirrorMode) if (m_xMirrorMode)
{ {
@ -234,12 +234,12 @@ std::vector<std::vector<double>> RigStimPlanFractureDefinition::generateDataLayo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RigStimPlanFractureDefinition::numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep) bool RigStimPlanFractureDefinition::numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep) const
{ {
size_t xCount = m_Xs.size(); size_t xCount = m_Xs.size();
if ( propertyValuesAtTimestep.size() != yCount()) return false; if ( propertyValuesAtTimestep.size() != yCount()) return false;
for ( std::vector<double> valuesAtDepthVector : propertyValuesAtTimestep ) for ( const std::vector<double>& valuesAtDepthVector : propertyValuesAtTimestep )
{ {
if ( valuesAtDepthVector.size() != xCount ) return false; if ( valuesAtDepthVector.size() != xCount ) return false;
} }
@ -345,7 +345,7 @@ std::vector<std::vector<double>>
cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(const QString& resultName, cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(const QString& resultName,
int activeTimeStepIndex, int activeTimeStepIndex,
double wellPathIntersectionAtFractureDepth, double wellPathIntersectionAtFractureDepth,
RiaEclipseUnitTools::UnitSystem requiredUnitSet) RiaEclipseUnitTools::UnitSystem requiredUnitSet) const
{ {
std::vector<std::vector<double>> conductivityValues = conductivityValuesAtTimeStep(resultName, activeTimeStepIndex, requiredUnitSet); std::vector<std::vector<double>> conductivityValues = conductivityValuesAtTimeStep(resultName, activeTimeStepIndex, requiredUnitSet);
if (conductivityValues.empty()) if (conductivityValues.empty())
@ -377,7 +377,7 @@ cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(cons
cellPolygon.push_back(cvf::Vec3d(xCoords[i], depthCoords[j + 1], 0.0)); cellPolygon.push_back(cvf::Vec3d(xCoords[i], depthCoords[j + 1], 0.0));
RigFractureCell stimPlanCell(cellPolygon, i, j); RigFractureCell stimPlanCell(cellPolygon, i, j);
if ( conductivityValues.size() > 0 ) //Assuming vector to be of correct length, or no values if ( !conductivityValues.empty() ) //Assuming vector to be of correct length, or no values
{ {
stimPlanCell.setConductivityValue(conductivityValues[j + 1][i + 1]); stimPlanCell.setConductivityValue(conductivityValues[j + 1][i + 1]);
} }
@ -455,7 +455,7 @@ std::vector<double> RigStimPlanFractureDefinition::fractureGridResults(const QSt
void RigStimPlanFractureDefinition::createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth, void RigStimPlanFractureDefinition::createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth,
const QString& fractureUserName, const QString& fractureUserName,
std::vector<cvf::Vec3f>* vertices, std::vector<cvf::Vec3f>* vertices,
std::vector<cvf::uint>* triangleIndices) std::vector<cvf::uint>* triangleIndices) const
{ {
std::vector<double> xCoords = this->m_Xs; std::vector<double> xCoords = this->m_Xs;
cvf::uint lenXcoords = static_cast<cvf::uint>(xCoords.size()); cvf::uint lenXcoords = static_cast<cvf::uint>(xCoords.size());
@ -504,7 +504,7 @@ void RigStimPlanFractureDefinition::createFractureTriangleGeometry(double wellPa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void sortPolygon(std::vector<cvf::Vec3f> &polygon) void sortPolygon(std::vector<cvf::Vec3f> &polygon)
{ {
if (polygon.size() == 0) return; if (polygon.empty()) return;
for (int i = 1; i < static_cast<int>(polygon.size()) - 1; i++) for (int i = 1; i < static_cast<int>(polygon.size()) - 1; i++)
{ {
@ -547,7 +547,7 @@ void RigStimPlanFractureDefinition::addTimeStep(double time)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck) bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck) const
{ {
for (double timeStep : m_timeSteps) for (double timeStep : m_timeSteps)
{ {
@ -559,7 +559,7 @@ bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue) size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue) const
{ {
size_t index = 0; size_t index = 0;
while (index < m_timeSteps.size()) while (index < m_timeSteps.size())
@ -576,7 +576,7 @@ size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RigStimPlanFractureDefinition::totalNumberTimeSteps() size_t RigStimPlanFractureDefinition::totalNumberTimeSteps() const
{ {
return m_timeSteps.size(); return m_timeSteps.size();
} }

14
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@ -74,16 +74,16 @@ public:
cvf::ref<RigFractureGrid> createFractureGrid(const QString& resultName, cvf::ref<RigFractureGrid> createFractureGrid(const QString& resultName,
int activeTimeStepIndex, int activeTimeStepIndex,
double wellPathIntersectionAtFractureDepth, double wellPathIntersectionAtFractureDepth,
RiaEclipseUnitTools::UnitSystem requiredUnitSet); RiaEclipseUnitTools::UnitSystem requiredUnitSet) const;
void createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth, void createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth,
const QString& fractureUserName, const QString& fractureUserName,
std::vector<cvf::Vec3f>* vertices, std::vector<cvf::Vec3f>* vertices,
std::vector<cvf::uint>* triangleIndices); std::vector<cvf::uint>* triangleIndices) const;
const std::vector<double>& timeSteps() const; const std::vector<double>& timeSteps() const;
void addTimeStep(double time); void addTimeStep(double time);
size_t totalNumberTimeSteps(); size_t totalNumberTimeSteps() const;
std::vector<std::pair<QString, QString>> getStimPlanPropertyNamesUnits() const; std::vector<std::pair<QString, QString>> getStimPlanPropertyNamesUnits() const;
@ -106,13 +106,13 @@ public:
QStringList conductivityResultNames() const; QStringList conductivityResultNames() const;
private: private:
bool timeStepExists(double timeStepValue); bool timeStepExists(double timeStepValue) const;
size_t getTimeStepIndex(double timeStepValue); size_t getTimeStepIndex(double timeStepValue) const;
size_t resultIndex(const QString& resultName, const QString& unit) const; size_t resultIndex(const QString& resultName, const QString& unit) const;
void generateXsFromFileXs(bool xMirrorMode); void generateXsFromFileXs(bool xMirrorMode);
std::vector<std::vector<double>> generateDataLayoutFromFileDataLayout(std::vector<std::vector<double>> rawXYData); std::vector<std::vector<double>> generateDataLayoutFromFileDataLayout(std::vector<std::vector<double>> rawXYData) const;
std::vector<double> adjustedYCoordsAroundWellPathPosition(double wellPathIntersectionAtFractureDepth) const; std::vector<double> adjustedYCoordsAroundWellPathPosition(double wellPathIntersectionAtFractureDepth) const;
bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep); bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep) const;
double minY() const; double minY() const;
double maxY() const; double maxY() const;
void scaleXs(double scaleFactor); void scaleXs(double scaleFactor);