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 - Renaming RimStimPlanCell -> RigStimPlanCell

Browse Source
This commit is contained in:
astridkbjorke 2017-03-29 10:18:14 +02:00
parent 500e0b77be
commit 054f35c5ac
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
View File

@ -25,7 +25,7 @@
#include "RimFracture.h"
#include "RimFractureTemplate.h"
#include "RimLegendConfig.h"
#include "RimStimPlanCell.h"
#include "RigStimPlanCell.h"
#include "RimStimPlanColors.h"
#include "RimStimPlanFractureTemplate.h"
@ -290,10 +290,10 @@ cvf::ref<cvf::DrawableGeo> RivWellFracturePartMgr::createStimPlanMeshDrawable(Ri
QString resultUnit = "md-m";
size_t timeStepIndex = 0;
std::vector<RimStimPlanCell* > stimPlanCells = stimPlanFracTemplate->getStimPlanCells(resultName, resultUnit, timeStepIndex);
std::vector<RigStimPlanCell* > stimPlanCells = stimPlanFracTemplate->getStimPlanCells(resultName, resultUnit, timeStepIndex);
std::vector<cvf::Vec3f> stimPlanMeshVertices;
for (RimStimPlanCell* stimPlanCell : stimPlanCells)
for (RigStimPlanCell* stimPlanCell : stimPlanCells)
{
if (stimPlanCell->getValue() > 1e-7)
{

8
ApplicationCode/ProjectDataModel/RimStimPlanCell.cpp → ApplicationCode/ProjectDataModel/RigStimPlanCell.cpp
View File

@ -16,12 +16,12 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimStimPlanCell.h"
#include "RigStimPlanCell.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanCell::RimStimPlanCell()
RigStimPlanCell::RigStimPlanCell()
{
}
@ -29,7 +29,7 @@ RimStimPlanCell::RimStimPlanCell()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanCell::RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j)
RigStimPlanCell::RigStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j)
{
m_polygon = polygon;
m_value = value;
@ -40,7 +40,7 @@ RimStimPlanCell::RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanCell::~RimStimPlanCell()
RigStimPlanCell::~RigStimPlanCell()
{
}

8
ApplicationCode/ProjectDataModel/RimStimPlanCell.h → ApplicationCode/ProjectDataModel/RigStimPlanCell.h
View File

@ -27,15 +27,15 @@
///
///
//==================================================================================================
class RimStimPlanCell
class RigStimPlanCell
{
public:
RimStimPlanCell();
RimStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j);
RigStimPlanCell();
RigStimPlanCell(std::vector<cvf::Vec3d> polygon, double value, size_t i, size_t j);
virtual ~RimStimPlanCell();
virtual ~RigStimPlanCell();
std::vector<cvf::Vec3d> getPolygon() { return m_polygon; }
double getValue() { return m_value; }

8
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@ -26,7 +26,7 @@
#include "RimEclipseView.h"
#include "RimFracture.h"
#include "RimProject.h"
#include "RimStimPlanCell.h"
#include "RigStimPlanCell.h"
#include "RimStimPlanColors.h"
#include "RimStimPlanLegendConfig.h"
@ -773,9 +773,9 @@ void RimStimPlanFractureTemplate::getStimPlanDataAsPolygonsAndValues(std::vector
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex)
std::vector<RigStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex)
{
std::vector<RimStimPlanCell*> stimPlanCells;
std::vector<RigStimPlanCell*> stimPlanCells;
std::vector<std::vector<double>> propertyValuesAtTimeStep = getMirroredDataAtTimeIndex(resultName, unitName, timeStepIndex);
std::vector<double> depthCoordsAtNodes = adjustedDepthCoordsAroundWellPathPosition();
@ -796,7 +796,7 @@ std::vector<RimStimPlanCell*> RimStimPlanFractureTemplate::getStimPlanCells(cons
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));
RimStimPlanCell* stimPlanCell = new RimStimPlanCell(cellPolygon, propertyValuesAtTimeStep[j + 1][i + 1], i, j);
RigStimPlanCell* stimPlanCell = new RigStimPlanCell(cellPolygon, propertyValuesAtTimeStep[j + 1][i + 1], i, j);
stimPlanCells.push_back(stimPlanCell);
}
}

4
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
View File

@ -35,7 +35,7 @@
class RigStimPlanFractureDefinition;
class RimStimPlanLegendConfig;
class RimStimPlanCell;
class RigStimPlanCell;
//==================================================================================================
///
@ -76,7 +76,7 @@ public:
void computeMinMax(const QString& resultName, const QString& unitName, double* minValue, double* maxValue) const;
void getStimPlanDataAsPolygonsAndValues(std::vector<std::vector<cvf::Vec3d> > &cellsAsPolygons, std::vector<double> &parameterValue, const QString& resultName, const QString& unitName, size_t timeStepIndex);
std::vector<RimStimPlanCell*> getStimPlanCells(const QString& resultName, const QString& unitName, size_t timeStepIndex);
std::vector<RigStimPlanCell*> getStimPlanCells(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);

28
ApplicationCode/ReservoirDataModel/RigFractureTransCalc.cpp
View File

