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

#1487 - pre-proto - Moving private functions to private, removing some functions / parameters not in use.

Browse Source
This commit is contained in:
astridkbjorke
2017-05-26 14:10:00 +02:00
parent 38315f7bc2
commit 7420c069c7
5 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@@ -895,7 +895,7 @@ void RimStimPlanFractureTemplate::setupStimPlanCells()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<RigStimPlanFracTemplateCell>& RimStimPlanFractureTemplate::getStimPlanCells() const std::vector<RigStimPlanFracTemplateCell>& RimStimPlanFractureTemplate::getStimPlanCells() const
{ {
return m_stimPlanCells; return m_stimPlanCells;
} }

41
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
View File

@@ -56,6 +56,8 @@ public:
caf::PdmField<bool> showStimPlanMesh; caf::PdmField<bool> showStimPlanMesh;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void loadDataAndUpdate();
void setFileName(const QString& fileName); void setFileName(const QString& fileName);
const QString& fileName(); const QString& fileName();
@@ -65,40 +67,26 @@ public:
std::vector<cvf::Vec3f> fracturePolygon(RimDefines::UnitSystem fractureUnit); std::vector<cvf::Vec3f> fracturePolygon(RimDefines::UnitSystem fractureUnit);
void sortPolygon(std::vector<cvf::Vec3f> &polygon); void sortPolygon(std::vector<cvf::Vec3f> &polygon);
size_t stimPlanGridNumberOfRows() const;
size_t stimPlanGridNumberOfColums() const;
std::vector<double> getNegAndPosXcoords() const;
std::vector<double> adjustedDepthCoordsAroundWellPathPosition() const;
std::vector<double> getStimPlanTimeValues(); std::vector<double> getStimPlanTimeValues();
std::vector<std::pair<QString, QString> > getStimPlanPropertyNamesUnits() const; std::vector<std::pair<QString, QString> > getStimPlanPropertyNamesUnits() const;
void computeMinMax(const QString& resultName, const QString& unitName, double* minValue, double* maxValue) const; void computeMinMax(const QString& resultName, const QString& unitName, double* minValue, double* maxValue) const;
void setDefaultsBasedOnXMLfile();
std::vector<std::vector<double>> getDataAtTimeIndex(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
void getStimPlanDataAsPolygonsAndValues(std::vector<std::vector<cvf::Vec3d> > &cellsAsPolygons, std::vector<double> &parameterValue, const QString& resultName, const QString& unitName, size_t timeStepIndex);
void setupStimPlanCells(); void setupStimPlanCells();
const std::vector<RigStimPlanFracTemplateCell>& getStimPlanCells(); const std::vector<RigStimPlanFracTemplateCell>& getStimPlanCells() const;
std::vector<cvf::Vec3d> getStimPlanRowPolygon(size_t i); size_t getGlobalIndexFromIJ(size_t i, size_t j) const;
std::vector<cvf::Vec3d> getStimPlanColPolygon(size_t j); const RigStimPlanFracTemplateCell& stimPlanCellFromIndex(size_t index) const;
size_t stimPlanGridNumberOfRows() const;
size_t stimPlanGridNumberOfColums() const;
std::pair<size_t, size_t> getStimPlanCellAtWellCenter(); std::pair<size_t, size_t> getStimPlanCellAtWellCenter();
size_t getGlobalIndexFromIJ(size_t i, size_t j) const;
const RigStimPlanFracTemplateCell& stimPlanCellFromIndex(size_t index) const;
//TODO: Functions for finding perforated stimPlanCells
//Radial flow: Single cell (at 0,0)
void loadDataAndUpdate(); //TODO: Update m_stimPlanCells
void setDefaultsBasedOnXMLfile();
std::vector<std::vector<double>> getDataAtTimeIndex(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
std::vector<std::vector<double>> getMirroredDataAtTimeIndex(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
//Functions used by upscaling only
void getStimPlanDataAsPolygonsAndValues(std::vector<std::vector<cvf::Vec3d> > &cellsAsPolygons, std::vector<double> &parameterValue, const QString& resultName, const QString& unitName, size_t timeStepIndex);
std::vector<cvf::Vec3d> getStimPlanRowPolygon(size_t i);
std::vector<cvf::Vec3d> getStimPlanColPolygon(size_t j);
protected: protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
@@ -114,6 +102,9 @@ private:
static QString getAttributeValueString(QXmlStreamReader &xmlStream, QString parameterName); static QString getAttributeValueString(QXmlStreamReader &xmlStream, QString parameterName);
void getGriddingValues(QXmlStreamReader &xmlStream, std::vector<double>& gridValues, size_t& startNegValues); void getGriddingValues(QXmlStreamReader &xmlStream, std::vector<double>& gridValues, size_t& startNegValues);
std::vector<std::vector<double>> getAllDepthDataAtTimeStep(QXmlStreamReader &xmlStream, size_t startingNegValuesXs); std::vector<std::vector<double>> getAllDepthDataAtTimeStep(QXmlStreamReader &xmlStream, size_t startingNegValuesXs);
std::vector<std::vector<double>> getMirroredDataAtTimeIndex(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
std::vector<double> getNegAndPosXcoords() const;
std::vector<double> adjustedDepthCoordsAroundWellPathPosition() const;
bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep); bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep);
bool setPropertyForPolygonDefault(); bool setPropertyForPolygonDefault();

9
ApplicationCode/ReservoirDataModel/RigStimPlanFracTemplateCell.cpp
View File

@@ -44,15 +44,6 @@ RigStimPlanFracTemplateCell::~RigStimPlanFracTemplateCell()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigStimPlanFracTemplateCell::setTransmissibilityInFracture(double valueHorizontal, double valueVertical)
{
m_transmissibilityInFractureHorizontal = valueHorizontal;
m_transmissibilityInFractureVertical = valueVertical;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/ReservoirDataModel/RigStimPlanFracTemplateCell.h
View File

@@ -37,18 +37,15 @@ public:
virtual ~RigStimPlanFracTemplateCell(); virtual ~RigStimPlanFracTemplateCell();
std::vector<cvf::Vec3d> getPolygon() const { return m_polygon; } const std::vector<cvf::Vec3d>& getPolygon() const { return m_polygon; }
double getConductivtyValue() const { return m_concutivityValue; } double getConductivtyValue() const { return m_concutivityValue; }
double getDisplayValue() { return m_displayValue; } double getDisplayValue() { return m_displayValue; }
size_t getI() const { return m_i; } size_t getI() const { return m_i; }
size_t getJ() const { return m_j; } size_t getJ() const { return m_j; }
double getVerticalTransmissibilityInFracture() { return m_transmissibilityInFractureVertical; }
double getHorizontalTransmissibilityInFracture() { return m_transmissibilityInFractureHorizontal; }
void setConductivityValue(double cond) { m_concutivityValue = cond; } void setConductivityValue(double cond) { m_concutivityValue = cond; }
void setDisplayValue(double value) { m_displayValue = value; }; void setDisplayValue(double value) { m_displayValue = value; };
void setTransmissibilityInFracture(double valueHorizontal, double valueVertical);
double cellSizeX() const; double cellSizeX() const;
double cellSizeZ() const; double cellSizeZ() const;
@@ -59,7 +56,4 @@ private:
size_t m_i; size_t m_i;
size_t m_j; size_t m_j;
double m_transmissibilityInFractureVertical;
double m_transmissibilityInFractureHorizontal;
}; };

3
doc/fracture_clases.plantuml
View File

@@ -64,8 +64,7 @@ class RigStimPlanFracTemplateCell{
double m_conductivityValue; double m_conductivityValue;
size_t m_i; size_t m_i;
size_t m_j; size_t m_j;
double m_transmissibilityInFractureVertical;
double m_transmissibilityInFractureHorizontal;
} }