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

Use int instead of size_t to represent time step

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-08 10:49:32 +01:00
parent 46bad03c4a
commit cda9d82971
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
View File

@ -166,20 +166,25 @@ caf::PdmFieldHandle* RimSimWellInView::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSimWellInView::calculateWellPipeStaticCenterLine(std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
void RimSimWellInView::calculateWellPipeStaticCenterLine(std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds)
{
RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(this, pipeBranchesCLCoords, pipeBranchesCellIds);
RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(this,
pipeBranchesCLCoords,
pipeBranchesCellIds);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSimWellInView::calculateWellPipeDynamicCenterLine(size_t timeStepIdx,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) const
void RimSimWellInView::calculateWellPipeDynamicCenterLine(size_t timeStepIdx,
std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds) const
{
RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(this, timeStepIdx, pipeBranchesCLCoords, pipeBranchesCellIds);
RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(this,
static_cast<int>(timeStepIdx),
pipeBranchesCLCoords,
pipeBranchesCellIds);
}
//--------------------------------------------------------------------------------------------------

23
ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
View File

@ -21,18 +21,19 @@
#include "RigCell.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "cvfRay.h"
#include "cvfBoundingBoxTree.h"
#include "RigMainGrid.h"
#include "cvfGeometryTools.h"
#include "cvfRay.h"
#include <deque>
#include <list>
#include "cvfGeometryTools.h"
//--------------------------------------------------------------------------------------------------
/// Based on the points and cells, calculate a pipe centerline
@ -43,7 +44,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(Ri
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
{
calculateWellPipeDynamicCenterline(rimWell, cvf::UNDEFINED_SIZE_T, pipeBranchesCLCoords, pipeBranchesCellIds);
calculateWellPipeDynamicCenterline(rimWell, -1, pipeBranchesCLCoords, pipeBranchesCellIds);
}
@ -51,7 +52,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(Ri
///
//--------------------------------------------------------------------------------------------------
void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell,
size_t timeStepIndex,
int timeStepIndex,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
{
@ -71,7 +72,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(c
calculateWellPipeCenterlineFromWellFrame(eclipseCaseData,
simWellData,
static_cast<int>(timeStepIndex),
timeStepIndex,
isAutoDetectBranches,
useAllCellCenters,
pipeBranchesCLCoords,
@ -102,14 +103,14 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeCenterlineFromWellF
if (timeStepIndex < 0)
{
wellFramePtr = &wellResults->staticWellCells();
wellFramePtr = &wellResults->staticWellCells();
}
else
{
wellFramePtr = &(wellResults->wellResultFrame(timeStepIndex));
wellFramePtr = &(wellResults->wellResultFrame(timeStepIndex));
}
bool isMultiSegmentWell = wellResults->isMultiSegmentWell();
bool isMultiSegmentWell = wellResults->isMultiSegmentWell();
#if 0 // Fancy branch splitting, but with artifacts. Needs a bit more work to be better overall than the one we have.
RigWellResultFrame splittedWellFrame;
@ -1098,4 +1099,4 @@ RigWellResultFrame RigSimulationWellCenterLineCalculator::splitIntoBranches(cons
BranchSplitter splitter(wellResultFrame, eclipseCaseData);
return splitter.splittedWellResultFrame();
}
}

2
ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
View File

@ -33,7 +33,7 @@ public:
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;
static void calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell,
size_t timeStepIndex,
int timeStepIndex,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;