@ -38,7 +38,7 @@
#include "RigMainGrid.h"
#include "cvfMath.h"
#include "RimDefines.h"
#include "RimStimPlanCell.h"
#include "RigStimPlanCell.h"
//--------------------------------------------------------------------------------------------------
///
@ -326,7 +326,7 @@ std::pair<double, double> RigFractureTransCalc::flowAcrossLayersUpscaling(QStrin
}
else return std::make_pair(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE);
std::vector<RimStimPlanCell* > stimPlanCells = fracTemplateStimPlan->getStimPlanCells(resultName, resultUnit, timeStepIndex);
std::vector<RigStimPlanCell* > stimPlanCells = fracTemplateStimPlan->getStimPlanCells(resultName, resultUnit, timeStepIndex);
// RifReaderInterface::PorosityModelResultType porosityModel = RifReaderInterface::MATRIX_RESULTS;
// RimReservoirCellResultsStorage* gridCellResults = m_case->results(porosityModel);
@ -382,7 +382,7 @@ std::pair<double, double> RigFractureTransCalc::flowAcrossLayersUpscaling(QStrin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
{
std::vector<double> DcolSum;
std::vector<double> lavgCol;
@ -394,8 +394,8 @@ double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracT
std::vector<double> lengthsLiOfStimPlanCol;
std::vector<double> heightsDiOfStimPlanCells;
std::vector<RimStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
for (RimStimPlanCell* stimPlanCell : stimPlanCellsCol)
std::vector<RigStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
for (RigStimPlanCell* stimPlanCell : stimPlanCellsCol)
{
if (stimPlanCell->getValue() > 1e-7)
{
@ -450,7 +450,7 @@ double RigFractureTransCalc::computeHAupscale(RimStimPlanFractureTemplate* fracT
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers)
{
std::vector<double> DcolAvg;
std::vector<double> liColSum;
@ -462,8 +462,8 @@ double RigFractureTransCalc::computeAHupscale(RimStimPlanFractureTemplate* fracT
std::vector<double> lengthsLiOfStimPlanCol;
std::vector<double> heightsDiOfStimPlanCells;
std::vector<RimStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
for (RimStimPlanCell* stimPlanCell : stimPlanCellsCol)
std::vector<RigStimPlanCell*> stimPlanCellsCol = getColOfStimPlanCells(stimPlanCells, j);
for (RigStimPlanCell* stimPlanCell : stimPlanCellsCol)
{
if (stimPlanCell->getValue() > 1e-7)
{
@ -693,11 +693,11 @@ void RigFractureTransCalc::computeFlowIntoTransverseWell()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t i)
std::vector<RigStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t i)
{
std::vector<RimStimPlanCell*> stimPlanCellRow;
std::vector<RigStimPlanCell*> stimPlanCellRow;
for (RimStimPlanCell* stimPlanCell : allStimPlanCells)
for (RigStimPlanCell* stimPlanCell : allStimPlanCells)
{
if (stimPlanCell->getI() == i)
{
@ -711,11 +711,11 @@ std::vector<RimStimPlanCell*> RigFractureTransCalc::getRowOfStimPlanCells(std::v
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimStimPlanCell*> RigFractureTransCalc::getColOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t j)
std::vector<RigStimPlanCell*> RigFractureTransCalc::getColOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t j)
{
std::vector<RimStimPlanCell*> stimPlanCellCol;
std::vector<RigStimPlanCell*> stimPlanCellCol;
for (RimStimPlanCell* stimPlanCell : allStimPlanCells)
for (RigStimPlanCell* stimPlanCell : allStimPlanCells)
{
if (stimPlanCell->getJ() == j)
{

10
ApplicationCode/ReservoirDataModel/RigFractureTransCalc.h
View File

@ -34,7 +34,7 @@
class RimFracture;
class RimEclipseCase;
class RimStimPlanCell;
class RigStimPlanCell;
class RimStimPlanFractureTemplate;
//==================================================================================================
@ -51,8 +51,8 @@ public:
void computeUpscaledPropertyFromStimPlan(QString resultName, QString resultUnit, size_t timeStepIndex);
std::pair<double, double> flowAcrossLayersUpscaling(QString resultName, QString resultUnit, size_t timeStepIndex, RimDefines::UnitSystem unitSystem, size_t eclipseCellIndex);
double computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
double computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RimStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
double computeHAupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
double computeAHupscale(RimStimPlanFractureTemplate* fracTemplateStimPlan, std::vector<RigStimPlanCell *> stimPlanCells, std::vector<cvf::Vec3d> planeCellPolygon, cvf::Vec3d directionAlongLayers, cvf::Vec3d directionAcrossLayers);
static double arithmeticAverage(std::vector<double> values);
@ -60,8 +60,8 @@ public:
void computeFlowIntoTransverseWell();
static std::vector<RimStimPlanCell*> getRowOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t i);
static std::vector<RimStimPlanCell*> getColOfStimPlanCells(std::vector<RimStimPlanCell*> allStimPlanCells, size_t j);
static std::vector<RigStimPlanCell*> getRowOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t i);
static std::vector<RigStimPlanCell*> getColOfStimPlanCells(std::vector<RigStimPlanCell*> allStimPlanCells, size_t j);
private: