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

pre-proto - Rename RigStimPlanCell to RigStimPlanFracTemplateCell

Browse Source
This commit is contained in:
astridkbjorke
2017-05-11 12:24:57 +02:00
parent 45321d0821
commit c6b329ea00
9 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@@ -26,7 +26,7 @@
#include "RimEclipseView.h"
#include "RimFracture.h"
#include "RimProject.h"
#include "RigStimPlanCell.h"
#include "RigStimPlanFracTemplateCell.h"
#include "RimStimPlanColors.h"
#include "RimStimPlanLegendConfig.h"
@@ -819,7 +819,7 @@ void RimStimPlanFractureTemplate::setupStimPlanCells()
QString resultNameFromColors = activeView->stimPlanColors->resultName();
QString resultUnitFromColors = activeView->stimPlanColors->unit();
std::vector<RigStimPlanCell> stimPlanCells;
std::vector<RigStimPlanFracTemplateCell> stimPlanCells;
bool wellCenterStimPlanCellFound = false;
@@ -848,7 +848,7 @@ void RimStimPlanFractureTemplate::setupStimPlanCells()
cellPolygon.push_back(cvf::Vec3d(static_cast<float>(xCoords[i + 1]), static_cast<float>(depthCoords[j + 1]), 0.0));
cellPolygon.push_back(cvf::Vec3d(static_cast<float>(xCoords[i]), static_cast<float>(depthCoords[j + 1]), 0.0));
RigStimPlanCell stimPlanCell(cellPolygon, i, j);
RigStimPlanFracTemplateCell stimPlanCell(cellPolygon, i, j);
if (conductivityValuesAtTimeStep.size() > 0) //Assuming vector to be of correct length, or no values
{
stimPlanCell.setConductivityValue(conductivityValuesAtTimeStep[j + 1][i + 1]);
@@ -895,7 +895,7 @@ void RimStimPlanFractureTemplate::setupStimPlanCells()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<RigStimPlanCell>& RimStimPlanFractureTemplate::getStimPlanCells()
const std::vector<RigStimPlanFracTemplateCell>& RimStimPlanFractureTemplate::getStimPlanCells()
{
return m_stimPlanCells;
}
@@ -968,11 +968,11 @@ size_t RimStimPlanFractureTemplate::getGlobalIndexFromIJ(size_t i, size_t j)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigStimPlanCell& RimStimPlanFractureTemplate::stimPlanCellFromIndex(size_t index) const
const RigStimPlanFracTemplateCell& RimStimPlanFractureTemplate::stimPlanCellFromIndex(size_t index) const
{
if (index < m_stimPlanCells.size())
{
const RigStimPlanCell& cell = m_stimPlanCells[index];
const RigStimPlanFracTemplateCell& cell = m_stimPlanCells[index];
return cell;
}
else
@@ -980,7 +980,7 @@ const RigStimPlanCell& RimStimPlanFractureTemplate::stimPlanCellFromIndex(size_t
//TODO: Better error handling?
RiaLogging::error("Requesting non-existent StimPlanCell");
RiaLogging::error("Returning cell 0, results will be invalid");
const RigStimPlanCell& cell = m_stimPlanCells[0];
const RigStimPlanFracTemplateCell& cell = m_stimPlanCells[0];
return cell;
}
}

8
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
View File

@@ -35,7 +35,7 @@
class RigStimPlanFractureDefinition;
class RimStimPlanLegendConfig;
class RigStimPlanCell;
class RigStimPlanFracTemplateCell;
//==================================================================================================
///
@@ -77,14 +77,14 @@ public:
void getStimPlanDataAsPolygonsAndValues(std::vector<std::vector<cvf::Vec3d> > &cellsAsPolygons, std::vector<double> &parameterValue, const QString& resultName, const QString& unitName, size_t timeStepIndex);
void setupStimPlanCells();
const std::vector<RigStimPlanCell>& getStimPlanCells();
const std::vector<RigStimPlanFracTemplateCell>& getStimPlanCells();
std::vector<cvf::Vec3d> getStimPlanRowPolygon(size_t i);
std::vector<cvf::Vec3d> getStimPlanColPolygon(size_t j);
std::pair<size_t, size_t> getStimPlanCellAtWellCenter();
size_t getGlobalIndexFromIJ(size_t i, size_t j); //TODO: should be const?
const RigStimPlanCell& stimPlanCellFromIndex(size_t index) const;
const RigStimPlanFracTemplateCell& stimPlanCellFromIndex(size_t index) const;
//TODO: Functions for finding perforated stimPlanCells
//Radial flow: Single cell (at 0,0)
@@ -122,6 +122,6 @@ private:
caf::PdmField<QString> m_stimPlanFileName;
cvf::ref<RigStimPlanFractureDefinition> m_stimPlanFractureDefinitionData;
std::vector<RigStimPlanCell> m_stimPlanCells;
std::vector<RigStimPlanFracTemplateCell> m_stimPlanCells;
std::pair<size_t, size_t> wellCenterStimPlanCellIJ;
};